EAPI bump. Use distutils instead of python eclass (bug #312181), thanks to Arfrever for the patch.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 201 insertions, 12 deletions

diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog
index e9428c79cb93..288cfcab5235 100644
--- a/dev-libs/dbxml/ChangeLog
+++ b/dev-libs/dbxml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dbxml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.8 2010/02/26 05:40:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.9 2010/06/01 21:25:54 dev-zero Exp $
+
+*dbxml-2.5.16-r1 (01 Jun 2010)
+
+  01 Jun 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +dbxml-2.5.16-r1.ebuild:
+  EAPI bump. Use distutils instead of python eclass (bug #312181), thanks to
+  Arfrever for the patch.
 
   26 Feb 2010; Mark Loeser <halcy0n@gentoo.org>
   -files/2.4.13-as_needed.patch, -dbxml-2.4.13.2.ebuild,
diff --git a/dev-libs/dbxml/Manifest b/dev-libs/dbxml/Manifest
index 81355035b982..a97a0b14f25a 100644
--- a/dev-libs/dbxml/Manifest
+++ b/dev-libs/dbxml/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST dbxml-2.5.16.tar.gz 52819154 RMD160 fdb4c85271cb84a8e31931d8fb287ad17fafff9c SHA1 46f0e6b301e556c2502e4da0cd96a599acc53837 SHA256 f2423be3805811a9cca71d6877c0b1bdc1941cd76c3f26d6eb011a5724a3edd2
+EBUILD dbxml-2.5.16-r1.ebuild 4678 RMD160 bad1e2a938835a8892fab40dc4eae9d732a0c10a SHA1 90ec23d16a301c97d8c6444542f11d6462b5c214 SHA256 bf00afe7fa05f5122ff25a8c981ab00a464b366db459a02bfaee6ba0964a468e
 EBUILD dbxml-2.5.16.ebuild 4888 RMD160 ad48755d31f5e6e39405549d0367256feab26122 SHA1 259d133ca655dcf7571955c6c4177bcae810a3c5 SHA256 2d390dd680277810397ec67575487c8bdabee5e42945187bfe408ba9073a56f3
-MISC ChangeLog 2182 RMD160 24c49ff8cc6a749e35b6b4e411af98e277fadc19 SHA1 aac46cece443751a919ca075d155706b7f3bb182 SHA256 7fb606dbbf2e6ec0805d990e6065d6a1e4848ebc9cd1b7364c09f7b594232886
+MISC ChangeLog 2399 RMD160 79ef964c1a4c7e7140d0d1c3da842165538396a7 SHA1 ea6fff85f6663602bbc01393af9cfb2c91e745c7 SHA256 457b3fe83dd33cc646a432eab3c8811222e578cc7d20bf00a21fe7dbe33cadf8
 MISC metadata.xml 255 RMD160 ffab53e6c250ea6880036224ec7944b5f25a2ff5 SHA1 fe663297149bc1158616da920b78c01b929398b9 SHA256 fce233aa3c475563b0dde3e7115a5f61f6da338070a7f995e9a9ba146468e935
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkuHXswACgkQCRZPokWLroTwowCg3h6Wj0rjJsagj8zrpfM4zp54
-yTcAoLb+YAo6pjyTKKv1rvq7SvqI0NJa
-=Q7lU
------END PGP SIGNATURE-----
diff --git a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
new file mode 100644
index 000000000000..4d34481dd475
--- /dev/null
+++ b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
@@ -0,0 +1,191 @@
+# 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-r1.ebuild,v 1.1 2010/06/01 21:25:54 dev-zero Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit autotools distutils flag-o-matic perl-app 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-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}
+	eautoreconf
+}
+
+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"
+		distutils_src_compile
+	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"
+		distutils_src_install
+	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_mod_optimize dbxml.py
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup dbxml.py
+	fi
+}