Version bump. Stabilize previous version eveywhere. Remove old

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

4 files changed, 22 insertions, 47 deletions

diff --git a/media-libs/libmetalink/ChangeLog b/media-libs/libmetalink/ChangeLog
index e803dce671a4..16a6f07ee05e 100644
--- a/media-libs/libmetalink/ChangeLog
+++ b/media-libs/libmetalink/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmetalink
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/ChangeLog,v 1.12 2013/03/09 18:16:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/ChangeLog,v 1.13 2013/03/25 21:20:39 hwoarang Exp $
+
+*libmetalink-0.1.1 (25 Mar 2013)
+
+  25 Mar 2013; Markos Chandras <hwoarang@gentoo.org> +libmetalink-0.1.1.ebuild,
+  -libmetalink-0.0.3.ebuild, -libmetalink-0.1.0.ebuild,
+  libmetalink-0.1.0-r1.ebuild:
+  Version bump. Stabilize previous version eveywhere. Remove old
 
   09 Mar 2013; Jeroen Roovers <jer@gentoo.org> libmetalink-0.1.0.ebuild:
   Stable for HPPA (bug #460988).
diff --git a/media-libs/libmetalink/libmetalink-0.0.3.ebuild b/media-libs/libmetalink/libmetalink-0.0.3.ebuild
deleted file mode 100644
index 730aa759c08f..000000000000
--- a/media-libs/libmetalink/libmetalink-0.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.0.3.ebuild,v 1.4 2012/08/01 10:51:06 jer Exp $
-
-EAPI="2"
-
-inherit base
-
-DESCRIPTION="Library for handling Metalink files"
-HOMEPAGE="http://launchpad.net/libmetalink"
-SRC_URI="http://code.launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="expat test"
-
-RDEPEND="expat? ( dev-libs/expat )
-	!expat? ( >=dev-libs/libxml2-2.6.24 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cunit )"
-
-src_configure() {
-	local xml_args
-	use expat \
-		&& xml_args=--with-libexpat \
-		|| xml_args=--with-libxml2
-
-	econf ${xml_args} --docdir=/usr/share/doc/${PF}
-}
diff --git a/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild b/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild
index 05936e1d983f..6a95f4ef695b 100644
--- a/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild,v 1.1 2012/08/31 21:13:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild,v 1.2 2013/03/25 21:20:39 hwoarang Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="expat static-libs test xml"
 
 RDEPEND="expat? ( dev-libs/expat )
diff --git a/media-libs/libmetalink/libmetalink-0.1.0.ebuild b/media-libs/libmetalink/libmetalink-0.1.1.ebuild
index a6406258409d..2c0cfe4f2808 100644
--- a/media-libs/libmetalink/libmetalink-0.1.0.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.0.ebuild,v 1.7 2013/03/09 18:16:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmetalink/libmetalink-0.1.1.ebuild,v 1.1 2013/03/25 21:20:39 hwoarang Exp $
 
-EAPI="2"
-
-inherit base
+EAPI="5"
 
 DESCRIPTION="Library for handling Metalink files"
 HOMEPAGE="http://launchpad.net/libmetalink"
@@ -12,19 +10,19 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="expat test"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="expat static-libs test xml"
 
 RDEPEND="expat? ( dev-libs/expat )
-	!expat? ( >=dev-libs/libxml2-2.6.24 )"
+	 xml? ( >=dev-libs/libxml2-2.6.24 )"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cunit )"
 
-src_configure() {
-	local xml_args
-	use expat \
-		&& xml_args=--with-libexpat \
-		|| xml_args=--with-libxml2
+REQUIRED_USE="^^ ( expat xml )"
 
-	econf ${xml_args} --docdir=/usr/share/doc/${PF}
+src_configure() {
+	econf \
+		$(use_with expat libexpat) \
+		$(use_with xml libxml2) \
+		$(use_enable static-libs static)
 }