Fix 4.2 slot for SONAME bug #182972, java support bug #217661 and also properly do what the jarlocation patches were supported to do.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 176 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index bb1ba1c70d5a..ea08dc6c7c0e 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.258 2008/08/16 20:20:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.259 2008/08/16 22:22:17 robbat2 Exp $
+
+*db-4.2.52_p5-r1 (16 Aug 2008)
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +db-4.2.52_p5-r1.ebuild:
+  Fix 4.2 slot for SONAME bug #182972, java support bug #217661 and also
+  properly do what the jarlocation patches were supported to do.
 
 *db-4.3.29_p1-r1 (16 Aug 2008)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 8e1ca54e0312..c3f27abb270d 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -54,6 +54,7 @@ EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SH
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
 EBUILD db-3.2.9_p2.ebuild 4896 RMD160 21783a7f5ec04e0357bf4a33f48a9694c0a43048 SHA1 b1bb1f99ced5fe399bbb56f0afe96023b0dda5d3 SHA256 1baf48f35a49ae66588719725220640651afc77230f64e5e90b26d054e4c5e62
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 de46f7d210692588bbbed1acccb6e8aa5047bb5f SHA1 509c581644371e4735df1bfae0b57f056cb6fb6e SHA256 c29ae939d9740e0d43a57b178e2423a5bf72749a1bd1adc55c9ec901b43077c3
+EBUILD db-4.2.52_p5-r1.ebuild 5101 RMD160 66237ad74414a126cd6a5a0402613da8130d575d SHA1 4ad2718ac64c09e1a18c3f065d5a364c2f7f466d SHA256 b6fd948b3af04b43391899c4d4dffb385ee74c95724a3b498cfc5044f6fcae8e
 EBUILD db-4.2.52_p5.ebuild 3601 RMD160 1ae0ed4f4aefef8787cdfad43ba2b9538e3db3cc SHA1 a0f18167ecb42beb306b611a5d8c313fbfbc067b SHA256 2eec1df5abc79855a961e9d866a25791ae0c05bcf8c08c0e8967fd90ac597751
 EBUILD db-4.3.29-r2.ebuild 3715 RMD160 e0533bcad7d7eb9b6b3834ebea4ba4082d4b86f3 SHA1 a9d4f84420e5f1f2666a86efce3b8098b0fd8f8a SHA256 784011081d9ddeaaa611e3bbf982350cd090f2aa02dafa2b829b9f2bc6a9f62b
 EBUILD db-4.3.29_p1-r1.ebuild 5040 RMD160 856be9e8f2f1986a24f850dab1123e5797ddc45b SHA1 f25bea6ed38a4c522ccb586d445c0e238439ca67 SHA256 6dfce266bb3d6e67e812949d5a4609cd0021ed1ce44a35c2b72506d6541bc1c9
@@ -68,5 +69,5 @@ EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78
 EBUILD db-4.7.25.ebuild 3933 RMD160 98c4ddf234c7a274d7ae655008f2f010fda3bedc SHA1 1b0438c3811c64b66ac9a9711523fbe925e66027 SHA256 32ee208e2ab19cc48c04d732d2a7694803e9a15f84faa90374329600698e5669
 EBUILD db-4.7.25_p1-r1.ebuild 4919 RMD160 e5012ef72bd68e11f97aacf22edfcfca338c9699 SHA1 63d33659ba0673dfe30b3bb13c7efee3fd38cc6d SHA256 a8b80f986f4f44242c8f79a8e5e93bf80955deb8dfb4b241393445b9ed8d57ac
 EBUILD db-4.7.25_p1.ebuild 3936 RMD160 a61846bc739c71452b7e72489c639ffbe7aa9591 SHA1 a1723f9759a2d6030f4c2e0fad5bf97677db1aaf SHA256 2ee7ea6bce661792a46b92c2943688101a3b5c9c3c3f8b348eeede1c08d3228c
-MISC ChangeLog 39808 RMD160 8ee5615b383621ce8ce93b6a7d5205ee65f8dc82 SHA1 7de78749b1021798209e8f77c2e3e71232046dce SHA256 f80834e14c54ea710a7ee7b61ba8698a5cd1761daa8df0bd4648b0dedf571c84
+MISC ChangeLog 40059 RMD160 5b80bfd63814b1ea6d6c73820a236c9d781a17cf SHA1 070b0f7805952cd9c50a17ecf72214ed6ecb9cfd SHA256 6bebdb788283e1a0ed6b49f1a94e2e73808e7ebf448f013c0020e321172152ec
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild
new file mode 100644
index 000000000000..152a957c0015
--- /dev/null
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.1 2008/08/16 22:22:17 robbat2 Exp $
+
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+	MY_PV=${PV}
+	MY_P=${P}
+	PATCHNO=0
+else
+	MY_PV=${PV/_p${PATCHNO}}
+	MY_P=${PN}-${MY_PV}
+fi
+
+S="${WORKDIR}/${MY_P}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="DB"
+SLOT="4.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="tcl? ( dev-lang/tcl )
+	java? ( >=virtual/jre-1.4 )"
+
+src_unpack() {
+	unpack "${MY_P}".tar.gz
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+	epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
+	# This patch and sed statement only matter when USE=bootstrap is in effect
+	# because the build system is regenerated otherwise.
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
+
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
+	epatch "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch
+
+	# Include the SLOT for Java JAR files
+	# This supersedes the unused jarlocation patches.
+	sed -r -i \
+		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+		"${S}"/../dist/Makefile.in
+
+	# During bootstrap, libtool etc might not yet be available
+	if use !bootstrap; then
+		# START of 4.5+earlier specific
+		# Upstream sucks, they normally concat these
+		cd "${S}"/../dist/aclocal
+		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+		cd "${S}"/../dist/aclocal_java
+		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+		# END of 4.5+earlier specific
+		cd "${S}"/../dist
+		rm -f aclocal/libtool.{m4,ac} aclocal.m4
+		AT_M4DIR="aclocal aclocal_java" eautoreconf
+		# Upstream sucks - they do autoconf and THEN replace the version variables.
+		. ./RELEASE
+		sed -i \
+			-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+			-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+			-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+			-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+			-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+			-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
+	fi
+}
+
+src_compile() {
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcl \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --disable-tcl"
+
+	myconf="${myconf} $(use_enable java)"
+	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}"
+
+	# the entire testsuite needs the TCL functionality
+	if use tcl && has test $FEATURES; then
+		myconf="${myconf} --enable-test"
+	else
+		myconf="${myconf} --disable-test"
+	fi
+
+	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/"$(get_libdir)" \
+		--enable-compat185 \
+		--with-uniquename \
+		--enable-rpc \
+		--host="${CHOST}" \
+		${myconf} "${javaconf}" || die "configure failed"
+
+	# This isn't safe for prefix (Darwin should be .jnilib), but I can't get the
+	# build system to behave itself, it generates libtool too late.
+	sed -i \
+		-e 's/-shrext  $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \
+		Makefile
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
+
+	db_src_install_usrbinslot
+
+	db_src_install_headerslot
+
+	db_src_install_doc
+
+	db_src_install_usrlibcleanup
+
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
+
+	if use java; then
+		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() {
+	db_fix_so
+}
+
+pkg_postrm() {
+	db_fix_so
+}