commit: 8f0da1816f1ac1496b094646e63470f4f3744431 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Tue Oct 13 19:37:06 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Tue Oct 13 19:38:19 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0da181
dev-libs/xapian-bindings: generalize to use tc-getPKG_CONFIG Package-Manager: portage-2.2.20.1 dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild | 5 +++-- dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild index 63c9c46..489576e 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild @@ -15,7 +15,7 @@ PHP_EXT_OPTIONAL_USE="php" #mono violates sandbox, we disable it until we figure this out #inherit java-pkg-opt-2 mono-env php-ext-source-r2 python -inherit java-pkg-opt-2 php-ext-source-r2 python-r1 +inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs DESCRIPTION="SWIG and JNI bindings for Xapian" HOMEPAGE="http://www.xapian.org/"; @@ -36,6 +36,7 @@ COMMONDEPEND="=dev-libs/xapian-${PV}* tcl? ( >=dev-lang/tcl-8.1:0= )" # mono? ( >=dev-lang/mono-1.0.8 ) DEPEND="${COMMONDEPEND} + virtual/pkgconfig java? ( >=virtual/jdk-1.3 )" RDEPEND="${COMMONDEPEND} java? ( >=virtual/jre-1.3 )" @@ -75,7 +76,7 @@ src_configure() { fi if use lua; then - export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)" + export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)" fi econf \ diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild index 6a88814..142a625 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild @@ -16,7 +16,7 @@ PHP_EXT_NAME="xapian" PHP_EXT_INI="yes" PHP_EXT_OPTIONAL_USE="php" -inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 +inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs DESCRIPTION="SWIG and JNI bindings for Xapian" HOMEPAGE="http://www.xapian.org/"; @@ -36,6 +36,7 @@ COMMONDEPEND="=dev-libs/xapian-${PV}* ruby? ( dev-lang/ruby:= ) tcl? ( >=dev-lang/tcl-8.1:0= )" DEPEND="${COMMONDEPEND} + virtual/pkgconfig java? ( >=virtual/jdk-1.3 )" RDEPEND="${COMMONDEPEND} java? ( >=virtual/jre-1.3 )" @@ -71,7 +72,7 @@ src_configure() { fi if use lua; then - export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)" + export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)" fi econf \
