Let db-4.4.20 also use the new java eclasses. No bump as it is still masked

Package-Manager: portage-2.1.1_pre4-r1

3 files changed, 46 insertions, 50 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index c1edf4d185f6..ccf3f11d96cd 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
 # 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.166 2006/08/03 23:46:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.167 2006/08/06 12:24:03 pauldv Exp $
+
+  06 Aug 2006; Paul de Vrieze <pauldv@gentoo.org> db-4.4.20_p2.ebuild:
+  Use new java class for db-4.4 too.
 
   03 Aug 2006; Doug Goldstein <cardoe@gentoo.org> db-3.2.9-r10.ebuild,
   db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 3c1cb776e80e..c468a248ed95 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf files/db-1.85-gentoo-paths.patch 684
@@ -176,14 +173,14 @@ EBUILD db-4.3.29.ebuild 3364 RMD160 63e4aa21ae2f8fd9a6809c7069efdde0e8b4c891 SHA
 MD5 cf34a6026dc53c3b693b6cde994dc807 db-4.3.29.ebuild 3364
 RMD160 63e4aa21ae2f8fd9a6809c7069efdde0e8b4c891 db-4.3.29.ebuild 3364
 SHA256 a3571676734b395b028f77373d7406e89bcd8613efbf57bd5ad65a5a6a1de73a db-4.3.29.ebuild 3364
-EBUILD db-4.4.20_p2.ebuild 3272 RMD160 050b1642246bdf823b5e5edf43650227a79cc5b8 SHA1 45cea61f411fd16e692351eabb92c3f4da09d539 SHA256 7c57ca86463d22396f4d05380e64f8a21dc1ede70332d7733a9ca2f7b897a22c
-MD5 742cd8d6614ae04f8d16327c280bff3b db-4.4.20_p2.ebuild 3272
-RMD160 050b1642246bdf823b5e5edf43650227a79cc5b8 db-4.4.20_p2.ebuild 3272
-SHA256 7c57ca86463d22396f4d05380e64f8a21dc1ede70332d7733a9ca2f7b897a22c db-4.4.20_p2.ebuild 3272
-MISC ChangeLog 26196 RMD160 f644df7e86de999e73b35948855b4b9400727bf2 SHA1 9a97f3410c9dd38326b4f4f370c60b0b5549e622 SHA256 5c2519ec50360dbc9ffd9ddc116b358990a4827c77395ead1e0da4bb7d5c5d98
-MD5 b5102fdca4cdaeb335338ef61a225dd5 ChangeLog 26196
-RMD160 f644df7e86de999e73b35948855b4b9400727bf2 ChangeLog 26196
-SHA256 5c2519ec50360dbc9ffd9ddc116b358990a4827c77395ead1e0da4bb7d5c5d98 ChangeLog 26196
+EBUILD db-4.4.20_p2.ebuild 3578 RMD160 6f159ffcbc623f79c024d3a59b653207238bf3f4 SHA1 5c3030a6b4f5820504a49bc9f569a92b711adaaa SHA256 aacbb287abfee6363b79967f78fea1a363c42171b2f2b7e582a4a0ddb5f52e7d
+MD5 b0b459cd090db772bdfc39ea1f5417c4 db-4.4.20_p2.ebuild 3578
+RMD160 6f159ffcbc623f79c024d3a59b653207238bf3f4 db-4.4.20_p2.ebuild 3578
+SHA256 aacbb287abfee6363b79967f78fea1a363c42171b2f2b7e582a4a0ddb5f52e7d db-4.4.20_p2.ebuild 3578
+MISC ChangeLog 26305 RMD160 6c2c969cdb715956d6816fed9b6b16fdf6f3a86c SHA1 3e3e4d643356f674779cd11f1d75521bfc9f6552 SHA256 8247f71c06ea4400265aaf6f0a06f4b1c5ae4cbc336df58e90b867751042d7be
+MD5 9417dd431a36cd1cca48767745fc3d48 ChangeLog 26305
+RMD160 6c2c969cdb715956d6816fed9b6b16fdf6f3a86c ChangeLog 26305
+SHA256 8247f71c06ea4400265aaf6f0a06f4b1c5ae4cbc336df58e90b867751042d7be ChangeLog 26305
 MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460
@@ -239,10 +236,3 @@ SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/di
 MD5 c36ac17ff6e664f9a8f5bd2fe3534dd5 files/digest-db-4.4.20_p2 660
 RMD160 fa3804c13649e3d5d0bc42c5a7822764be74a674 files/digest-db-4.4.20_p2 660
 SHA256 dcce09c08cdfddd585acc3b07685a92d1f78dad6ce7936b85728cf782b4c2096 files/digest-db-4.4.20_p2 660
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFE0oqzoeSe8B0zEfwRAmEQAJ9B3FjlFxtQCXw1CBIJtWpI8e2q+gCfRCIJ
-O0ZyVxW/hsXWlcDF+aIUOow=
-=TnDW
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.4.20_p2.ebuild b/sys-libs/db/db-4.4.20_p2.ebuild
index f6a65dbb3e2e..9ef333f5d878 100644
--- a/sys-libs/db/db-4.4.20_p2.ebuild
+++ b/sys-libs/db/db-4.4.20_p2.ebuild
@@ -1,13 +1,13 @@
 # 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_p2.ebuild,v 1.3 2006/08/03 23:46:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p2.ebuild,v 1.4 2006/08/06 12:24:03 pauldv Exp $
 
-inherit eutils gnuconfig db flag-o-matic
+inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
 PATCHNO=${PV/*.*.*_p}
-if [ "${PATCHNO}" == "${PV}" ]; then
+if [[ ${PATCHNO} == "${PV}" ]] ; then
 	MY_PV=${PV}
 	MY_P=${P}
 	PATCHNO=0
@@ -16,11 +16,11 @@ else
 	MY_P=${PN}-${MY_PV}
 fi
 
-S=${WORKDIR}/${MY_P}/build_unix
+S="${WORKDIR}/${MY_P}/build_unix"
 DESCRIPTION="Berkeley DB"
 HOMEPAGE="http://www.sleepycat.com/"
 SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
@@ -30,29 +30,32 @@ KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="tcl java doc nocxx bootstrap"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( virtual/jdk )
+	java? ( >=virtual/jdk-1.4 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( virtual/jre )"
+	java? ( >=virtual/jre-1.4 )"
 
 src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${WORKDIR}/${MY_P}
-	for (( i=1 ; i<=$PATCHNO ; i++ ))
+	unpack "${MY_P}".tar.gz
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
 	do
-		epatch ${DISTDIR}/patch.${MY_PV}.${i}
+		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
-	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
 
-	gnuconfig_update "${S}/../dist"
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
 
-	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+	gnuconfig_update "${S}"/../dist
+
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
 }
 
 src_compile() {
-	addwrite /proc/self/maps
-
 	local myconf=""
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
@@ -66,9 +69,11 @@ src_compile() {
 		|| myconf="${myconf} --disable-tcl"
 
 	myconf="${myconf} $(use_enable java)"
-	if use java && [[ -n ${JAVAC} ]] ; then
-		export PATH=`dirname ${JAVAC}`:${PATH}
-		export JAVAC=`basename ${JAVAC}`
+	if use java; then
+		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
+		# Can't get this working any other way, since it returns spaces, and
+		# bash doesn't seem to want to pass correctly in any way i try
+		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
 	fi
 
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
@@ -93,12 +98,12 @@ src_compile() {
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
-		--libdir=/usr/$(get_libdir) \
+		--libdir=/usr/"$(get_libdir)" \
 		--enable-compat185 \
 		--without-uniquename \
 		--enable-rpc \
-		--host=${CHOST} \
-		${myconf} || die "configure failed"
+		--host="${CHOST}" \
+		${myconf}  "${javaconf}" || die "configure failed"
 
 	emake -j1 || die "make failed"
 }
@@ -115,21 +120,19 @@ src_install() {
 	db_src_install_usrlibcleanup
 
 	dodir /usr/sbin
-	mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db44_svc
+	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db44_svc
 
 	if use java; then
-		mkdir -p ${D}/usr/share/db
-		cat <<EOF >${D}/usr/share/db/package.env
-DESCRIPTION=The java bindings for berkeley db version ${MY_PV}
-CLASSPATH=:/usr/lib/db-${SLOT}.jar
-EOF
+		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
 	fi
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	db_fix_so
 }
 
-pkg_postrm () {
+pkg_postrm() {
 	db_fix_so
 }