From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- dev-libs/libfilezilla/Manifest | 7 - .../libfilezilla-0.9.2-cppunit-pkgconfig.patch | 428 --------------------- dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild | 30 -- dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild | 30 -- dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild | 39 -- 5 files changed, 534 deletions(-) delete mode 100644 dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch delete mode 100644 dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild delete mode 100644 dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild delete mode 100644 dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild (limited to 'dev-libs/libfilezilla') diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index 8b299fd0b2d1..b41f5be778b1 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,12 +1,5 @@ -AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e -DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba DIST libfilezilla-0.13.0.tar.bz2 398773 BLAKE2B e25f15bc4ec6a5aff119352535721f44bad3020342dd15e471cd228b6b2a6db221a4a099a4884c3a6215074547ced186f23fc243e066b04afdfaa5f54f245c0f SHA512 cb7950febf72a6d13f3ec3961d32ac281e8437e881155f9fb26820d6deb2a1d59ed5a18c08cb59a75d9527a8a9fda2f502a96dda4045f361dcbae522c1e1b26f -DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393 -DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88 -EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540 EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e EBUILD libfilezilla-0.13.0.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917 -EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8 -EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151 diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch b/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch deleted file mode 100644 index 7c33fdbbe4a4..000000000000 --- a/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch +++ /dev/null @@ -1,428 +0,0 @@ -https://bugs.gentoo.org/630094 -Extrtacted as: - svn diff -r 8440:8441 - -Index: m4/cppunit.m4 -=================================================================== ---- a/m4/cppunit.m4 (revision 8440) -+++ b/m4/cppunit.m4 (nonexistent) -@@ -1,89 +0,0 @@ --dnl --dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) --dnl --AC_DEFUN([AM_PATH_CPPUNIT], --[ -- --AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)], -- cppunit_config_prefix="$withval", cppunit_config_prefix="") --AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)], -- cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="") -- -- if test x$cppunit_config_exec_prefix != x ; then -- cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" -- if test x${CPPUNIT_CONFIG+set} != xset ; then -- CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config -- fi -- fi -- if test x$cppunit_config_prefix != x ; then -- cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" -- if test x${CPPUNIT_CONFIG+set} != xset ; then -- CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config -- fi -- fi -- -- AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) -- cppunit_version_min=$1 -- -- AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min) -- no_cppunit="" -- if test "$CPPUNIT_CONFIG" = "no" ; then -- AC_MSG_RESULT(no) -- no_cppunit=yes -- else -- CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` -- CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` -- cppunit_version=`$CPPUNIT_CONFIG --version` -- -- cppunit_major_version=`echo $cppunit_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- cppunit_minor_version=`echo $cppunit_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- cppunit_micro_version=`echo $cppunit_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- -- cppunit_major_min=`echo $cppunit_version_min | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- if test "x${cppunit_major_min}" = "x" ; then -- cppunit_major_min=0 -- fi -- -- cppunit_minor_min=`echo $cppunit_version_min | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- if test "x${cppunit_minor_min}" = "x" ; then -- cppunit_minor_min=0 -- fi -- -- cppunit_micro_min=`echo $cppunit_version_min | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x${cppunit_micro_min}" = "x" ; then -- cppunit_micro_min=0 -- fi -- -- cppunit_version_proper=`expr \ -- $cppunit_major_version \> $cppunit_major_min \| \ -- $cppunit_major_version \= $cppunit_major_min \& \ -- $cppunit_minor_version \> $cppunit_minor_min \| \ -- $cppunit_major_version \= $cppunit_major_min \& \ -- $cppunit_minor_version \= $cppunit_minor_min \& \ -- $cppunit_micro_version \>= $cppunit_micro_min ` -- -- if test "$cppunit_version_proper" = "1" ; then -- AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) -- else -- AC_MSG_RESULT(no) -- no_cppunit=yes -- fi -- fi -- -- if test "x$no_cppunit" = x ; then -- ifelse([$2], , :, [$2]) -- else -- CPPUNIT_CFLAGS="" -- CPPUNIT_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -- -- AC_SUBST(CPPUNIT_CFLAGS) -- AC_SUBST(CPPUNIT_LIBS) --]) - -Property changes on: m4/cppunit.m4 -___________________________________________________________________ -Deleted: svn:eol-style -## -1 +0,0 ## --native -\ No newline at end of property -Index: m4/pkg.m4 -=================================================================== ---- a/m4/pkg.m4 (nonexistent) -+++ b/m4/pkg.m4 (revision 8441) -@@ -0,0 +1,275 @@ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# serial 12 (pkg-config-0.29.2) -+ -+dnl Copyright © 2004 Scott James Remnant . -+dnl Copyright © 2012-2015 Dan Nicholson -+dnl -+dnl This program is free software; you can redistribute it and/or modify -+dnl it under the terms of the GNU General Public License as published by -+dnl the Free Software Foundation; either version 2 of the License, or -+dnl (at your option) any later version. -+dnl -+dnl This program is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU General Public License -+dnl along with this program; if not, write to the Free Software -+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+dnl 02111-1307, USA. -+dnl -+dnl As a special exception to the GNU General Public License, if you -+dnl distribute this file as part of a program that contains a -+dnl configuration script generated by Autoconf, you may include it under -+dnl the same distribution terms that you use for the rest of that -+dnl program. -+ -+dnl PKG_PREREQ(MIN-VERSION) -+dnl ----------------------- -+dnl Since: 0.29 -+dnl -+dnl Verify that the version of the pkg-config macros are at least -+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -+dnl installed version of pkg-config, this checks the developer's version -+dnl of pkg.m4 when generating configure. -+dnl -+dnl To ensure that this macro is defined, also add: -+dnl m4_ifndef([PKG_PREREQ], -+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -+dnl -+dnl See the "Since" comment for each macro you use to see what version -+dnl of the macros you require. -+m4_defun([PKG_PREREQ], -+[m4_define([PKG_MACROS_VERSION], [0.29.2]) -+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, -+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -+])dnl PKG_PREREQ -+ -+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+dnl ---------------------------------- -+dnl Since: 0.16 -+dnl -+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -+dnl first found in the path. Checks that the version of pkg-config found -+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -+dnl used since that's the first version where most current features of -+dnl pkg-config existed. -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+fi[]dnl -+])dnl PKG_PROG_PKG_CONFIG -+ -+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+dnl ------------------------------------------------------------------- -+dnl Since: 0.18 -+dnl -+dnl Check to see whether a particular set of modules exists. Similar to -+dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -+dnl -+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+dnl only at the first occurence in configure.ac, so if the first place -+dnl it's called might be skipped (such as if it is within an "if", you -+dnl have to call PKG_CHECK_EXISTS manually -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_default([$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+dnl --------------------------------------------- -+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -+dnl pkg_failed based on the result. -+m4_define([_PKG_CONFIG], -+[if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ elif test -n "$PKG_CONFIG"; then -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes ], -+ [pkg_failed=yes]) -+ else -+ pkg_failed=untried -+fi[]dnl -+])dnl _PKG_CONFIG -+ -+dnl _PKG_SHORT_ERRORS_SUPPORTED -+dnl --------------------------- -+dnl Internal check to see if pkg-config supports short errors. -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])dnl _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+dnl [ACTION-IF-NOT-FOUND]) -+dnl -------------------------------------------------------------- -+dnl Since: 0.4.0 -+dnl -+dnl Note that if there is a possibility the first call to -+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $2]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ AC_MSG_RESULT([no]) -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ m4_default([$4], [AC_MSG_ERROR( -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT])[]dnl -+ ]) -+elif test $pkg_failed = untried; then -+ AC_MSG_RESULT([no]) -+ m4_default([$4], [AC_MSG_FAILURE( -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])[]dnl -+ ]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ $3 -+fi[]dnl -+])dnl PKG_CHECK_MODULES -+ -+ -+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+dnl [ACTION-IF-NOT-FOUND]) -+dnl --------------------------------------------------------------------- -+dnl Since: 0.29 -+dnl -+dnl Checks for existence of MODULES and gathers its build flags with -+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -+dnl and VARIABLE-PREFIX_LIBS from --libs. -+dnl -+dnl Note that if there is a possibility the first call to -+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -+dnl configure.ac. -+AC_DEFUN([PKG_CHECK_MODULES_STATIC], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+_save_PKG_CONFIG=$PKG_CONFIG -+PKG_CONFIG="$PKG_CONFIG --static" -+PKG_CHECK_MODULES($@) -+PKG_CONFIG=$_save_PKG_CONFIG[]dnl -+])dnl PKG_CHECK_MODULES_STATIC -+ -+ -+dnl PKG_INSTALLDIR([DIRECTORY]) -+dnl ------------------------- -+dnl Since: 0.27 -+dnl -+dnl Substitutes the variable pkgconfigdir as the location where a module -+dnl should install pkg-config .pc files. By default the directory is -+dnl $libdir/pkgconfig, but the default can be changed by passing -+dnl DIRECTORY. The user can override through the --with-pkgconfigdir -+dnl parameter. -+AC_DEFUN([PKG_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([pkgconfigdir], -+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, -+ [with_pkgconfigdir=]pkg_default) -+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+])dnl PKG_INSTALLDIR -+ -+ -+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -+dnl -------------------------------- -+dnl Since: 0.27 -+dnl -+dnl Substitutes the variable noarch_pkgconfigdir as the location where a -+dnl module should install arch-independent pkg-config .pc files. By -+dnl default the directory is $datadir/pkgconfig, but the default can be -+dnl changed by passing DIRECTORY. The user can override through the -+dnl --with-noarch-pkgconfigdir parameter. -+AC_DEFUN([PKG_NOARCH_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([noarch-pkgconfigdir], -+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, -+ [with_noarch_pkgconfigdir=]pkg_default) -+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+])dnl PKG_NOARCH_INSTALLDIR -+ -+ -+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+dnl ------------------------------------------- -+dnl Since: 0.28 -+dnl -+dnl Retrieves the value of the pkg-config variable for the given module. -+AC_DEFUN([PKG_CHECK_VAR], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl -+ -+_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -+AS_VAR_COPY([$1], [pkg_cv_][$1]) -+ -+AS_VAR_IF([$1], [""], [$5], [$4])dnl -+])dnl PKG_CHECK_VAR - -Property changes on: m4/pkg.m4 -___________________________________________________________________ -Added: svn:eol-style -## -0,0 +1 ## -+native -\ No newline at end of property -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 8440) -+++ b/configure.ac (revision 8441) -@@ -178,13 +178,21 @@ - fi - fi - -+# Require pkg-config -+# ------------------ -+PKG_PROG_PKG_CONFIG - -+# Do not abort while not having runtime dependency -+#if test -z "$PKG_CONFIG"; then -+# AC_MSG_ERROR([pkg-config not found. pkg-config is required to check for some dependencies.]) -+#fi -+ -+ - # CppUnit tests - # ------------- - --AM_PATH_CPPUNIT([1.10.2], [has_cppunit="yes"]) -+PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.13.0], [has_cppunit=yes],[:]) - -- - # Doxygen - # ------- - -@@ -195,7 +203,6 @@ - # ---------------------------- - - AM_CONDITIONAL(USE_RESOURCEFILE, test "$use_resourcefile" = "true") --AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"]) - - AC_CONFIG_FILES( - Makefile diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild deleted file mode 100644 index b546fecc3c4b..000000000000 --- a/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" -HOMEPAGE="https://lib.filezilla-project.org/" -SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2 - http://download.filezilla-project.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-util/cppunit )" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild deleted file mode 100644 index 26d14b20ef98..000000000000 --- a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" -HOMEPAGE="https://lib.filezilla-project.org/" -SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2 - http://download.filezilla-project.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc x86" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-util/cppunit )" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild deleted file mode 100644 index ab130c40e556..000000000000 --- a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" -HOMEPAGE="https://lib.filezilla-project.org/" -SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2 - http://download.filezilla-project.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - test? ( dev-util/cppunit )" - -PATCHES=("${FILESDIR}"/${PN}-0.9.2-cppunit-pkgconfig.patch) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} - -src_prepare() { - default - - # cppunit patch changes .m4 - eautoreconf -} -- cgit v1.2.3