dev-libs/dbxml: Drop old and ebuild fixes

svn path=/sunrise/; revision=3324

5 files changed, 21 insertions, 68 deletions

diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog
index 066e83a00..f9ba6ac36 100644
--- a/dev-libs/dbxml/ChangeLog
+++ b/dev-libs/dbxml/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2007; Markus Ullmann <jokey@gentoo.org> -dbxml-2.3.10.ebuild,
+  dbxml-2.3.10-r1.ebuild:
+  Drop old and ebuild fixes
+
   27 Mar 2007; Chris Carlin (volkris) <carlin@jlab.org>
   +dbxml-2.3.10-r1.ebuild, +files/dbxml-pythonfixes.patch:
   Apply upstream patch and optionally install python module.
diff --git a/dev-libs/dbxml/Manifest b/dev-libs/dbxml/Manifest
index 8516cd7dd..86d38c904 100644
--- a/dev-libs/dbxml/Manifest
+++ b/dev-libs/dbxml/Manifest
@@ -1,7 +1,6 @@
 AUX dbxml-pythonfixes.patch 3220 RMD160 00cdd75081b78547bb9ed15aa802742cf93b2be1 SHA1 e9041386ef3a2496af9affc7ce03d070ade0565b SHA256 f5be05ee44ad4c72e3ac1595175f4fafb46e64eee58d1795460d712d3da32962
 DIST dbxml-2.3.10.tar.gz 32434887 RMD160 6422cba1c893e872dba25fe20f72aba3d03b1502 SHA1 1ac0788cf833885357d50b94fca801b5e18f0a6d SHA256 2db6c33848f364cd698066f85a7a5da8826a751d8e0b63cc10eee7b0aca745cb
 DIST patch.2.3.10.3 2112 RMD160 3f7b37c92e730b576b8939e4f50a193382070910 SHA1 4d8dc7b56c53f53c3b4d66f469e6000e5b4a88d3 SHA256 92f9daa47b538f02da816b8e7f0f05431dcd7115864553cf6b3b4f9c58a4ec80
-EBUILD dbxml-2.3.10-r1.ebuild 1984 RMD160 05e3ab5c4d6b1be2ae41af47a025825663248650 SHA1 9f27d3068b7b51825086d6681da48ec48a5837c7 SHA256 f97b3e473aeaac851a0098735ac1575c1a1dbd37ce41c867f8df838022bad9fd
-EBUILD dbxml-2.3.10.ebuild 1285 RMD160 ba6cd3076bd9b00b1f968963cb7fb58b4283f124 SHA1 56c9672714141f59aa83dd2e451d0233e18db377 SHA256 5896e421d9799627c09772fede97811e02d2dbee3fab8e7d69d6da4fef25db5e
-MISC ChangeLog 415 RMD160 b501630c90521a2c9bbaa2700f0ebed184c690cf SHA1 98aabce04e21edae6f3129770010c9ccf0c3b91c SHA256 03365c2d4b132889a7e75cfff7f0e93d8982989fc566adf501336e68ac251725
+EBUILD dbxml-2.3.10-r1.ebuild 2065 RMD160 055910ff3b45c8b48c8ba1f0b19d97866aefc75a SHA1 8e5892feb09fa7067a21565fe138159d38f53633 SHA256 4ed3c003c6c34f42d2d20f9e3da51d4ce41934d84b5eebbc4bafaf3641d76c19
+MISC ChangeLog 541 RMD160 b726c2cd8edace8cc9649fc29dab11303be9f978 SHA1 1024d33dd70b295a93f74dfe3ede909767aa8e3e SHA256 01d448489b4566e3dd1ddce53396bf10acdbd02103ad607ef2befaf9d5b1ac53
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-libs/dbxml/dbxml-2.3.10-r1.ebuild b/dev-libs/dbxml/dbxml-2.3.10-r1.ebuild
index 78cbe4c8d..ef0c08841 100644
--- a/dev-libs/dbxml/dbxml-2.3.10-r1.ebuild
+++ b/dev-libs/dbxml/dbxml-2.3.10-r1.ebuild
@@ -4,12 +4,13 @@
 
 inherit flag-o-matic db db-use distutils
 
+PATCHVER="2.3.10.3"
 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/${P}.tar.gz
 	http://download-west.oracle.com/berkeley-db/${P}.tar.gz
 	http://download-uk.oracle.com/berkeley-db/${P}.tar.gz
-	http://www.oracle.com/technology/products/berkeley-db/xml/update/2.3.10/patch.2.3.10.3"
+	http://www.oracle.com/technology/products/berkeley-db/xml/update/2.3.10/patch.${PATCHVER}"
 
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -27,13 +28,13 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${P}/dbxml"
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
+	cd "${S}"
 
-	cd ${P}
-	epatch "${DISTDIR}/patch.2.3.10.3"
-	epatch "${FILESDIR}/dbxml-pythonfixes.patch"
+	EPATCH_OPTS="-p2 -d ${S}"
+	epatch "${DISTDIR}"/patch.${PATCHVER}
+	epatch "${FILESDIR}"/${PN}-pythonfixes.patch
 
-	cd ${S}
 	#Tell the configure script where our db version is
 	db_version="$(db_findver sys-libs/db)" || die "Couldn't find db"
 	db_incpath="$(db_includedir)"          || die "Couldn't find db include path"
@@ -44,21 +45,23 @@ src_unpack() {
 }
 
 src_compile() {
-	cd build_unix
+	cd "${S}"/build_unix
+
+	#Needed despite db_version stuff above
+	append-flags -I$(db_includedir)
 
-	append-flags -I$(db_includedir) #Needed despite db_version stuff above
 	ECONF_SOURCE=../dist
-	econf --with-berkeleydb=/usr --with-xqilla=/usr --with-xerces=/usr
+	econf --with-berkeleydb=/usr --with-xqilla=/usr --with-xerces=/usr || die "econf failed"
 	emake -j1 || die "emake failed"
 	if use python ; then
 		einfo "Compiling python extension"
-		cd ${S}/src/python
+		cd "${S}"/src/python
 		distutils_src_compile
 	fi
 }
 
 src_install() {
-	cd build_unix
+	cd "${S}"/build_unix
 
 	#Install fails with emake
 	einstall || die "einstall failed"
@@ -66,7 +69,7 @@ src_install() {
 
 	if use python ; then
 		einfo "Installing python extension"
-		cd ${S}/src/python
+		cd "${S}"/src/python
 		distutils_src_install
 	fi
 }
diff --git a/dev-libs/dbxml/dbxml-2.3.10.ebuild b/dev-libs/dbxml/dbxml-2.3.10.ebuild
deleted file mode 100644
index fbfeccb5d..000000000
--- a/dev-libs/dbxml/dbxml-2.3.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic db db-use
-
-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/${P}.tar.gz
-	http://download-west.oracle.com/berkeley-db/${P}.tar.gz
-	http://download-uk.oracle.com/berkeley-db/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc"
-
-DEPEND=">=sys-libs/db-4.3.28
-	~dev-libs/xerces-c-2.7.0
-	>=dev-libs/xqilla-1.0.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/dbxml"
-
-src_unpack() {
-	unpack ${A}
-
-	#Tell the configure script where our db version is
-	db_version="$(db_findver sys-libs/db)" || die "Couldn't find db"
-	sed -i -e "s:db_version=.*:db_version=${db_version}:" "${S}/dist/configure" \
-		|| die "Couldn't set db_version with sed"
-}
-
-src_compile() {
-	cd build_unix
-
-	append-flags -I$(db_includedir) #Needed despite db_version stuff above
-	ECONF_SOURCE=../dist
-	econf --with-berkeleydb=/usr --with-xqilla=/usr --with-xerces=/usr
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	cd build_unix
-	#Install fails with emake
-	einstall || die "einstall failed"
-
-	db_src_install_doc
-}
diff --git a/dev-libs/dbxml/files/digest-dbxml-2.3.10 b/dev-libs/dbxml/files/digest-dbxml-2.3.10
deleted file mode 100644
index 1679c0ee4..000000000
--- a/dev-libs/dbxml/files/digest-dbxml-2.3.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7c4ae3239050b111e2263064ed0c86c3 dbxml-2.3.10.tar.gz 32434887
-RMD160 6422cba1c893e872dba25fe20f72aba3d03b1502 dbxml-2.3.10.tar.gz 32434887
-SHA256 2db6c33848f364cd698066f85a7a5da8826a751d8e0b63cc10eee7b0aca745cb dbxml-2.3.10.tar.gz 32434887