Bug #285516: Build fix for java compile.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ca4e16c7470a..39afb904051b 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.290 2009/09/18 22:26:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.291 2009/09/19 23:48:01 robbat2 Exp $
+
+  19 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> db-4.8.24.ebuild,
+  +files/db-4.8.24-java-manifest-location.patch:
+  Bug #285516: Build fix for java compile.
 
 *db-4.8.24 (18 Sep 2009)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 66f3137e3b3d..c72c9bea437b 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -23,6 +23,7 @@ AUX db-4.6-jarlocation.patch 599 RMD160 0981160a48833f126fa10e30eea2a394206895e4
 AUX db-4.6-jni-check-prefix-first.patch 1172 RMD160 5fe466cce625157517a8e703c3e0ed64c5bc80a0 SHA1 817caf11b2855e3da40a1c4bb5f65af54f12f97b SHA256 bc32845c7da201a4ce7af280a8e734e3fa0267a44657aecb52877f67e29c5c3e
 AUX db-4.6-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SHA1 830fc6ecaf948dc1276ee0a539668d6f2e9c9a15 SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21
 AUX db-4.8-libtool.patch 2076 RMD160 e92a09df1944c5054220c3467c4d3fe558928575 SHA1 af4faf7c990ad85dea0c3e651c8b7a0d0be7078d SHA256 b337c02ffc540e2d692ec57fe093d182f0054a673e5267eabd2db24121486312
+AUX db-4.8.24-java-manifest-location.patch 592 RMD160 8822d3b058f542414b46cdc63e7074ddb8a4a845 SHA1 12f7d6d56d180628d53fc00046f1c2a23b7fd67c SHA256 1589885b89ff465fe752c3062e322638a39ccf1a96c392473c5424cfcc628aea
 AUX patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798
 AUX patch.3.2.9.2 495 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 SHA1 c447c089f44c401c174244a7f9f7967522ba92a4 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e
 DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea3 SHA1 95d36410f0fee98f192eee04c2a1f74cac106270 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4
@@ -73,6 +74,6 @@ EBUILD db-4.5.20_p2.ebuild 3856 RMD160 18891b5909302bd17785a8ccfac724057da12822
 EBUILD db-4.6.21_p4.ebuild 4704 RMD160 18faff8d70da50a909b21359716e5c6fc29a35ee SHA1 6159dd1d5f53046239cd75a66b9f7a78e4f3d536 SHA256 08f0d4428c33dfd7003e93bf92adb5094a8a07f086b8aa252767df6b44930834
 EBUILD db-4.7.25_p3.ebuild 3969 RMD160 09ea8ff35bd50a1e13b5fbca45ee1321018a528f SHA1 3097b15d1807a684d20dc9c1fbd9b0f414b88ddd SHA256 7cffd88df1cdfb5108dd1b32b0ac986665b68538ee10fe00d85fce0840e5a5fb
 EBUILD db-4.7.25_p4.ebuild 4251 RMD160 188a55fbeb47340451651b8336da7607cf48ced8 SHA1 6e74480f4793e8e67a6a77b74bcacbcde5266fec SHA256 53cdf906e604d2a866127628f0dab1809c870aede7dd30984bb2e2440156f1f1
-EBUILD db-4.8.24.ebuild 4260 RMD160 f32b90fabda8ee61b6f2435785cad00a9d59229c SHA1 41095252375cca52435577e827ca8c2cc78c8ad7 SHA256 89f08a0eee39c92fb1e8d846b6b91528ab144048a7a867439e2518166b50698a
-MISC ChangeLog 45420 RMD160 d3cc84b06db8a6c848838c92893b571e5580fb04 SHA1 b3b19835a9c651a0e95920043b18f21877aa671f SHA256 0ecc537b889cc8e0971639899a6220bfb515ec2dd082f353e8de53dd446d0e8a
+EBUILD db-4.8.24.ebuild 4317 RMD160 320afbaa7a2142262710a817a8dc90bf613fa12b SHA1 52b48d1dd5069c0e6be5f0458c16e7c3cc0fe6db SHA256 656986e66e83d2a1a8ef9268231fc400b737b41cb4e07cb6e032789e695a3fca
+MISC ChangeLog 45583 RMD160 400daa32d838bdadb2110d1ba76e6ca21cd3525d SHA1 25b1598e50667c5b33417ad5c6eadfee58419906 SHA256 1a05217ac4ace7ac0dcd819842e6449da6c7987890028ccde99f385c9c6ffdc9
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.8.24.ebuild b/sys-libs/db/db-4.8.24.ebuild
index 7921d54469b6..77e3888f2d7d 100644
--- a/sys-libs/db/db-4.8.24.ebuild
+++ b/sys-libs/db/db-4.8.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.24.ebuild,v 1.1 2009/09/18 22:26:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.24.ebuild,v 1.2 2009/09/19 23:48:01 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -44,11 +44,12 @@ src_unpack() {
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	epatch "${FILESDIR}"/"${PN}"-4.8-libtool.patch
+	epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
 
 	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
 
 	sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
 
diff --git a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
new file mode 100644
index 000000000000..9cebadc52064
--- /dev/null
+++ b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch
@@ -0,0 +1,12 @@
+diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in
+--- db-4.8.24.orig/dist/Makefile.in	2009-09-19 23:39:45.286001896 +0000
++++ db-4.8.24/dist/Makefile.in	2009-09-19 23:41:13.079326882 +0000
+@@ -830,7 +830,7 @@
+ 	$(JAVA) -classpath $(JAVA_CLASSTOP) \
+ 	    com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP)
+ 	cd $(JAVA_CLASSTOP) && \
+-	     $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat
++	     $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat
+ 
+ $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS)
+ 	@test -d $(JAVA_EXCLASSTOP) || \