Bump 4.4.20 to _p4

(Portage version: 2.1.2-r12)

4 files changed, 161 insertions, 3 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 6390f622fafe..9d7bd566d0e7 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.194 2007/02/27 20:18:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.195 2007/02/27 20:28:23 caleb Exp $
+
+*db-4.4.20_p4 (27 Feb 2007)
+
+  27 Feb 2007; Caleb Tennis <caleb@gentoo.org> +db-4.4.20_p4.ebuild:
+  Bump to 4.4.20_p4, change SRC_URI to reflect new location of stuff
 
 *db-4.5.20_p2 (27 Feb 2007)
 
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
new file mode 100644
index 000000000000..30c36b18ed01
--- /dev/null
+++ b/sys-libs/db/db-4.4.20_p4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2007 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_p4.ebuild,v 1.1 2007/02/27 20:28:23 caleb Exp $
+
+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
+	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-west.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.4"
+KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~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 )
+	>=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
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
+
+	gnuconfig_update "${S}"/../dist
+
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
+}
+
+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
+
+	# 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
+
+	../dist/configure \
+		--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"
+
+	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_db44_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
+}
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index 55678ac12633..d8392215317b 100644
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.1 2007/02/27 20:18:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.2 2007/02/27 20:28:23 caleb Exp $
 
 inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
 
@@ -120,7 +120,7 @@ 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_db45_svc
 
 	if use java; then
 		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
diff --git a/sys-libs/db/files/digest-db-4.4.20_p4 b/sys-libs/db/files/digest-db-4.4.20_p4
new file mode 100644
index 000000000000..0066d2e0f078
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.4.20_p4
@@ -0,0 +1,15 @@
+MD5 33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz 8112163
+RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 db-4.4.20.tar.gz 8112163
+SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57 db-4.4.20.tar.gz 8112163
+MD5 66584d621355df055b6e05b4a02e9c3e patch.4.4.20.1 867
+RMD160 57ecff5ecb934e1eb771c49e4e67246d579702b2 patch.4.4.20.1 867
+SHA256 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869 patch.4.4.20.1 867
+MD5 85df93a0867f6cace3501671cdeb6ed1 patch.4.4.20.2 721
+RMD160 e560b07cc20dbd6865d8aad91941515f8fb031c1 patch.4.4.20.2 721
+SHA256 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc patch.4.4.20.2 721
+MD5 88ee91889ebf5498b22b2e7bed945d41 patch.4.4.20.3 1366
+RMD160 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 patch.4.4.20.3 1366
+SHA256 ae54bb752a31655a1a945f12900b740fad397c3e2ddab792ecfd4660d3e6e236 patch.4.4.20.3 1366
+MD5 c2ef7b3e59460c35950fab5f2faa3fc0 patch.4.4.20.4 837
+RMD160 46cf2177aee1ce00c0044817610231541722c4d3 patch.4.4.20.4 837
+SHA256 7018f74e5184451809f6864172132472e91d95e2bec97ce6124afb67f0d65e59 patch.4.4.20.4 837