Fix jar filename

(Portage version: 2.1_pre5-r4)

4 files changed, 31 insertions, 10 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 66d2ce451002..c6aa9e86344b 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.152 2006/03/09 19:35:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.153 2006/03/12 15:24:18 pauldv Exp $
+
+  12 Mar 2006; Paul de Vrieze <pauldv@gentoo.org>
+  +files/db-4.4-jarlocation.patch, db-4.4.20.ebuild:
+  Fix the jar filenames. I missed that when creating the package. Thanks to
+  Hanno Meyer-Thurow (h.mth@web.de) in bug #125758.
 
   09 Mar 2006; Paul de Vrieze <pauldv@gentoo.org> db-4.2.52_p4.ebuild:
   Disable stripping (bug #125581)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index b23aff51fecd..0598247597bc 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -43,9 +43,9 @@ SHA256 038420d313309f2198e28fab5f14eadf6d90bc79118f01e226e5d645c8b2f947 db-4.3.2
 MD5 6fb0d120950a8b8e3271d094e8252d1b db-4.3.29.ebuild 3270
 RMD160 307b4698c7055b3626cc32b85536d519f6992de7 db-4.3.29.ebuild 3270
 SHA256 ccd075e47c66ef3bc0bef6766aacb6453d61f502a9c18a9284f821cfee4483a4 db-4.3.29.ebuild 3270
-MD5 b6b5c6e643d56df5ec569345468ccca1 db-4.4.20.ebuild 3324
-RMD160 f27970f1542d4330653e3ec11d78676d9ed6300e db-4.4.20.ebuild 3324
-SHA256 4c1d4c05ac22be627acea8b63a738924e7e3f25bd8488c2d3c950c8100ed04cb db-4.4.20.ebuild 3324
+MD5 ceb5085f0b3b92d97effb2256632eb11 db-4.4.20.ebuild 3240
+RMD160 54ae22c630576f60ab1271dfb990bf8f45924369 db-4.4.20.ebuild 3240
+SHA256 a0fa91209c5e73d34560f1a501f51f6d0f88a914007b67eca8c01dcdcedbe25e db-4.4.20.ebuild 3240
 MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf files/db-1.85-gentoo-paths.patch 684
 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f files/db-1.85-gentoo-paths.patch 684
@@ -91,6 +91,9 @@ SHA256 2ec92f53f9ae5431acfbe4fdaddc5406730b98f3bf372d58f0ad69c69fa16df4 files/db
 MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
 RMD160 c7c5d28f6e7083bffbab29e43cb57d800eceba6e files/db-4.3.27-fix-dep-link.patch 1179
 SHA256 fc5c59311dadd11dde7ba6b6e975069a52e1ded76fcebe1b76927b79899fe425 files/db-4.3.27-fix-dep-link.patch 1179
+MD5 6835dc7cf78fd7126ade8458f237eab0 files/db-4.4-jarlocation.patch 599
+RMD160 0981160a48833f126fa10e30eea2a394206895e4 files/db-4.4-jarlocation.patch 599
+SHA256 c48eb518efd9ae1a7a9a6990b90c5748ba5682aaac7d20b48e82c6bc03fc698f files/db-4.4-jarlocation.patch 599
 MD5 01f6ce9181e5e748014b1dc5e747e3bd files/db-4.4-libtool.patch 1817
 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b files/db-4.4-libtool.patch 1817
 SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21 files/db-4.4-libtool.patch 1817
diff --git a/sys-libs/db/db-4.4.20.ebuild b/sys-libs/db/db-4.4.20.ebuild
index 9a597404f179..05f9181f719b 100644
--- a/sys-libs/db/db-4.4.20.ebuild
+++ b/sys-libs/db/db-4.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20.ebuild,v 1.3 2006/02/22 20:51:59 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20.ebuild,v 1.4 2006/03/12 15:24:18 pauldv Exp $
 
 inherit eutils gnuconfig db flag-o-matic
 
@@ -41,12 +41,9 @@ src_unpack() {
 	do
 		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
-	epatch ${FILESDIR}/${PN}-4.3-jarlocation.patch
+	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
 	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
 
-# Does no longer work on 4.4, but it's use is not clear.
-#	epatch ${FILESDIR}/${PN}-4.3.27-fix-dep-link.patch
-
 	gnuconfig_update "${S}/../dist"
 
 	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
@@ -106,7 +103,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" || die
+	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/files/db-4.4-jarlocation.patch b/sys-libs/db/files/db-4.4-jarlocation.patch
new file mode 100644
index 000000000000..c0d689f43691
--- /dev/null
+++ b/sys-libs/db/files/db-4.4-jarlocation.patch
@@ -0,0 +1,16 @@
+diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
+--- db-4.1.25.old/dist/Makefile.in	2003-10-18 02:15:45.000000000 -0700
++++ db-4.1.25/dist/Makefile.in	2003-10-18 02:13:47.000000000 -0700
+@@ -107,9 +107,9 @@
+ JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
+ JAVA_RPCDIR=	$(srcdir)/rpc_server/java
+ 
+-libj_jarfile=	db.jar
+-libj_exjarfile=	dbexamples.jar
+-rpc_jarfile=	dbsvc.jar
++libj_jarfile=	db-4.4.jar
++libj_exjarfile=	dbexamples-4.4.jar
++rpc_jarfile=	dbsvc-4.4.jar
+ libjso_base=	libdb_java
+ libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a