diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2015-10-13 15:37:06 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-10-13 15:38:19 -0400 |
| commit | 8f0da1816f1ac1496b094646e63470f4f3744431 (patch) | |
| tree | a6bc93dd42c014282956bc5fdebc258ae51e446e | |
| parent | Merge remote-tracking branch 'remotes/github/pr/195'. (diff) | |
| download | gentoo-8f0da1816f1ac1496b094646e63470f4f3744431.tar.gz gentoo-8f0da1816f1ac1496b094646e63470f4f3744431.tar.bz2 gentoo-8f0da1816f1ac1496b094646e63470f4f3744431.zip | |
dev-libs/xapian-bindings: generalize to use tc-getPKG_CONFIG
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild | 5 | ||||
| -rw-r--r-- | 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 63c9c466ea86..489576ef5307 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 6a8881433d07..142a6256aea5 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 \ |