updated db:4.6 to 4.6.21_p4, and the glib Manifest

2 files changed, 167 insertions, 0 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 5eb18ed49..89f64d064 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -11,7 +11,9 @@ DIST patch.4.5.20.2 1752 RMD160 d35069e8267f02e64e6f1be046d6cb9e75e9e720 SHA1 a3
 DIST patch.4.6.21.1 2475 RMD160 8c11e9b991ac6559f22ece2d93617b16126049e8 SHA1 c7c155705687e4de03d06c2ea86940f573fdac0b SHA256 d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
 DIST patch.4.6.21.2 892 RMD160 f8abf554552db668037e046dea54700ce3340bf8 SHA1 a694b71088ba99b74042e7568f395fe467bb6590 SHA256 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9
 DIST patch.4.6.21.3 1517 RMD160 63743d910f8c3832409bdc6e7d74db0fcdd686a5 SHA1 a893f6bcdb6ae1f9395c027431c038168d500c9b SHA256 3f531b18d88ce68ff080761cd62ef621444e675593aa23045d69121cd2c7c638
+DIST patch.4.6.21.4 41501 RMD160 f1d18e59c311fb4e1f00a3b6220269fca17df312 SHA1 e2190185c667edb97e800495ce6eb4f95f43eb87 SHA256 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7
 EBUILD db-4.5.20_p2-r1.ebuild 5491 RMD160 f5d97d15bc07557890ac2ee7e7359d94358a988d SHA1 86accc1bfa54369d006485a4d2145dcfd6e30db5 SHA256 07c0d4867e4d7cf963de42a1c26b9d031103d69c33fd8d36f7f998e0149dd6f0
 EBUILD db-4.6.21_p3-r1.ebuild 4786 RMD160 9b6d4d00593bfc9da2f487cddeed6029cf45630a SHA1 6ca185d7fa23bdfed8906d840b0d954963dba5da SHA256 01ea0317f01b0f83f97c5b5169f7c61e7aea37cec3fc5c905deca1fa16619479
+EBUILD db-4.6.21_p4.ebuild 4758 RMD160 c97b10fad5643a1862635ccb3dcba02a4ba9802a SHA1 6c835b8cc61208888b96b51a978656bf6b5a04a6 SHA256 f6e2b92f9012413491bd495c585ff451cf3a7b5bf923604fa087c7adf185b0d2
 MISC ChangeLog 42695 RMD160 6f2467133ad1c7477f5f81c9d51fde716850eb52 SHA1 943c92610b1928a6001f50d9366d718aa5de7133 SHA256 bfcee44fc0dc89a4650c6c0f4b8507ed7993738e29627ced40597d14a89838b4
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
new file mode 100644
index 000000000..2595042f9
--- /dev/null
+++ b/sys-libs/db/db-4.6.21_p4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2009 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_p4.ebuild,v 1.1 2009/03/21 12:23:59 caleb Exp $
+
+inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool multilib-xlibs
+
+#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}"
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx"
+
+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 "${S}"
+	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
+
+	# 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
+
+	cd "${S}"/dist
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.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
+}
+
+multilib-xlibs_src_compile_internal() {
+	# compilation with -O0 fails on amd64, see bug #171231
+	if use amd64 && [ ${ABI} = "amd64" ]; then
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	local myconf=""
+
+	use amd64 && [ ${ABI} = "amd64" ] && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	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}/build_unix" && 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 \
+		--enable-o_direct \
+		--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 || die "make failed"
+}
+
+multilib-xlibs_src_install_internal() {
+	cd build_unix && 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
+}