Version bump. Stabilize previous version eveywhere. Remove old

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 41 insertions, 55 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/Manifest b/media-libs/libmetalink/Manifest
index b7e8346e2b20..a7599b0d8cea 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libmetalink-0.0.3.tar.bz2 267023 SHA256 0bdc2cc0366b2b7bcf16eff31a5edc4d39b41430856afce04ad9dd9bbcc8c42c SHA512 526ea9c9239ab841319c3e9da3d298da040df22c74d77050c437c063b75d597cd6361ca4ac6ec0266ba725bf6a43579b132bc0a39742caab561a8adce50fc6aa WHIRLPOOL 5f49ca0819adcf56ac14a8697442528d290420bcf31be63d827d8381fa5dd05f20a24e6ad65f1ce5621b1f54b02233faa89a0002911bdc8f9992319388780787
 DIST libmetalink-0.1.0.tar.bz2 324033 SHA256 501c980b0892e1c25bd20f0c69a166672571caf56a732d73851ff3e6a2eb0cf6 SHA512 50d6dd0a7def447261d44a586a2971b646f69d82e67e7c181c01a876e9177f164f3e9d67268dd0064b6b4ba9555ce2932eb9753e2d291f5263f5622af6e06bda WHIRLPOOL 6070a0578a555b8c11b0e6da69f768da13832467cfe50a552775d03af9df0f400470ed9cdc043aac5e9a7fabec1b721bcfd14cfe3828440d5c59898ca62f5eb8
-EBUILD libmetalink-0.0.3.ebuild 793 SHA256 c9dc972074f0639ea00314a2a06afb83b86a11d80e08e2aa368bdae7d016e4d5 SHA512 7382147eaf1d8401ca9041a92b9514d71dac677099d8b2fa536abe537599a38e4f8df92d2856ed987c55093d5856e1cf0acbaca966984c0ebbcbd828e30b8282 WHIRLPOOL 3e95e289c03f192475517eef8b44a664568ee2468cffc229d47140d572d8698e607c3d7d9316644876a7fc5c2a36744c7d53cd69b286981737f444bc1e06fa82
-EBUILD libmetalink-0.1.0-r1.ebuild 806 SHA256 8a9b2cc78e41477661aec482e740063980df22a4d61899d7b66c423945d7ae92 SHA512 8b95fdffbc020179a6584ede6c304e906854f91d4299770db809ca48fda3fc678d2a9279cdaeb022ec3a827c548da71082123326a662fc2ab49cdb0261996ad0 WHIRLPOOL e1454759b2d2f13f40a32beb23f4781d5d778214be3f76fd71dc5a27a230f8c5d964d763aadd1ce632ef18ad141ef79a51ad83ba0c95d347c5270f7d56e72371
-EBUILD libmetalink-0.1.0.ebuild 782 SHA256 b3cccde44d40852ce50aff337265f85a866e514e26f51ce98b8cf5fc7c68ed3e SHA512 179f5333efcb35eb33b04abc09451aaaa05a0eaf3706e541e12a709478ec90502146d16c3fa4965e17bf0821191637ff2279a3357bc4ed7d05a0cfb796abf8b5 WHIRLPOOL 793ec306709aa2276528a747d26770c374a96d427f69c1452a10e007bfbdc386ac7e4457d22f316cfcd40b30187d00235f97f9a5fc50163e2a73762a0ed3fa64
-MISC ChangeLog 1817 SHA256 2ae3d68138a6e41bb0805ed2b6cd2a5626a190d8a16e3a41c25605f6b54a55bb SHA512 aea72b9aa1017bb7cf0b7d9d6fbdf0316e0b8e91eedcff96f84b3d345159db33c57ea4f80f23563a572313cf4a51f167b1aa58b78fbf18281ec8f76204bc96d9 WHIRLPOOL fed98060f0a4f3e23a942b219bd92293965ce1fd4cca6fcce3fc5b12d4df1ccac04727768d43debe276d3c339133253af001777d436846c5e1ec43d132eb8f41
+DIST libmetalink-0.1.1.tar.bz2 324472 SHA256 fd6d45c84c10cbc7a6e1b0ebbd81198a01866fa88cd01ceb2b0c448f5e74bcfb SHA512 9e9a2bf17b3696b199844703377cf6615bab44fd61b89be9afef579c21b0ac462f156719f60df9b8e7f7a9edb259d9bf461f20cd11ad9960d8376bf20e04f62c WHIRLPOOL 8ac61f6c4e739d752c5a7547bc9894d9a4a1bf5085cc67eda30d0d8cf14ffb1790f122b9a452452f91319400c10a31dd9995ea422148adc6d666db2392606962
+EBUILD libmetalink-0.1.0-r1.ebuild 800 SHA256 9f02aa92906cdbfecabe9157aeaa201af0b8fa452ebcecde50c7d1442f1d7ca9 SHA512 498a07c1361ebc57ff512bfdc12eec42058a081fece0dc477e36c7f356b6de745555580791ea25b6fc705c8156395d8bac17dcc16567c759ce2754cb493a0c51 WHIRLPOOL a0e6d22c490ed57dc9eed676252dfbfe3480fb61bba7d2c183b46258d97f10d0490d0ba4da04b20df44efe5613ea8144a049296cccca601e4daa670c50fd152d
+EBUILD libmetalink-0.1.1.ebuild 789 SHA256 2ad0a3c53aa41dd2106de88dfc62352af57da6c9297f02cf5cbe618ef3bf83d2 SHA512 328ff5cf55f52172e9012ea694116c2131e30e06fdb9e9a882f24e3031b1e16e76dff67031d9a0ea1d99f411164c50f7b49dbbc6c4a77deb7bf3118112681d7c WHIRLPOOL 81c9c9abf23e1fb7cd3a1ba3ee60110d08557915f92ecdf61ba84cc9aeec6a83ab955fd9cd055f4210d2c4336a5fbcbfadced1905add6f7aad8f63747c3c591a
+MISC ChangeLog 2089 SHA256 036547cf84d809b7c10da8dd87346a3ee716e7b096c1a34387073a339b1fdf90 SHA512 b2e857e7da4feb500c46cfd511d19718b4de2911e59868a8c84a3215d129dc580b77d04a6633cd5da555023b7de9d0f52beb999013ce94c9c5385d170293b740 WHIRLPOOL 06ecb764efac3f977fd5a7edf8bf64b553847944cbe9e9910bea690b2d9121d444ed23510a32d29f242cad4202834f087bf7e3106f15ba76ceca21968db5a1a0
 MISC metadata.xml 232 SHA256 5faf59cdb3951b4cd173b392c7dc8bce4cb9d1ef3708b833f09764c21e4d71bb SHA512 ca4ed62cca3720207d9bbdec893b3c6331c3c431e22cbdc290791885d1096e99634f0e26697023b51ebfb9fdda734973a68a87c35ebf00dd79cbe16c7b4f85e2 WHIRLPOOL 058af79935fc87995062c071e89d59899dca55e746013e10e1867fb7516a11ab86c7fe01efe5ee425bb5a8bdffc4ec7d69d9053347f6a411878a560d16804859
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE7fJcACgkQVWmRsqeSphMwMQCfXfrVHEAe+02ZgX9Jn12kohco
-FdMAn1OJ1MqjlLBYiOaHZmSq3wC1/5bT
-=FHz4
+iQJ8BAEBCABmBQJRUL+oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88HXAQAKnigxkaVaawQG+gYOPxkvi7
+isPiyGisfB/jfH9LoiobTXXr3yNF6R+lHLiKtzrW63FxG3QWuApbp2vkceD5U4tc
+5IWZoFSVP1+6oNBmxz6D0JOvpNb/1kvtFU/oSHw2imQA3XRXSZGcoNJ7IZ0DJ9bZ
+TCoAYNNM+6Ti5Bgl7f6vK/Csga9EvB2Yfr8AxPAaZ91EEk05wMjiM0QWXy16mHXH
+rREYq1EuqqTYKT+ut88wCb4wsTdK0aGlkafDaw2CdaJJwhjhIQwI6f9OCgmkmatP
+l6dE5c+X6C6Z9eXq5Bai7uYYOTehuRus1ibsuTVc8p0Z7W8ByYK5b1dxtDV3LVhr
+OWUE0kkRKiktGsH5QEgFoDlmeyx6dEn5YeWSNi+P644dDzprO9Akrv3UXjBDcYxL
+cXoXOmzOC+WohyEs3JpPHSYGJ1LMTKr6uXzRrhku8/xEn3wQLXVYrohrm0LhVPCz
+idi74sSChC5HO5IJ44gjeQLIhgLkxaHhQ3m0U691lEq6e2mKMTwrTbpWuIjDRf5V
+XcEqBHyGmZ89191aDYTKgtmW8rLYl4dIm/rRN9R0Gb6D/LqaZIQ1D4ldnqSZqbiN
+w41jIgH3y2j8FSd5AhWei20H7kpS6jvD7B4kcZ8dy3vmhVJ7gom1a+VGlYS9+nCX
+BTZU5e2Yx0K9qgHyNZo+
+=fNqD
 -----END PGP SIGNATURE-----
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)
 }