Version bump. Remove old versions and clean up the patch.

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

4 files changed, 14 insertions, 49 deletions

diff --git a/app-arch/libzpaq/ChangeLog b/app-arch/libzpaq/ChangeLog
index f6f0c47fee77..9953f2f1c233 100644
--- a/app-arch/libzpaq/ChangeLog
+++ b/app-arch/libzpaq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/libzpaq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.10 2013/07/20 14:21:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/ChangeLog,v 1.11 2013/09/19 09:04:01 mgorny Exp $
+
+*libzpaq-6.41 (19 Sep 2013)
+
+  19 Sep 2013; Michał Górny <mgorny@gentoo.org> +libzpaq-6.41.ebuild,
+  -libzpaq-5.01.ebuild, -libzpaq-6.10.ebuild,
+  files/0001-Add-autotools-files.patch:
+  Version bump. Remove old versions and clean up the patch.
 
 *libzpaq-6.38 (20 Jul 2013)
 
diff --git a/app-arch/libzpaq/files/0001-Add-autotools-files.patch b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
index 02204fb2d335..fcd0dd4fe474 100644
--- a/app-arch/libzpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/libzpaq/files/0001-Add-autotools-files.patch
@@ -27,7 +27,7 @@ index 0000000..b6dd881
 +	$(POD2MAN) $< > $@
 +endif
 +
-+libzpaq_la_SOURCES = libzpaq.cpp libzpaqo.cpp libzpaq.h
++libzpaq_la_SOURCES = libzpaq.cpp libzpaq.h
 +libzpaq_la_LDFLAGS = -version-info @ABI_VERSION@
 +
 +MOSTLYCLEANFILES = libzpaq.3
diff --git a/app-arch/libzpaq/libzpaq-5.01.ebuild b/app-arch/libzpaq/libzpaq-5.01.ebuild
deleted file mode 100644
index 5c21d194d0e7..000000000000
--- a/app-arch/libzpaq/libzpaq-5.01.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-5.01.ebuild,v 1.3 2012/05/24 04:33:22 vapier Exp $
-
-EAPI=3
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils flag-o-matic eutils
-
-MY_P=${PN}${PV/./}
-DESCRIPTION="Library to compress files or objects in the ZPAQ format"
-HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
-SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
-
-LICENSE="zpaq"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+jit static-libs"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
-	# XXX: update the patch instead when the old version is gone
-	touch libzpaqo.cpp || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-library-version=2:0:0
-	)
-
-	use jit || append-flags -DNOJIT
-
-	autotools-utils_src_configure
-}
diff --git a/app-arch/libzpaq/libzpaq-6.10.ebuild b/app-arch/libzpaq/libzpaq-6.41.ebuild
index 0372b0bf4936..611c35bf0e5c 100644
--- a/app-arch/libzpaq/libzpaq-6.10.ebuild
+++ b/app-arch/libzpaq/libzpaq-6.41.ebuild
@@ -1,8 +1,8 @@
-# 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/app-arch/libzpaq/libzpaq-6.10.ebuild,v 1.1 2012/10/14 07:42:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libzpaq/libzpaq-6.41.ebuild,v 1.1 2013/09/19 09:04:01 mgorny Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils flag-o-matic eutils
@@ -13,7 +13,7 @@ HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
 SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 
 LICENSE="zpaq"
-SLOT="0"
+SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +jit static-libs"
 
@@ -24,14 +24,12 @@ S=${WORKDIR}
 
 src_prepare() {
 	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
-	# XXX: update the patch instead when the old version is gone
-	touch libzpaqo.cpp || die
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local myeconfargs=(
-		--with-library-version=3:0:0
+		--with-library-version=${SLOT#*/}:0:0
 		# man-page is no longer there
 		ac_cv_prog_POD2MAN=
 	)