Change USE flag from xml2->xml

Package-Manager: portage-2.1_pre7-r4

7 files changed, 72 insertions, 41 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index d7f3ca351ea6..f1ce0d4d0bd0 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,13 +1,18 @@
 # ChangeLog for dev-cpp/commoncpp2
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.18 2006/01/15 23:14:50 arj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.19 2006/04/09 04:20:37 halcy0n Exp $
+
+  09 Apr 2006; Mark Loeser <halcy0n@gentoo.org> commoncpp2-1.3.1.ebuild,
+  commoncpp2-1.3.13.ebuild, commoncpp2-1.3.20.ebuild,
+  commoncpp2-1.3.20-r1.ebuild, commoncpp2-1.3.22.ebuild:
+  Change USE flag from xml2->xml
 
 *commoncpp2-1.3.20-r1 (16 Jan 2006)
 
   16 Jan 2006; Anders RUne Jensen <arj@gentoo.org>
   +commoncpp2-1.3.22.ebuild:
   New version. Fixes #118968
-	
+
 *commoncpp2-1.3.20-r1 (17 Dec 2005)
 
   17 Dec 2005; Ciaran McCreesh <ciaranm@gentoo.org>
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 70eb3423abb0..d747834ff212 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,12 +1,46 @@
-MD5 5a099b776129a606e48624245d7f87fd ChangeLog 3162
-MD5 7a0c4df125348dd52f15164d617b639a commoncpp2-1.3.1.ebuild 1015
-MD5 80cb3c94e24416e019030be54bf3933b commoncpp2-1.3.13.ebuild 1026
-MD5 fb2311f7cb6235117e43d99eae169c1d commoncpp2-1.3.20-r1.ebuild 1040
-MD5 7ed1789cb6b69a014c742807b0f79e28 commoncpp2-1.3.20.ebuild 1073
-MD5 61186b497130f81bc592253d81d1ae01 commoncpp2-1.3.22.ebuild 1033
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 84f9f835b4936df8d59a4193d15bfd95 ChangeLog 3383
+RMD160 6e8ecec4e9b5f05abb8182290fc645676eba3a4f ChangeLog 3383
+SHA256 b1dc5aae1b602f3c52028b6c826339d4f37e5987c8eb967724ae0eefc5a4c8dd ChangeLog 3383
+MD5 f04993d53175cb214cf534ebf12e9dd9 commoncpp2-1.3.1.ebuild 935
+RMD160 cd7e96c746c44e285f066e7185434e0675b59448 commoncpp2-1.3.1.ebuild 935
+SHA256 cd802a616b0e65f8860ad4f38233d97ad6142aaf23caca91f87dcf76273f8fa7 commoncpp2-1.3.1.ebuild 935
+MD5 68dd620716eae3fb63cd6869d8bc069d commoncpp2-1.3.13.ebuild 946
+RMD160 2b9d0120db2584782f448db2b70e7b749ead4f13 commoncpp2-1.3.13.ebuild 946
+SHA256 21783d86e3c25821f00c22fbc8bbba62350c56d16e565131ded0dd3f3dbe9e7a commoncpp2-1.3.13.ebuild 946
+MD5 f0210495201ef39cd77ea76c481ac4e2 commoncpp2-1.3.20-r1.ebuild 1032
+RMD160 532493de132c1c262020ea4be3acdccb3ccda0f9 commoncpp2-1.3.20-r1.ebuild 1032
+SHA256 55d68bf11f5693657e2ea861ee7d3a89c3131d8b8d0568e8087440fe91386c5f commoncpp2-1.3.20-r1.ebuild 1032
+MD5 e0335de13f7b64c5c886d3c763c6cf79 commoncpp2-1.3.20.ebuild 1070
+RMD160 57b6e120a1fa5994071941864bf0b22a52606a0b commoncpp2-1.3.20.ebuild 1070
+SHA256 406b43e23f162b479404563dcf9a3b9e34873c3520a5a069858e8051fbe0c353 commoncpp2-1.3.20.ebuild 1070
+MD5 a3e5d67f921c1a295504e9bf8ccc3bc0 commoncpp2-1.3.22.ebuild 1029
+RMD160 20d8fac7d77a9e7b50e8e782920dbe299ec5bfb1 commoncpp2-1.3.22.ebuild 1029
+SHA256 725f4ca526ea0306767835cf99ebcf430de23b3ca38ff1393b2a292dbc52ff09 commoncpp2-1.3.22.ebuild 1029
 MD5 989863ac3c644b855628421d81012679 files/digest-commoncpp2-1.3.1 68
+RMD160 f6bea8e0411032a8428085ff60cda34c3c9e8a58 files/digest-commoncpp2-1.3.1 68
+SHA256 c003bb9a3304643569742bbf7d74543e5152de68a55b6ceabdee5b3195943507 files/digest-commoncpp2-1.3.1 68
 MD5 24b577b86d1c3649917142f48079a7d9 files/digest-commoncpp2-1.3.13 69
+RMD160 40b5872c264660a2695ca47adb9c52266f5663cf files/digest-commoncpp2-1.3.13 69
+SHA256 ec8acda7be86e9d7198589fdd0ecec92191e1d0a8013c7dd677d6634f942ce79 files/digest-commoncpp2-1.3.13 69
 MD5 c895d9a7cdc2548a180bd0db5f02d1d7 files/digest-commoncpp2-1.3.20 69
+RMD160 3b932e838cc5fbfbb55aec0451cd70afb3053541 files/digest-commoncpp2-1.3.20 69
+SHA256 c84d0fbba913dab01cd35f440b1aaf5d704d1b5e680dc9b78f973d1612835f5a files/digest-commoncpp2-1.3.20 69
 MD5 c895d9a7cdc2548a180bd0db5f02d1d7 files/digest-commoncpp2-1.3.20-r1 69
+RMD160 3b932e838cc5fbfbb55aec0451cd70afb3053541 files/digest-commoncpp2-1.3.20-r1 69
+SHA256 c84d0fbba913dab01cd35f440b1aaf5d704d1b5e680dc9b78f973d1612835f5a files/digest-commoncpp2-1.3.20-r1 69
 MD5 e625dea2654351b1d7bbe79ff9c1d62a files/digest-commoncpp2-1.3.22 69
+RMD160 439c886fbfabd2e6aaa2894f79cca61cf7f9f042 files/digest-commoncpp2-1.3.22 69
+SHA256 d8195061fe7cbccb78532bb6acd7da2677166d29068d88d7fa36fac36af4678d files/digest-commoncpp2-1.3.22 69
 MD5 9b2404bcf93a0418e748ec611550b00f metadata.xml 245
+RMD160 c63236f59109c6458b9a353b8b87d9ec99f4b8e1 metadata.xml 245
+SHA256 06519db08956741c3a6707ffe4d20a36de8cd559fdec316e08904a03193f8098 metadata.xml 245
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEOIufCRZPokWLroQRAqShAKCS64ZqXZtNs8TGN5dZvhzNZIevZwCfa5SB
+soCNUt3F8PGukwqZpnYPrQs=
+=1pW0
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.3.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.1.ebuild
index 1de9387b77ca..88751c4b079a 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.1.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.1.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/dev-cpp/commoncpp2/commoncpp2-1.3.1.ebuild,v 1.2 2005/09/20 18:30:29 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.1.ebuild,v 1.3 2006/04/09 04:20:37 halcy0n Exp $
 
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://sourceforge/cplusplus/${P}.tar.gz"
@@ -9,16 +9,12 @@ HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="doc xml2"
+IUSE="doc xml"
 
-DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )"
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )"
 
 src_compile() {
-	use xml2 \
-		&& myconf="${myconf} --with-xml" \
-		|| myconf="${myconf} --without-xml"
-
-	econf ${myconf} || die "./configure failed"
+	econf $(use_with xml) || die "./configure failed"
 
 	emake || die
 }
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.3.13.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.13.ebuild
index 90e40c63fd0a..db13baf6776c 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.13.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.13.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/dev-cpp/commoncpp2/commoncpp2-1.3.13.ebuild,v 1.3 2005/09/20 18:30:29 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.13.ebuild,v 1.4 2006/04/09 04:20:37 halcy0n Exp $
 
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://sourceforge/gnutelephony/${P}.tar.gz"
@@ -9,16 +9,12 @@ HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc xml2"
+IUSE="doc xml"
 
-DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )"
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )"
 
 src_compile() {
-	use xml2 \
-		&& myconf="${myconf} --with-xml" \
-		|| myconf="${myconf} --without-xml"
-
-	econf ${myconf} || die "./configure failed"
+	econf $(use_with xml) || die "./configure failed"
 
 	emake || die
 }
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.3.20-r1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.20-r1.ebuild
index 42ea4a7adcf9..18f0ba6f7cba 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.20-r1.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.20-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/dev-cpp/commoncpp2/commoncpp2-1.3.20-r1.ebuild,v 1.1 2005/12/17 03:06:35 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.20-r1.ebuild,v 1.2 2006/04/09 04:20:37 halcy0n Exp $
 
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://sourceforge/gnutelephony/${P}.tar.gz"
@@ -9,16 +9,16 @@ HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xml2 doc ipv6"
+IUSE="xml doc ipv6"
 
-DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )
 	doc? ( >=app-doc/doxygen-1.3.6 )"
 
 src_compile() {
 	use doc || \
 		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure
 
-	econf $(use_with xml2 xml ) $(use_with ipv6 ) || die
+	econf $(use_with xml) $(use_with ipv6 ) || die
 	emake || die
 }
 
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild
index 5dba5bd11e91..1602e6bebe29 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.20.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/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild,v 1.1 2005/10/30 20:33:38 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild,v 1.2 2006/04/09 04:20:37 halcy0n Exp $
 
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://sourceforge/gnutelephony/${P}.tar.gz"
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xml2 doc"
+IUSE="xml doc"
 
-DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )
 	doc? ( >=app-doc/doxygen-1.3.6 )"
 
 src_compile() {
@@ -20,7 +20,7 @@ src_compile() {
 		sed "s/^DOXYGEN=.*/DOXYGEN=no/" <configure >tmp && \
 		cat tmp >configure
 
-	econf $(use_with xml2 xml) || die
+	econf $(use_with xml) || die
 	emake || die
 }
 
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild
index fec26f5cb183..9a0a7ba83242 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild,v 1.1 2006/01/15 23:14:50 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.22.ebuild,v 1.2 2006/04/09 04:20:37 halcy0n Exp $
 
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://sourceforge/gnutelephony/${P}.tar.gz"
@@ -9,16 +9,16 @@ HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xml2 doc ipv6"
+IUSE="xml doc ipv6"
 
-DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )
 	doc? ( >=app-doc/doxygen-1.3.6 )"
 
 src_compile() {
 	use doc || \
 		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure
 
-	econf $(use_with xml2 xml ) $(use_with ipv6 ) || die
+	econf $(use_with xml) $(use_with ipv6 ) || die
 	emake || die
 }