dev-libs/xqilla: Drop old and ebuild fixes

svn path=/sunrise/; revision=3325

4 files changed, 14 insertions, 69 deletions

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index ffaff287f..1b1fb0943 100644
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2007; Markus Ullmann <jokey@gentoo.org> -xqilla-1.0.1.ebuild,
+  xqilla-1.0.1-r1.ebuild:
+  Drop old and ebuild fixes
+
   28 Mar 2007; Chris Carlin (volkris) <carlin@jlab.org>
   +xqilla-1.0.1-r1.ebuild:
   Applied two upstream patches.
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index d3f7a0ba0..59921d2af 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -2,7 +2,6 @@ DIST XQilla-1.0.1.tar.gz 2783446 RMD160 4846b44c3eaba2d0b2ab6ee74966af3b091e34ab
 DIST patch.2.3.10.1 2932 RMD160 bd46dda598948dcb6fbfd6954fb2df8c14f73093 SHA1 b943befe14bf37da898ea4106776806b34a537f2 SHA256 7c64e7146722d439e3224ddf00316cef993e1b882f0a0ccb0ce6d14d6817eeef
 DIST patch.2.3.10.2 1329 RMD160 0061f058bdd7184c6f0af3c7c2ded4bf863daa61 SHA1 16e2bfdc0991255e6e5eb7abbea2b42fb7d14c18 SHA256 e9e0cb561b4a88bbba3fc5dadfb7a648d9cb184749c8614c24d8a6d3c3525b1e
 DIST xerces-c-src_2_7_0.tar.gz 12368496 RMD160 d01f10b4c0a9c53bf4bcdba388981c9ca7d6268d SHA1 f16fcd4722e92127095fe6c6456bda20c24e5e98 SHA256 79525d283630305fa68169eafe08805d2585273f8344069df5c40ce967fd0e1c
-EBUILD xqilla-1.0.1-r1.ebuild 1487 RMD160 758d964db10eb2edc8cfbffec785c32b77a5c6ba SHA1 068791d07adaf358ba6c92135d5b65923daa04d2 SHA256 67002fceb1f97ed39d40cfe3da01a069935a12ff8df3a4eb97abc1eb748e718e
-EBUILD xqilla-1.0.1.ebuild 1238 RMD160 60cb1f6b8b6954889e167f1dff18f0ba34d49d38 SHA1 379d2ac3f65c90096692d360fd2253f95af05e53 SHA256 416930c9849b9653d2491a10b94888a7d61064f3ce6c70a99166dab058ad64bf
-MISC ChangeLog 559 RMD160 791953ca385abe16e57eb9b81afcfc8d022635f0 SHA1 b23ca2882342bfc2a94e0fcc367b05aae1ceb9cc SHA256 ce2aad061f715d79fac59ef1117d1961c23665e26b4b5fdf4db3687a0fe0a0eb
+EBUILD xqilla-1.0.1-r1.ebuild 1576 RMD160 05be676ba973ff497c7e2f3df9fdd812ecb61711 SHA1 4d87d17272b61ea766bad3aa0e1990ddf3dc221d SHA256 5b34df6ac5b16ad9cfb169f607b43c7fd427ddfff48e1f947a711d4837625249
+MISC ChangeLog 685 RMD160 a3b65442a05e4f00d7f751f2a2cf45abce20f772 SHA1 e1553480ff7e007b741191bc71a1ae5c9fccb510 SHA256 0866b34ef526ed8c648c20edb97c4f84844418f4a8edadc5174e6be518087756
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-libs/xqilla/xqilla-1.0.1-r1.ebuild b/dev-libs/xqilla/xqilla-1.0.1-r1.ebuild
index df82feaaf..32c987544 100644
--- a/dev-libs/xqilla/xqilla-1.0.1-r1.ebuild
+++ b/dev-libs/xqilla/xqilla-1.0.1-r1.ebuild
@@ -31,29 +31,28 @@ src_unpack() {
 	epatch "${DISTDIR}/patch.2.3.10.2"
 
 	#Remove the cause of a bad rpath
-	sed -i -e 's:-R$(xerces_lib)::' Makefile.in || die "Sed failed!"
+	sed -i -e 's:-R$(xerces_lib)::' Makefile.in || die "sed failed!"
 }
 
 src_compile() {
 	einfo "compiling temporary copy of xerces-c"
-	export XERCESCROOT="${WORKDIR}"/xerces-c-src
+	XERCESCROOT="${WORKDIR}"/xerces-c-src
 	cd "${XERCESCROOT}"/src/xercesc
-	./runConfigure -plinux -P/usr ${EXTRA_ECONF} || die
-	emake -j1 || die
+	./runConfigure -plinux -P/usr ${EXTRA_ECONF} || die "configure of xerces failed"
+	emake -j1 || die "emake xerces failed"
 
 	einfo "compiling xqilla"
 	cd "${S}"
-	econf --with-xerces="${XERCESCROOT}" || die
-	emake || die
-	einfo "xqilla compiled"
+	econf --with-xerces="${XERCESCROOT}" || die "econf failed"
+	emake || die "emake failed"
 
 	if use doc; then
-		emake docs || die
+		emake docs || die "emake docs failed"
 	fi
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake docs failed"
 
 	if use doc; then
 		cd docs
diff --git a/dev-libs/xqilla/xqilla-1.0.1.ebuild b/dev-libs/xqilla/xqilla-1.0.1.ebuild
deleted file mode 100644
index 1e33295d0..000000000
--- a/dev-libs/xqilla/xqilla-1.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-MY_P=XQilla-${PV}
-DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C++."
-HOMEPAGE="http://xqilla.sourceforge.net/HomePage"
-SRC_URI="mirror://apache/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
-	mirror://sourceforge/xqilla/${MY_P}.tar.gz"
-
-LICENSE="Sleepycat BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc"
-
-DEPEND="=dev-libs/xerces-c-2.7.0-r1
-	doc? ( app-doc/doxygen )"
-RDEPEND="=dev-libs/xerces-c-2.7.0-r1"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#Remove the cause of a bad rpath
-	sed -i -e 's:-R$(xerces_lib)::' Makefile.in || die "Sed failed!"
-}
-
-src_compile() {
-	einfo "compiling temporary copy of xerces-c"
-	export XERCESCROOT="${WORKDIR}"/xerces-c-src
-	cd "${XERCESCROOT}"/src/xercesc
-	./runConfigure -plinux -P/usr ${EXTRA_ECONF} || die
-	emake -j1 || die
-
-	einfo "compiling xqilla"
-	cd "${S}"
-	econf --with-xerces="${XERCESCROOT}" || die
-	emake || die
-	einfo "xqilla compiled"
-
-	if use doc; then
-		emake docs || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use doc; then
-		cd docs
-		dohtml -r dom3-api simple-api
-	fi
-}