Cleaning out old ~arch ebuilds, Fixing repoman warnings, Fixing pkg-config typo in mxml.pc.in #287295 , Adding optional threads support #287300 , Bump to 2.6, #287312

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 29 insertions, 71 deletions

diff --git a/dev-libs/mini-xml/ChangeLog b/dev-libs/mini-xml/ChangeLog
index d58a7bf7d7d8..c626ae32b510 100644
--- a/dev-libs/mini-xml/ChangeLog
+++ b/dev-libs/mini-xml/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/mini-xml
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/ChangeLog,v 1.15 2008/06/29 10:38:20 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/ChangeLog,v 1.16 2009/10/03 15:10:21 vostorga Exp $
+
+*mini-xml-2.6 (03 Oct 2009)
+
+  03 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> -mini-xml-2.4.ebuild,
+  -mini-xml-2.5.ebuild, +mini-xml-2.6.ebuild:
+  Cleaning out old ~arch ebuilds
+  Fixing repoman warnings
+  Fixing pkg-config typo in mxml.pc.in, bug 287295
+  Adding optional threads support, bug 287300
+  Bump to 2.6, bug 287312
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org> mini-xml-2.5.ebuild:
   Add missing die: || "..." -> || die "..."
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mini-xml/Manifest
index cf683738df89..f6a494dcaaee 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST mxml-2.2.1.tar.gz 208282 RMD160 d1cff11b03aa6f039a5b803fd2efd61fe82c0c8a SHA1 d9da10ac02512a6c6dfc365305158c59a443ce75 SHA256 cf63024a3f3bff3829a7f484c855b38246ec8350c32354e0dec7a3b38935f17f
-DIST mxml-2.4.tar.gz 241325 RMD160 d633424dc789306a6f3d5d1929d00629fc6dca08 SHA1 9c8f0616b5ea3c025770b44e288fb19979adc830 SHA256 4a063004fcbcf205c4033641b15526aa2cd26bd398386dec87f9273b997469fe
-DIST mxml-2.5.tar.gz 247768 RMD160 aa315eb4992c3add5ffbcb6b00b854d82677a971 SHA1 4b816dc12dee840420776fa72ecc41d575ca54cc SHA256 aef0541d0589be350c50c7fe5bc71a0eb1046d0f38f6b27348b63caa21aebc79
+DIST mxml-2.6.tar.gz 254455 RMD160 6b1d1503880841431014b54d86430ed78201b6f2 SHA1 df180bd2e3890c97fa8a05dd131f9285468cffe1 SHA256 b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795
 EBUILD mini-xml-2.2.1.ebuild 792 RMD160 feb26df024daccf19727ae821fd06e8c05cc1579 SHA1 6d54326fe14ee10fdc5769d8ed59d664902016a9 SHA256 330cc22ee70b61e8108a33d49dbc15599691b4109432422c766dfb125b204707
-EBUILD mini-xml-2.4.ebuild 1184 RMD160 88d1e6eb82f192e95df6b5f6c1bc1d30d4b142ff SHA1 a6b6e858bb97e36b4e0a6780fd8bc2372473d883 SHA256 aea149eadb26a6e50ff4a751025a8b619fe2665f9a7249ba751a038480b4cf25
-EBUILD mini-xml-2.5.ebuild 1309 RMD160 8c2432ab5898b9d0ec6c52e0bfb420ba46b8cb95 SHA1 2aa723c50f75982812b7edbe04e71eedb3a61aa5 SHA256 2c6c10830d88c7d44aeee4adef3574388315676a183d8cfb1d05bdaddbf491b0
-MISC ChangeLog 2157 RMD160 36eb4b9ded67383f998a0f4ff8a6c11fae6ec573 SHA1 228ea10755ba059fb4f7b03f7de06b2fad3aa7ec SHA256 5551992dd4e3b543dd3d32b6bc9687f02d6f57b7a27fe3cd3685f566e1dd8bb3
+EBUILD mini-xml-2.6.ebuild 1283 RMD160 8e98b69bdb0b62e1b77f6445a3ed3ead3d23f2aa SHA1 3bc8aabf88bf821e85f041da05a99cea5063a406 SHA256 807510d6af552d0c7718a68304b33a32a541d62fe2e0e7ec313c7b987e4a5ac6
+MISC ChangeLog 2494 RMD160 9da0ec910090b0037088e32beee5ca70085c27e8 SHA1 2e3795930201177383c18c21ff10b8588c3443a1 SHA256 6c1845d083c2f4330115333fc994f19f6591aa9447a321dd66abe9bd2f10837d
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhnZiIACgkQV3J2n04Eauzg0gCaA/V5uRxoe7qwkqvx4vdGtYK1
-FwcAoNZZNI8hijmdF09FHIjC0M3NkCVH
-=69L0
------END PGP SIGNATURE-----
diff --git a/dev-libs/mini-xml/mini-xml-2.4.ebuild b/dev-libs/mini-xml/mini-xml-2.4.ebuild
deleted file mode 100644
index 4bfb9e5ecdbe..000000000000
--- a/dev-libs/mini-xml/mini-xml-2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.4.ebuild,v 1.5 2008/03/21 13:39:44 caster Exp $
-
-inherit autotools multilib
-
-MY_P="${P/mini-xml/mxml}"
-
-DESCRIPTION="Mini-XML is a small XML parsing library that you can use to read XML and XML-like data files in your application without requiring large non-standard libraries."
-HOMEPAGE="http://www.easysw.com/~mike/mxml"
-SRC_URI="http://ftp.easysw.com/pub/mxml/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	emake testmxml
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:755 -s:755:" Makefile.in || die "sed failed"
-	rm configure
-	eautoreconf
-}
-
-src_compile() {
-	econf --enable-shared  --libdir="/usr/$(get_libdir)" --with-docdir="/usr/share/doc/${PF}/html"
-	emake libmxml.a  libmxml.so.1.4 mxmldoc doc/mxml.man
-}
-
-src_install() {
-	emake DSTROOT="${D}" install || die "install failed"
-	dodoc ANNOUNCEMENT CHANGES README
-	rm "${D}/usr/share/doc/${PF}/html/"{CHANGES,COPYING,README}
-}
diff --git a/dev-libs/mini-xml/mini-xml-2.5.ebuild b/dev-libs/mini-xml/mini-xml-2.6.ebuild
index 4076d16b2cad..e365e2cfe3a6 100644
--- a/dev-libs/mini-xml/mini-xml-2.5.ebuild
+++ b/dev-libs/mini-xml/mini-xml-2.6.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.5.ebuild,v 1.2 2008/06/29 10:38:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.6.ebuild,v 1.1 2009/10/03 15:10:21 vostorga Exp $
 
 inherit autotools multilib
 
 MY_P="${P/mini-xml/mxml}"
 
-DESCRIPTION="Mini-XML is a small XML parsing library that you can use to read XML and XML-like data files in your application without requiring large non-standard libraries."
+DESCRIPTION="Small XML parsing library to read XML and XML-like data files."
 HOMEPAGE="http://www.easysw.com/~mike/mxml"
-SRC_URI="http://ftp.easysw.com/pub/mxml/${PV}/${MY_P}.tar.gz"
+SRC_URI="mirror://easysw/mxml/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Mini-XML"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="threads"
 
 DEPEND="dev-util/pkgconfig"
 RDEPEND=""
@@ -31,12 +31,17 @@ src_unpack() {
 	sed -i -e "s:755 -s:755:" Makefile.in || die "sed failed"
 	sed -i "/^TARGETS/s: testmxml::" Makefile.in || die "sed failed"
 	rm configure
-	eautoreconf
+#	eautoreconf
+	eautoconf
 }
 
 src_compile() {
-	econf --enable-shared  --libdir="/usr/$(get_libdir)" --with-docdir="/usr/share/doc/${PF}/html"
-	emake libmxml.a  libmxml.so.1.4 mxmldoc doc/mxml.man
+	econf \
+		--enable-shared \
+		--libdir="/usr/$(get_libdir)" \
+		--with-docdir="/usr/share/doc/${PF}/html" \
+		$(use_enable threads)
+	emake libmxml.a  libmxml.so.1.4 mxmldoc doc/mxml.man || die "make failed"
 }
 
 src_install() {
@@ -46,5 +51,5 @@ src_install() {
 }
 
 src_test() {
-	make testmxml || die "make testmxml failed"
+	emake testmxml || die "make testmxml failed"
 }