Dropped 'xml2' USE flag (bug #116346).

(Portage version: 2.1_pre7-r5)

5 files changed, 39 insertions, 15 deletions

diff --git a/app-text/xml2/ChangeLog b/app-text/xml2/ChangeLog
index e9b78616b1cf..e0d42d9d50c3 100644
--- a/app-text/xml2/ChangeLog
+++ b/app-text/xml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xml2
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/ChangeLog,v 1.2 2005/01/01 16:43:31 eradicator Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/ChangeLog,v 1.3 2006/04/09 18:42:22 leonardop Exp $
+
+*xml2-0.3-r1 (09 Apr 2006)
+
+  09 Apr 2006; Leonardo Boshell <leonardop@gentoo.org> -xml2-0.3.ebuild,
+  +xml2-0.3-r1.ebuild:
+  Dropped 'xml2' USE flag (bug #116346). Use libxml2 by default.
 
 *xml2-0.3 (07 Nov 2004)
 
diff --git a/app-text/xml2/Manifest b/app-text/xml2/Manifest
index 39d3c2f4259b..abd8f354e231 100644
--- a/app-text/xml2/Manifest
+++ b/app-text/xml2/Manifest
@@ -1,5 +1,21 @@
 MD5 c8f984c4d86b51279df60e8dc05afa21 ChangeLog 427
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 eed7f82f966c2f13a6e39312f3ccabdd xml2-0.3.ebuild 894
+RMD160 4c5c0ff8b7a16a90671461e74c7ce70e5e4524fb ChangeLog 427
+SHA256 698e77c2e055895778102b443e2b7649ba72ebbb9c3c9bf3abe5038231c2266d ChangeLog 427
 MD5 ea42ef5e0dc89daa228f6fabbce4bae4 files/digest-xml2-0.3 59
+RMD160 1c7fd3e9423b9068ce6400f1cb5a9746cfed852a files/digest-xml2-0.3 59
+SHA256 0310655c534e5a9bd34298307aee8c7dcb32420aa3ac0f4385196850a8033eda files/digest-xml2-0.3 59
+MD5 1939a23c807bda0c5c15f2fa302b2392 files/digest-xml2-0.3-r1 223
+RMD160 a7ee07cc7a64dce13a10d8b07d2265620b1f6476 files/digest-xml2-0.3-r1 223
+SHA256 aead4a1ea804b086fbb703ae6eba29a8902c120d8be178e1cb71349f1b45ed0a files/digest-xml2-0.3-r1 223
 MD5 a5ff7fd7e95501227c698f69a40d141d files/xml2-0.3-libxml2.patch 1757
+RMD160 b34947313e5d980823933cff240cdf2edbf033d7 files/xml2-0.3-libxml2.patch 1757
+SHA256 a604065da52e0dab31b6c9db032fd3d613ebb464ec26b3340ae7f20395ca5533 files/xml2-0.3-libxml2.patch 1757
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 1d0332de7955e0a485280c9a8c380119 xml2-0.3-r1.ebuild 860
+RMD160 433f9bcd25922e867777e3fe74d49e9e6a7e2cba xml2-0.3-r1.ebuild 860
+SHA256 ec771bded6661a4e7ffa3705631714f83c51fb818e50a29eae79990b79736b42 xml2-0.3-r1.ebuild 860
+MD5 eed7f82f966c2f13a6e39312f3ccabdd xml2-0.3.ebuild 894
+RMD160 b0e4cf3617f3e3a464613c74e1d8e92e5b472049 xml2-0.3.ebuild 894
+SHA256 21858364319c7a8c6ec38d5d41c1ff5317f2d00588a044e02f1ce570f1426648 xml2-0.3.ebuild 894
diff --git a/app-text/xml2/files/digest-xml2-0.3 b/app-text/xml2/files/digest-xml2-0.3
deleted file mode 100644
index 59cbb2821651..000000000000
--- a/app-text/xml2/files/digest-xml2-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f142a2393bace5edcfea2ad394ef200 xml2-0.3.tar.gz 11553
diff --git a/app-text/xml2/files/digest-xml2-0.3-r1 b/app-text/xml2/files/digest-xml2-0.3-r1
new file mode 100644
index 000000000000..c8303e69a282
--- /dev/null
+++ b/app-text/xml2/files/digest-xml2-0.3-r1
@@ -0,0 +1,3 @@
+MD5 8f142a2393bace5edcfea2ad394ef200 xml2-0.3.tar.gz 11553
+RMD160 0477d105cf69e415018d2f33d8bfb6cc265522c5 xml2-0.3.tar.gz 11553
+SHA256 5a2b0f7b13c808dc822b41e122944a3492f98a9ba440ac1f59054202753ed34b xml2-0.3.tar.gz 11553
diff --git a/app-text/xml2/xml2-0.3.ebuild b/app-text/xml2/xml2-0.3-r1.ebuild
index 975b5fc65279..e9e956bd67f9 100644
--- a/app-text/xml2/xml2-0.3.ebuild
+++ b/app-text/xml2/xml2-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/xml2-0.3.ebuild,v 1.2 2005/01/01 16:43:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/xml2-0.3-r1.ebuild,v 1.1 2006/04/09 18:42:22 leonardop Exp $
 
 inherit eutils
 
@@ -16,18 +16,18 @@ SLOT="0"
 
 KEYWORDS="~x86"
 
-IUSE="xml2"
+IUSE=""
+
+DEPEND="dev-libs/libxml2"
 
-DEPEND="xml2? ( dev-libs/libxml2 )
-	!xml2? ( dev-libs/libxml )"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
-	if use xml2 ; then
-		epatch ${FILESDIR}/${P}-libxml2.patch
-	fi
-	sed -i -e "s:CFLAGS=-g -Wall:CFLAGS=${CFLAGS}:" makefile || die
+	epatch ${FILESDIR}/${P}-libxml2.patch
+	sed -i -e "s:CFLAGS=-g -Wall:CFLAGS=${CFLAGS}:" makefile || \
+		die "Sed expression failed"
 }
 
 src_compile() {