Version bump to latest. Drop older.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 13 insertions, 38 deletions

diff --git a/dev-libs/libzip/ChangeLog b/dev-libs/libzip/ChangeLog
index 56de4fa04e2a..3798024efa75 100644
--- a/dev-libs/libzip/ChangeLog
+++ b/dev-libs/libzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libzip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.20 2011/03/05 19:45:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/ChangeLog,v 1.21 2011/03/22 14:13:58 scarabeus Exp $
+
+*libzip-0.10 (22 Mar 2011)
+
+  22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libzip-0.9.3.ebuild,
+  -libzip-0.10_rc1-r2.ebuild, +libzip-0.10.ebuild:
+  Version bump to latest. Drop older.
 
 *libzip-0.10_rc1-r2 (05 Mar 2011)
 
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index ca3239a5219f..4fcfc073ccc6 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,9 +1,7 @@
 AUX libzip-0.10_rc1-fix_headers.patch 501 RMD160 219d52b45a6872dc623f74f70fa83bdb330732ce SHA1 210aa4e03ca39ae6d02e1a6b220bb4feb9b4aef2 SHA256 02198832803b0b4aba395766c5d0166862451de954e6790aa721ba51303f9469
-DIST libzip-0.10rc1.tar.gz 487172 RMD160 89572df841f70f459ad05899e61553402e58dd7f SHA1 e61907f223c377a7e1269913a57885f6be62ced1 SHA256 afeb1f54e9e03c6b04e7b1772d0073fd5d47958b4ff5b4a6f41eef32737b80e1
-DIST libzip-0.9.3.tar.gz 392740 RMD160 ab806c32c7033acf629ebaef703b71fd09b734a7 SHA1 0e7d5110b3611a72c5384898ef0e202651b530fb SHA256 0e282dfed9e3da7d52223a0ccaee7c950782f10ed73f9b778243128a03c8cb1c
+DIST libzip-0.10.tar.gz 849790 RMD160 84a9f0602dba2c2a75d6b9dc52c0000c103f4429 SHA1 0425e8fc4966f78198f3067c52646518a50d21c7 SHA256 b7afa964e2115cf9d72e90537b7fb4928232f2c3173439fa5e04814f28ebd7d2
 DIST libzip-0.9.tar.gz 424124 RMD160 db43b0f54f92b6c8cbd4f53a4bde50b0eddd1fde SHA1 8cb2d875447b4efd0323627aa9b700c13ab8eae8 SHA256 b0d0a768f9ef8fef14683adade0b819549dd3e61b9a5bf8ab8a92e378d87a05f
-EBUILD libzip-0.10_rc1-r2.ebuild 886 RMD160 7be3fb69292dfeba3552eff60e8ec30b7eff8fd5 SHA1 b4e1eca6ef2a201584aaf223ed444151ce62f25b SHA256 02963357088728cbaa347adc2cf336fc6c802a3bb7416b990c979d3dc4e42b7d
-EBUILD libzip-0.9.3.ebuild 775 RMD160 002e1c70b6cfae631adb64d10593e64662800c24 SHA1 5b8fccb747a6437dfef167ffea94b9d10b76ab7c SHA256 e21ab6d9f71f97fe610fb5e44e0de39aedb169e7f3fc0a382ca254fdf60832ce
+EBUILD libzip-0.10.ebuild 920 RMD160 2ffaa5cc4cd6549e508220ef48de8599efe256c6 SHA1 93d1a1b5067eb52f180a03730fb7b61718eae807 SHA256 cd14101316dc8b5d3e2bd337d68b0871ef2c49acd5da266f39abd8098392732d
 EBUILD libzip-0.9.ebuild 622 RMD160 d6f84c791ebfa32da1e1b31845263850d2d1b23b SHA1 563feb8017ab5e5d7b9e3e1d309edceb4d1b77dd SHA256 4e59c7bcef7c49e6c4abe281ea2d45178f617d190c45fc50dcfccf348b978df8
-MISC ChangeLog 2901 RMD160 5e4e4984d6c5d960a34a5defd6d6716e45685a28 SHA1 696c76c0752b0f5f77fa49555b116a2c4efaafed SHA256 935e52c1cc7fce16fdee8dca91904a99dfa293efe03cdd0a6ee82fc4d28f08af
+MISC ChangeLog 3096 RMD160 14fe71b4fa45d0f825cad9da84ba018ecc43ea1e SHA1 28437322167c8609cff35b789ae7cc655246b598 SHA256 6153c4919eaa6599131eda99a5d2f31574bc67e2692d40796a68e93e158f39c0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-libs/libzip/libzip-0.10_rc1-r2.ebuild b/dev-libs/libzip/libzip-0.10.ebuild
index f1a51bf3c0d6..de457cb286c5 100644
--- a/dev-libs/libzip/libzip-0.10_rc1-r2.ebuild
+++ b/dev-libs/libzip/libzip-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10_rc1-r2.ebuild,v 1.1 2011/03/05 19:45:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.ebuild,v 1.1 2011/03/22 14:13:58 scarabeus Exp $
 
 EAPI=3
 
@@ -21,14 +21,14 @@ DOCS=( NEWS README THANKS AUTHORS )
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix_headers.patch"
+	"${FILESDIR}/${PN}-0.10_rc1-fix_headers.patch"
 )
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 	autotools-utils_src_prepare
-	eautoreconf
+	eautoreconf # run due to fix_headers patch
 	#elibtoolize # FreeBSD .so version
 }
 
diff --git a/dev-libs/libzip/libzip-0.9.3.ebuild b/dev-libs/libzip/libzip-0.9.3.ebuild
deleted file mode 100644
index 2dc607f2156f..000000000000
--- a/dev-libs/libzip/libzip-0.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.9.3.ebuild,v 1.5 2011/03/04 12:17:02 scarabeus Exp $
-
-EAPI=3
-inherit autotools-utils libtool
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-DOCS=( NEWS README THANKS AUTHORS )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	autotools-utils_src_prepare
-	elibtoolize # FreeBSD .so version
-}
-
-src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
-}