version bump

Package-Manager: portage-2.1.3.16

4 files changed, 166 insertions, 5 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 55c14f3f27f3..05649498c67c 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.229 2007/10/25 18:02:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.230 2007/11/04 18:58:11 caleb Exp $
+
+*db-4.6.21 (04 Nov 2007)
+
+  04 Nov 2007; Caleb Tennis <caleb@gentoo.org> +db-4.6.21.ebuild:
+  version bump
 
   25 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org> +db-3.2.9-r10.ebuild:
   Restored removed version since it broke deps on mips and hppa.
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 00c5fd247845..15fd75fc2b20 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -105,6 +105,7 @@ DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SH
 DIST db-4.4.20.tar.gz 8112163 RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 SHA1 1931c0774c3e2fc45741ba9b7c4187a12801184c SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57
 DIST db-4.5.20.tar.gz 9281894 RMD160 5fc492efcddce6f446c5977128f5526f73763e01 SHA1 0e5a6c152c5d7089899481d9de689d1f7e77bde1 SHA256 f52cd5cea899823dd200d56556f70b33c55e48a33bb7b65ee128968dc10ca82d
 DIST db-4.6.19.tar.gz 11878084 RMD160 1fe0df7325be1cfb24ad4163a9e52da979f70574 SHA1 8980f4319ebf7d16c06cf01068b51c78affad07e SHA256 d2edf7def02bf453c60d1bce1e32bb2187af9f1ca86c278941cd24a981249728
+DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e SHA1 5be3beb82e42a78ff671a3f5a4c30e5652972119 SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
 DIST db.1.85.patch 55584 RMD160 e4433e45e13764b8d0cdf948909f6f5b8f9ed7ff SHA1 cb2079ecb3df5035ad27b80b42052fc689a408a6 SHA256 6df42acf6d7bec774b1bdc1629abadf7b006d622e2bbcf638aed7985eacdd48e
 DIST db.1.85.tar.gz 270953 RMD160 594253b7e80323cddc92cd7c89934217d403f58b SHA1 ccb057b07761d1b2b34626e748c7392c749d5e6d SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6
 DIST patch.4.2.52.1 988 RMD160 1ff7d93c4e6223b793ed3038070a4f0957dac44e SHA1 fdbe677eb4314309e855c35359a493284ddc1936 SHA256 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
@@ -153,10 +154,14 @@ EBUILD db-4.6.19.ebuild 3938 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 SHA
 MD5 120bd6f54a46b00d13fa5b6fa055c30c db-4.6.19.ebuild 3938
 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 db-4.6.19.ebuild 3938
 SHA256 b02f92bf555c84949b219db80bca55b35d7a66952c2a6f728dc74898672c865a db-4.6.19.ebuild 3938
-MISC ChangeLog 34889 RMD160 ae00d8570e428692fd67df59308444d9f134c35a SHA1 9e7c425f51c1bdf3ae61037eb5c67b0e05f1d909 SHA256 a82c20b554896e2f80178d83eb979d7910ee85c81fcdce0ab139d40f89758a79
-MD5 39aeed301111f009cf537e2dd10fd526 ChangeLog 34889
-RMD160 ae00d8570e428692fd67df59308444d9f134c35a ChangeLog 34889
-SHA256 a82c20b554896e2f80178d83eb979d7910ee85c81fcdce0ab139d40f89758a79 ChangeLog 34889
+EBUILD db-4.6.21.ebuild 3938 RMD160 8d7df2bb21d740d0da7bcd60c1f9edcb7dec4338 SHA1 cbc5fb34a2b079c16e97d09a3104143d124f19e7 SHA256 e4677cca7003cf0913f7adbd09b3d834b517e80c2ad339ee305f7e7cd51e96bb
+MD5 20f9675236bcca916196d94c3f6001f5 db-4.6.21.ebuild 3938
+RMD160 8d7df2bb21d740d0da7bcd60c1f9edcb7dec4338 db-4.6.21.ebuild 3938
+SHA256 e4677cca7003cf0913f7adbd09b3d834b517e80c2ad339ee305f7e7cd51e96bb db-4.6.21.ebuild 3938
+MISC ChangeLog 34993 RMD160 d2597a5811febbb2ff129bc1125f01c0d33ac7d2 SHA1 2baf86857a41d1cd7a41c4f665541a7f2a45c0f3 SHA256 cea2735c9dcba2e48e7a275a347f8f067a5d146fc67324a50e096882b1951d97
+MD5 bc453e64063f420c68a257bef3cf2e4d ChangeLog 34993
+RMD160 d2597a5811febbb2ff129bc1125f01c0d33ac7d2 ChangeLog 34993
+SHA256 cea2735c9dcba2e48e7a275a347f8f067a5d146fc67324a50e096882b1951d97 ChangeLog 34993
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
 MD5 71519f9e67010bd7b9d8aff6b19b8c15 metadata.xml 1651
 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 metadata.xml 1651
@@ -188,3 +193,6 @@ SHA256 cbec0b3c04af33d3c45800e6e7541405b086000a94b3faa0d376a0efe5f15892 files/di
 MD5 1ab5380b1655ec29f4fce0e224ebd373 files/digest-db-4.6.19 235
 RMD160 3ac73e5abf9de4cb3912d0c37e28e3329f0dba21 files/digest-db-4.6.19 235
 SHA256 76330bd28befebdc546c4efbcee042b577e7a668711e3694d0a6e8c6b952638e files/digest-db-4.6.19 235
+MD5 7c6a146ce42585fb887f5b46ba41a692 files/digest-db-4.6.21 235
+RMD160 d897dcae15e2a3ed5570aafe7a47203f955b62df files/digest-db-4.6.21 235
+SHA256 ff1749bd616e5ce0acea340739e3454251d2f829caceaeb19d8f5b1e46de08be files/digest-db-4.6.21 235
diff --git a/sys-libs/db/db-4.6.21.ebuild b/sys-libs/db/db-4.6.21.ebuild
new file mode 100644
index 000000000000..1e22b7f64834
--- /dev/null
+++ b/sys-libs/db/db-4.6.21.ebuild
@@ -0,0 +1,145 @@
+# 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.6.21.ebuild,v 1.1 2007/11/04 18:58:11 caleb Exp $
+
+inherit eutils 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.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
+	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+
+	# 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
+
+	sed -i \
+		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+		"${S}"/../dist/configure
+}
+
+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_db46_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/files/digest-db-4.6.21 b/sys-libs/db/files/digest-db-4.6.21
new file mode 100644
index 000000000000..e680c8356be2
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.6.21
@@ -0,0 +1,3 @@
+MD5 718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz 11881885
+RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e db-4.6.21.tar.gz 11881885
+SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21 db-4.6.21.tar.gz 11881885