Version bump (bug #286283), added fixlocalpod to fix bug #256572.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 206 insertions, 3 deletions

diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog
index 14fc21a2be62..4c2ab450c447 100644
--- a/dev-libs/dbxml/ChangeLog
+++ b/dev-libs/dbxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/dbxml
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.6 2009/03/25 11:40:54 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.7 2010/01/19 09:28:44 dev-zero Exp $
+
+*dbxml-2.5.16 (19 Jan 2010)
+
+  19 Jan 2010; Tiziano Müller <dev-zero@gentoo.org> +dbxml-2.5.16.ebuild:
+  Version bump (bug #286283), added fixlocalpod to fix bug #256572.
 
   25 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> dbxml-2.4.16.1.ebuild:
   Fix dos line-endings, bug 263712. Thanks to Guido Jäkel
diff --git a/dev-libs/dbxml/Manifest b/dev-libs/dbxml/Manifest
index da9d06915783..3b66f6f21199 100644
--- a/dev-libs/dbxml/Manifest
+++ b/dev-libs/dbxml/Manifest
@@ -1,10 +1,12 @@
 AUX 2.4.13-as_needed.patch 385 RMD160 3e18c695ed96a49ed7decb91b0253d3b1e20f1c6 SHA1 c341ca17c99fa90880a70e2064fdf8c6924890c1 SHA256 9cd161d2f70dc9e006303b3c1c1cce1bb5a63fa4c3fe296c92c5953f1fef9150
 DIST dbxml-2.4.13.tar.gz 46607043 RMD160 d4d8b32f49644981b6315c67dd5336fb5e9db568 SHA1 21ac0a3a49dd342695e1efaf4544a51c1d3b2951 SHA256 0d6dd8cdae71b1579b708c5c4c0620b94f3c16aeab9d32cdba4fc967a243f625
 DIST dbxml-2.4.16.tar.gz 37634783 RMD160 f469a17f9d05fcff3b2d83e4f7a429dbee1faee4 SHA1 023d0bab9791525d610c71cd5015771ed6b03334 SHA256 c6f826f11070ed6213c187f4a56ee74d370735be9f606763c0fdd890a4c91053
+DIST dbxml-2.5.16.tar.gz 52819154 RMD160 fdb4c85271cb84a8e31931d8fb287ad17fafff9c SHA1 46f0e6b301e556c2502e4da0cd96a599acc53837 SHA256 f2423be3805811a9cca71d6877c0b1bdc1941cd76c3f26d6eb011a5724a3edd2
 DIST patch.2.4.13.1 34622 RMD160 55483f986273a1f5eaaf8b6a1485ac85ec892dfa SHA1 73a234e53ba3395f5e6ede30885ac9d47e4befa2 SHA256 1538c3e6271982ca025419147954ff317e3ffa832a8f37347bedc298a4c0bcd3
 DIST patch.2.4.13.2 15659 RMD160 14cd67516e2519d65db90d3f985df1e6025294fd SHA1 39b98b7b863d91714be1c3d95328f5447e617566 SHA256 a54859bec9fafc360efbdd0838b1ef4535b83ba44f28fd44d9018fe22e47d1d9
 DIST patch.2.4.16.1 39989 RMD160 893f74569c09143f5902cdefb889dbc57905af18 SHA1 b639e71abe8b006ea3490ce78764dac1ee35199d SHA256 229b43606db5a380ce0e8269d7a72ec4b6434156e984a4235df11db9eacb997b
 EBUILD dbxml-2.4.13.2.ebuild 4950 RMD160 57f1f11edce1d0f7870d8653205faaa2a93e945f SHA1 6071b72188605c982b86912f0e2432a3f1cd6544 SHA256 a703f4c7a34eddddecfd15457d5f0c7629ddbb0a62eb2cd626b263cd7cbe0eb5
 EBUILD dbxml-2.4.16.1.ebuild 4984 RMD160 47ef79ab35246221a7239c339f032df9bd5617c6 SHA1 84bd4169e86816c0867f990f6d22098900187515 SHA256 9b64f8eedfcf02e67453a993f9ec117cade29640ad36e3b326099764972938f5
-MISC ChangeLog 1831 RMD160 9b5fe297bc8d8ed625ec8b122c81dfecd10ba08d SHA1 70e5a942ea06ac24e67cf4d38b12b299021624c9 SHA256 cc0dd2e6f459a012e434cb0460fb00ac607b09ef389d00031c879f0b3e8217ac
+EBUILD dbxml-2.5.16.ebuild 4995 RMD160 0fb8e80107b7df567c156bee60dd85632e5b748e SHA1 95b644edc2f282ca62b816350ebce39e03205f86 SHA256 fade8c067c6d4fd7f065b40b7cafae8ba72c8177270432665c534f1f4f3e325e
+MISC ChangeLog 2004 RMD160 cc0618a1725c7bd119bca90d03050d8933ea7369 SHA1 411255d2c021dc42b35f63bd13147164c4105f24 SHA256 eebf8f96c410b1d1c0a5379e06681efccce17d7718ee258aec2c21ae661ee80f
 MISC metadata.xml 255 RMD160 ffab53e6c250ea6880036224ec7944b5f25a2ff5 SHA1 fe663297149bc1158616da920b78c01b929398b9 SHA256 fce233aa3c475563b0dde3e7115a5f61f6da338070a7f995e9a9ba146468e935
diff --git a/dev-libs/dbxml/dbxml-2.5.16.ebuild b/dev-libs/dbxml/dbxml-2.5.16.ebuild
new file mode 100644
index 000000000000..a6dd1078ca1b
--- /dev/null
+++ b/dev-libs/dbxml/dbxml-2.5.16.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16.ebuild,v 1.1 2010/01/19 09:28:44 dev-zero Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic perl-app python eutils versionator libtool multilib java-pkg-opt-2
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="${PN}-${MY_PV}"
+PATCH_V="$(get_version_component_range 4)"
+PATCH_V="${PATCH_V:-0}"
+DB_VER="4.8"
+
+DESCRIPTION="BerkeleyDB XML, a native XML database from the BerkeleyDB team"
+HOMEPAGE="http://www.oracle.com/database/berkeley-db/xml/index.html"
+SRC_URI="http://download-east.oracle.com/berkeley-db/${MY_P}.tar.gz
+	http://download-west.oracle.com/berkeley-db/${MY_P}.tar.gz
+	http://download-uk.oracle.com/berkeley-db/${MY_P}.tar.gz"
+LICENSE="OracleDB Apache-1.1 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples java perl python tcl"
+
+RDEPEND="sys-libs/db:${DB_VER}[-nocxx,java?]
+	>=dev-libs/xerces-c-3
+	>=dev-libs/xqilla-2.1.2
+	sys-libs/zlib
+	perl? ( dev-lang/perl )
+	python? (
+		dev-lang/python:2.6
+		>=dev-python/bsddb3-4.8.0 )
+	tcl? ( dev-lang/tcl )
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	java? ( >=virtual/jdk-1.5 )"
+
+get_patches() {
+	local patches=""
+	local patch_v=1
+	while [ ${patch_v} -le ${PATCH_V} ] ; do
+		patches="${patches} patch.${MY_PV}.${patch_v}"
+		let "patch_v = ${patch_v} + 1"
+	done
+	echo ${patches}
+}
+
+for patch in $(get_patches) ; do
+	SRC_URI="${SRC_URI}
+		http://www.oracle.com/technology/products/berkeley-db/xml/update/${MY_PV}/${patch}"
+done
+
+S="${WORKDIR}/${MY_P}/dbxml"
+
+src_unpack() {
+	tar xzpf "${DISTDIR}/${MY_P}.tar.gz" ${MY_P}/dbxml || die "unpacking package failed"
+}
+
+src_prepare() {
+	for patch in $(get_patches) ; do
+		edos2unix "${DISTDIR}/${patch}"
+		epatch "${DISTDIR}/${patch}"
+	done
+
+	# sys-libs/db is slotted on Gentoo
+	sed -i \
+		-e "s:db_version=.*:db_version=${DB_VER}:" \
+		dist/aclocal/options.ac configure || die "sed failed"
+
+	if use java ; then
+		sed -i \
+			-e "s|\$with_berkeleydb/lib/db.jar|$(java-pkg_getjars db-${DB_VER})|" \
+			dist/aclocal/options.ac configure || die "sed failed"
+	fi
+
+	# * Fix libraries to link
+	# * Strip "../../build_unix/.libs" from LIBPATH or it'll
+	#   show up in the RPATH entry
+	sed -i \
+		-e "s|dbxml-2|dbxml-$(get_version_component_range 1-2)|" \
+		-e "s|db-4|db-${DB_VER}|" \
+		-e 's|dbxml_home = .*|dbxml_home = "../.."|' \
+		-e 's|"../../build_unix/.libs",||' \
+		src/python/setup.py.in || die "sed failed"
+
+	sed -i \
+		-e "s|dbxml-2|dbxml-$(get_version_component_range 1-2)|" \
+		-e "s|db_cxx-4|db_cxx-${DB_VER}|" \
+		-e "s|@DB_DIR@/lib|/usr/$(get_libdir)|" \
+		-e "s|@DB_DIR@/include|/usr/include/db${DB_VER}|" \
+		-e "s|@XERCES_DIR@/lib|/usr/$(get_libdir)|" \
+		-e "s|@XQILLA_DIR@/lib|/usr/$(get_libdir)|" \
+		src/perl/config.in || die "sed failed"
+
+	# avoid the automake/autoconf run in src_{configure,compile}
+	ln -sf /usr/share/libtool/config/ltmain.sh dist/ltmain.sh || die "replacing ltmain.sh failed"
+	elibtoolize
+	autoreconf
+}
+
+src_configure() {
+	cd "${S}/build_unix"
+
+	#Needed despite db_version stuff above
+	append-flags -I/usr/include/db${DB_VER}
+
+	local myconf=""
+
+	# use_enable doesn't work here due to a different syntax
+	use java && myconf="${myconf} --enable-java"
+	use tcl && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)"
+
+	export ac_cv_prog_path_strip="missing_strip"
+	ECONF_SOURCE="../" \
+	JAVAPREFIX="${JAVA_HOME}" \
+		econf \
+			--with-berkeleydb=/usr \
+			--with-xqilla=/usr \
+			--with-xerces=/usr \
+			${myconf}
+}
+
+src_compile() {
+	cd "${S}/build_unix"
+
+	default
+
+	if use python ; then
+		einfo "Compiling python extension"
+		cd "${S}/src/python"
+		append-cflags "-I../../include"
+		append-ldflags "-L../../build_unix/.libs"
+		python_version
+		"${python}" setup.py build || die "python build failed"
+	fi
+
+	if use perl ; then
+		cd "${S}/src/perl"
+		perl-app_src_prep
+		perl-app_src_compile
+	fi
+}
+
+src_install() {
+	cd "${S}/build_unix"
+
+	# somewhat broken build system
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	use doc && dohtml -A pdf -r "${D}"/usr/docs/*
+	rm -rf "${D}/usr/docs"
+
+	if use java ; then
+		java-pkg_dojar "${D}/usr/$(get_libdir)/dbxml.jar"
+		rm "${D}/usr/$(get_libdir)/dbxml.jar"
+	fi
+
+	if use python ; then
+		cd "${S}/src/python"
+		python_version
+		"${python}" setup.py install --root="${D}" --no-compile || die "python install failed"
+		python_need_rebuild
+	fi
+
+	if use perl ; then
+		cd "${S}/src/perl"
+		emake DESTDIR="${D}" install || die "emake install perl module failed"
+		fixlocalpod
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples"
+	fi
+
+}
+
+pkg_preinst() {
+	perl-module_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	if use python ; then
+		python_version
+		python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages"
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_version
+		python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages"
+	fi
+}