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

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 26 insertions, 56 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/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"
 }