Fix install location of lua binding

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 59 insertions, 17 deletions

diff --git a/dev-libs/hashit/Manifest b/dev-libs/hashit/Manifest
index a33fcbd7b198..dfa5195731b5 100644
--- a/dev-libs/hashit/Manifest
+++ b/dev-libs/hashit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hashit-0.9.7-pkgconfig.patch 782 RMD160 97a5b015797efe490ec398e79edecfa24db4de10 SHA1 d21da450387b4829e9e35e6dbd18f4a10572d16a SHA256 e29e7f3f73268ca6dd5091262487ae0f4d1362f0401a29fa741926b6efc89696
 DIST hashit-0.9.3.tar.bz2 26322 RMD160 202d31d613b2877f658c6b33f1365e0a7202035a SHA1 4637d624e3a5ce47b44d7ebff7ebbd1c75affed1 SHA256 0daa335fe9e636bd5d2b47d79a9013370335771081b9bd587f837a1399fafe7c
@@ -9,15 +9,17 @@ DIST hashit-0.9.7.tar.bz2 16368 RMD160 f14cb47a9b05a89eda1e2217b6160701b4b1bada
 EBUILD hashit-0.9.3.ebuild 883 RMD160 1241a1e02ffef160afe026f31ea4f7421ffb5d30 SHA1 9d29922b288cd1b15b4ddcc9ce9e5ebf3c0c2fbd SHA256 b6e74e2395c23d74069ddc16d6d1e062d22136b1d320c3f6a9a46563ea16e2e9
 EBUILD hashit-0.9.4.ebuild 1189 RMD160 292eb6a5b60f0c918f585b2d81fd7194027750a6 SHA1 7c00a37d803912fa8d1930c53d32eebdce3656ad SHA256 0a92fc850aa87572dabbcd15ec53f4fa20d67188e0dd56abfa4c93f2c42d7525
 EBUILD hashit-0.9.6.ebuild 640 RMD160 eeb4cac8fa4a7e57a41e4df08c0351197dba71df SHA1 eed818d40d186d334a4b5ebf4fcbff9a38f05a3b SHA256 042994f28a6b42b259eceff2660f0340fcbc0c36785b9af3ee5caaa72d630700
-EBUILD hashit-0.9.7.ebuild 639 RMD160 c3be35c66db9e0d7a8123d544d72560ab6038b23 SHA1 2c6c3fc5eaf72f81812a65e7e7b5b8c1a237c192 SHA256 dd365ebda5dbcf77e02e93e23494eeb886227ed155b5991f09567b00186245e3
-MISC ChangeLog 1853 RMD160 7223b6d3ab5c6fe43a6872e80c1568f325a284e6 SHA1 4b4b81e79ebcfbb424ad710fd22ff000bf85f9ce SHA256 8e20e8c49c4724f38819f4bf7b42dd8a14240c6a650fddc1c106fb56a70ea2d1
+EBUILD hashit-0.9.7.ebuild 634 RMD160 d16daaa47737daeaeccea129e5d1791a1106e1d8 SHA1 48d9c6c9ac5808a108062ff95de6fd3139eb4bc9 SHA256 e8a4e2f39756aea15a9aac7f1d7e3edd31fc45caf0b08e5cadba927ff1f25c5e
+MISC ChangeLog 1956 RMD160 fb8fcaf5826e0feb4dbeb62c0d8e045ecdd1bb78 SHA1 416d4081b84f50cf5bdeb54378f6b68b6939764d SHA256 eb604e8a1d32a24f1ffb395e95deb8626b4136e2ee4bc2bdba99667fbec47a63
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C7gACgkQfXuS5UK5QB0cXwP+IAwliPC0rrj7NKonAc0pNSq0
-AVfAfZ3OSJEgCVX4yXwzz3goC0GXvdGIcqT5x6FdyCOupzxqE05JuSghUpI2Tjx7
-Xt+NnQgVN8iFrwvN9xvbTnxKAh5mE7Xt1+CNxDiwsnc3M/SUCI3Jxasm/iZF/2om
-fa/ilngYfRaK93+b6CI=
-=+Uig
+iQEcBAEBCgAGBQJO7OVvAAoJEOTDgjZ80txdnpEH/1l2NxMui1vKBpnVjw8O+Mhe
+lc0tRKXQLOou5BuSJL0ueCJasDHmbGkeSCOzTa4E1Y+NnSwzVzeNRKFGYQSsq1ON
+MKYi9W3LFwV1j1Rd2MXou//Riwuuexb2F0zxlupgdMtp/djKCwDrP263kPR852B+
+wdrZRYa59uka8xHkNyQ9dl3YSEa1YS9syJfGxNuo10e2w2ujDusdUHo7NAvsv9bQ
+/1P6J5C8GXfyZ+MsUmSvrWXjKlWK1i9SjWRl8oem7QVWXY6XhbH/zXzvIsy+Zi77
+xrjvYX5wWx5oGqMNuZrVq6UYbYMg6W99v35EkPtOvltsBWfyuQ084nj87oEo9Iw=
+=EaxX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 15a9d07b13fc..aa82fa34ec68 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.26 2011/12/14 11:21:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.27 2011/12/17 18:51:08 blueness Exp $
+
+  17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  xapian-bindings-1.2.8.ebuild, +files/fix-LUA_LIB-envvar.patch:
+  Fix install location of lua binding
 
 *xapian-bindings-1.2.8 (14 Dec 2011)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index ff0800151bff..b6321fe065fa 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fix-LUA_LIB-envvar.patch 1151 RMD160 e55b6f6916bf6798aa1d96c4418bb7e53d27436d SHA1 444b975e3de9fa099bee2747515f9e8b0ed61d04 SHA256 c1e7d394c3ffbb21a7185fcc7ddcb2fa9070d4c1708a79160e7b774d08a68dc8
 DIST xapian-bindings-1.2.5.tar.gz 1334636 RMD160 e7de918437ee5ba88bf67a9b64da7f760b0c6580 SHA1 ff9528d094396b3b58bd32a263211c783af034f2 SHA256 0d723af62b8d633cd49fdf92058a4985061659454b390c0c08db05fa4f7fb09c
 DIST xapian-bindings-1.2.7.tar.gz 1447683 RMD160 f8b1d05a35a304f6e41246ee2c9ba7aab07bb321 SHA1 79e9f0b01f1af3440d10d00469dbe248784ffa1c SHA256 c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8
 DIST xapian-bindings-1.2.8.tar.gz 1462478 RMD160 4cd756afb296a6ad826d4dcdc07ee8c690db348a SHA1 92cf39c9c00a52a33727e47a1a7aaee2a1b23c2f SHA256 eb740c619c75d288e65a1c2f86faecdca53d44d3f9896bcc080085839887b124
 EBUILD xapian-bindings-1.2.5.ebuild 3294 RMD160 5f758ddd3ffca158edccfbbb49ffc134602edfd0 SHA1 bea00745fdaf00c8f3d93060f63fb511737df5fe SHA256 955147fdd8cef9f30e775e80bfdd33b223ee9bea5f38f9f5cfc9b54447aa35f8
 EBUILD xapian-bindings-1.2.7-r2.ebuild 4237 RMD160 8b3102bf6ab32ea77949fd7630e5f5cb3f8b56ca SHA1 196df18e027729a36aef2ac9c414ab6b39e6ad37 SHA256 2b6d28db6fdcd4c4c789a98742560edf5619ec98dd929c6696da7ba863059472
-EBUILD xapian-bindings-1.2.8.ebuild 4234 RMD160 22fe94beab5fd84fa5151f9c3fd6d747e3360bc6 SHA1 1ca59360782259c00be0dec2c616e5aa9792d7cb SHA256 b896f74755ae6d4ff881847bd158091d87a72f6ecc5c6e62c9ad51ac3997d689
-MISC ChangeLog 5543 RMD160 f1f43ced616c5ffb56ff730c1abd512783dc9d9d SHA1 1d1d924d789d1543054d28e7ab6cb71b468afe69 SHA256 92fe1b731d9af1090e06a8e8fb6494a49e130c159acf59054077f0a902b99127
+EBUILD xapian-bindings-1.2.8.ebuild 4413 RMD160 cd724cbc7090a3461865075ad6531d250c904405 SHA1 458fbe97956a053d69706d2510419b1ba275d1ba SHA256 43a291fe2b427286fe43fa2be00285d5b111db7b34bdf9663f4dd630d9e9805a
+MISC ChangeLog 5702 RMD160 2338482f5cef0c0d5cc2c3cb4b15242d04d1808e SHA1 f9259f3fa9554cf7ec00d24859d4f74cb46a2cde SHA256 eec6902dd11c7f2a3d201a73b630e66ef0e2e70613be2d154dc3bf8ab9366272
 MISC metadata.xml 335 RMD160 da243801277f2da4bbcf986c3414c12ed172ab11 SHA1 4f89931c428a950f44135c2907dc96aa034c8363 SHA256 49769f112084a9a3b040db78f0dc136ab740e7e25adb09ddb135ac8bd3aa5943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7ohqcACgkQl5yvQNBFVTXLyACfcw4A8kCjZALXJifbpUj+fPGd
-7gEAn2IeCoFeKn8SD7gxBr6thMRHG7q1
-=EgEU
+iEYEAREIAAYFAk7s5KYACgkQl5yvQNBFVTU9nACfSneX4fQbomg6X1h77/Edo+jZ
+AmUAnjqAUW63MEzKxU6VcjnDW8yB4oEC
+=Hso+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch b/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch
new file mode 100644
index 000000000000..7f6ea76c2233
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch
@@ -0,0 +1,26 @@
+diff -Naur xapian-bindings-1.2.8.orig//configure.ac xapian-bindings-1.2.8/configure.ac
+--- xapian-bindings-1.2.8.orig//configure.ac	2011-12-14 00:29:23.000000000 -0500
++++ xapian-bindings-1.2.8/configure.ac	2011-12-17 13:28:25.000000000 -0500
+@@ -926,13 +926,15 @@
+     if test -n "$LUA" ; then
+       AC_MSG_RESULT([$lua_version])
+       AC_ARG_VAR(LUA_LIB, [Directory to install xapian.so into])
+-      AC_MSG_CHECKING(for Lua library to install xapian.so)
+-      LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'`
+-      LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'`
+-      if test -z "$LUA_LIB"; then
+-        AC_MSG_RESULT(not found)
+-      else
+-        AC_MSG_RESULT($LUA_LIB)
++      if test -z "$LUA_LIB" ; then
++        AC_MSG_CHECKING([for Lua library to install xapian.so])
++        LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'`
++        LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'`
++        if test -z "$LUA_LIB"; then
++          AC_MSG_RESULT(not found)
++        else
++          AC_MSG_RESULT($LUA_LIB)
++        fi
+       fi
+       AC_SUBST(LUA_LIB)
+ 
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild
index 44987c3915f9..f14ce3896366 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.1 2011/12/14 11:21:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.2 2011/12/17 18:51:08 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -12,7 +12,7 @@ PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
-inherit java-pkg-opt-2 mono php-ext-source-r2 python
+inherit java-pkg-opt-2 mono php-ext-source-r2 python autotools
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -43,6 +43,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if use lua; then
+		epatch "${FILESDIR}"/fix-LUA_LIB-envvar.patch
+		eautoreconf
+	fi
+
 	java-pkg-opt-2_src_prepare
 	if use java; then
 		sed \
@@ -68,6 +73,10 @@ src_configure() {
 		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
 	fi
 
+	if use lua; then
+		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
+	fi
+
 	econf \
 		$(use_with java) \
 		$(use_with lua) \