Fix 4.6 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, 178 insertions, 2 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 6c837b923e85..af5ed7e01bdf 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.254 2008/08/16 19:12:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.255 2008/08/16 19:41:03 robbat2 Exp $
+
+*db-4.6.21_p3-r1 (16 Aug 2008)
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +db-4.6.21_p3-r1.ebuild:
+  Fix 4.6 slot for SONAME bug #182972, java support bug #217661 and also
+  properly do what the jarlocation patches were supported to do.
 
 *db-4.7.25_p1-r1 (16 Aug 2008)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2064ba6e57ea..e18e73b9a8c2 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -60,9 +60,10 @@ EBUILD db-4.3.29_p1.ebuild 3771 RMD160 d202d849ab74eb1ce91f7f0ceb30543d7ae85fd6
 EBUILD db-4.4.20_p4.ebuild 3683 RMD160 fb33c73182e555de6fd419a3c0d04f948d53685d SHA1 ad56ab59f80816cdc50538db331af5056da99327 SHA256 5f4c9808f5776fc08011250de1054f97ab209d52c84af5bab721a9992c855989
 EBUILD db-4.5.20_p2.ebuild 3937 RMD160 d7857fc73ba5e3e46f3d2e056863112e6b0b01b2 SHA1 9037c83cc03dffce5857ff923dd8ef39178d877b SHA256 9740c42be6b0589191da27209ae1817816e05b5dc5fab2727397c1090ea66411
 EBUILD db-4.6.21_p1.ebuild 3938 RMD160 73adabeb81be1df6cdefbd92838c31980d473f1a SHA1 41ca803b0c7fac5d156f9ad2ff594ccd20458b52 SHA256 6dfb6e2516531b3716df28a5da2955a89d142f5126b059b171a8dba036d402b2
+EBUILD db-4.6.21_p3-r1.ebuild 4931 RMD160 c31ed3bf93b54a7a9119c816df73d5583b496e67 SHA1 8410a05fa8c2f82d7ad074b1cd4049f8e1387201 SHA256 bd2d02dca4c70ce53533233129f000af397b5d06b1c41efb22ece40bb6aa53c2
 EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78 SHA1 c54aeca496c02ae5e37eb7ed068f8db15fc09ddf SHA256 7d93f4471fff67da3ee6c2d15be5705a63e92c752edfbbd503435e9504f65e90
 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 38804 RMD160 331c668d56f8924297cf90d177bd3136cf30bcc5 SHA1 32c3b45afc1caad18484de735c3d269d0ece0d5c SHA256 25988f3730a84b5f8a1baf03b55692db122792ccdec1f2b01faf3c7ce73284fd
+MISC ChangeLog 39055 RMD160 ef54e459d1c53d765d642cd62a6a73bfea8a17b9 SHA1 edaf8b1c1ad8a00f5a2626575111ae156929738b SHA256 dc9dbdeed9ff187a690a8829978daf53acf93f6bd4a2c048cb8e8fa7cb7ebc10
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
diff --git a/sys-libs/db/db-4.6.21_p3-r1.ebuild b/sys-libs/db/db-4.6.21_p3-r1.ebuild
new file mode 100644
index 000000000000..b8119d85e104
--- /dev/null
+++ b/sys-libs/db/db-4.6.21_p3-r1.ebuild
@@ -0,0 +1,168 @@
+# 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.6.21_p3-r1.ebuild,v 1.1 2008/08/16 19:41:03 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="OracleDB"
+SLOT="4.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )
+	>=sys-devel/binutils-2.16.1"
+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
+	# 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}"-4.3-listen-to-java-options.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
+		cd "${S}"/../dist
+		rm -f aclocal/libtool.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() {
+	# compilation with -O0 fails on amd64, see bug #171231
+	if use amd64; then
+		replace-flags -O0 -O2
+		is-flag -O[s123] || append-flags -O2
+	fi
+
+	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
+
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU; then
+		append-ldflags -Wl,--default-symver
+	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 \
+		--without-uniquename \
+		--enable-rpc \
+		--host="${CHOST}" \
+		${myconf}  "${javaconf}" || die "configure failed"
+
+	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+	    && mv Makefile.cpy Makefile
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || 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
+}