From: Anthony G. Basile <blueness@gentoo.org>
Date: Sun, 18 Sep 2011 08:43:28 +0000 (+0000)
Subject: Fix java bindings, bug #176419
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a2574ced83a9bd4fecee827c6fe705c86dc3c33f;p=gentoo.git

Fix java bindings, bug #176419

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

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 6b1edf808a88..25cd9a95314f 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2011/09/16 19:53:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.25 2011/09/18 08:43:28 blueness Exp $
+
+*xapian-bindings-1.2.7-r2 (18 Sep 2011)
+
+  18 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+  -xapian-bindings-1.2.7-r1.ebuild, +xapian-bindings-1.2.7-r2.ebuild,
+  metadata.xml:
+  Fix java bindings, bug #176419
 
 *xapian-bindings-1.2.7-r1 (16 Sep 2011)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index f9406da53656..a88055d36b69 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 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
 EBUILD xapian-bindings-1.2.5.ebuild 3294 RMD160 5f758ddd3ffca158edccfbbb49ffc134602edfd0 SHA1 bea00745fdaf00c8f3d93060f63fb511737df5fe SHA256 955147fdd8cef9f30e775e80bfdd33b223ee9bea5f38f9f5cfc9b54447aa35f8
-EBUILD xapian-bindings-1.2.7-r1.ebuild 4003 RMD160 510d9c004e5ca0580076f687886eca7bb30ab911 SHA1 4eb694079a66f58884c977b2b45b5c47f4a36f38 SHA256 dc910c7e4a86c4943d37a0e4f8a7376ee486b1d9d6d6ab398445c8b35b15b84e
-MISC ChangeLog 5172 RMD160 1a01efa7ab310f948567b263e924c25f378f04fe SHA1 930837b057adb4ad3caeb5738ddc27f1bb62db01 SHA256 469279933db67eed8c45d9e9b2341cb77ba944475e176e147673645fe340e875
-MISC metadata.xml 335 RMD160 da243801277f2da4bbcf986c3414c12ed172ab11 SHA1 4f89931c428a950f44135c2907dc96aa034c8363 SHA256 49769f112084a9a3b040db78f0dc136ab740e7e25adb09ddb135ac8bd3aa5943
+EBUILD xapian-bindings-1.2.7-r2.ebuild 4237 RMD160 8b3102bf6ab32ea77949fd7630e5f5cb3f8b56ca SHA1 196df18e027729a36aef2ac9c414ab6b39e6ad37 SHA256 2b6d28db6fdcd4c4c789a98742560edf5619ec98dd929c6696da7ba863059472
+MISC ChangeLog 5388 RMD160 f12df2c14255b814966a0f6ca56a5dd05700ff6c SHA1 4db7836ddd7ec662077b6d49b0fb519ef075feaf SHA256 56cb5ac872a3d1980fdfe304ba2f17a610c2ca00f24e6edb3b6cf12c3594d80d
+MISC metadata.xml 357 RMD160 ccfd911fd4b6ad53a2d979c1a3726ed6613200a3 SHA1 7a39561ab84c8a7e56941cf31cb081ab5da688be SHA256 cf68e05046c025a8bb38f2deaf9149ea14e5d2197362533bb66cbc0641f4c2ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5zqUAACgkQl5yvQNBFVTWp0wCfVlRh3W2PODWapABJlqxKiWSR
-pNkAn0Kfy+5euPciShh0dHTJEujgsMmc
-=6qX+
+iEYEAREIAAYFAk51rzsACgkQl5yvQNBFVTV/4QCfRfTq5CJbS7K+1bTnLRbRnPG8
+geMAn0daDL5qFwQoY6ZNiRO1Jpo8QHTl
+=DUvU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/metadata.xml b/dev-libs/xapian-bindings/metadata.xml
index 82ab7c1abbab..41230330f970 100644
--- a/dev-libs/xapian-bindings/metadata.xml
+++ b/dev-libs/xapian-bindings/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>no-herd</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild
similarity index 88%
rename from dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
rename to dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild
index 9c9a56aefb48..ce59ed0bde2e 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.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.7-r1.ebuild,v 1.1 2011/09/16 19:53:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild,v 1.1 2011/09/18 08:43:28 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -35,16 +35,27 @@ RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.3 )"
 
 pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
 	if use python; then
 		python_pkg_setup
 	fi
 }
 
 src_prepare() {
-	sed \
-		-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
-		-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
-		-i python/Makefile.{am,in} || die "sed failed"
+	java-pkg-opt-2_src_prepare
+	if use java; then
+		sed \
+			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
+			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
+	fi
+
+	if use python; then
+		sed \
+			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
+			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
+			-i python/Makefile.in || die "sed failed"
+	fi
 }
 
 src_configure() {