Drop old. Remove stale features from the patch.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 33 insertions, 92 deletions

diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index a2617ebb73ef..a96a579ac39d 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/zpaq
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.13 2013/09/19 09:04:02 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.14 2014/02/19 16:57:59 mgorny Exp $
+
+  19 Feb 2014; Michał Górny <mgorny@gentoo.org> -zpaq-6.38.ebuild,
+  files/zpaq-4-autotools.patch:
+  Drop old. Remove stale features from the patch.
 
 *zpaq-6.41 (19 Sep 2013)
 
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 21e819bf45c9..cf85d2bece42 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zpaq-4-autotools.patch 12417 SHA256 7f322b6feda67186c558c0b2582980d2194352af4c1dc686b45ed9033871f96e SHA512 919cfa5d2562cc3f731ae74616141005374dad47b898989bac3917b3d3d065f50e1a02cdd93cfee877c151c40f64da1b391bf2062da9979747af9a6935060e3d WHIRLPOOL 7a8571142a92f73178d13c442ba1a9ca73518f9d17d9173d8b5ad75dca94a7a38afeba7f4592484528e9627a3508e1f6d423e78d691667d004f42324bade5097
-DIST zpaq638.zip 568402 SHA256 83d6a0a018e8edbac721517225475c06f0e7d88e6a1a69abe3b58e687eb6e13b SHA512 a2c038c6f9861f74c18cbdbf81ed94a18cc4b4440a931e3355abb5a14a906e91ff38f0c1be771b4b43a0442985d7d85779dfe1efed3d57b8155646f379204441 WHIRLPOOL 1d1a8aa7e590f81771ffcee58b12fe253802528e7decaa3442a6448270ef3cf32f1233757e17eee58d3b37a0df9b0c8def9460541ac4ac97e559345a0ca29046
+AUX zpaq-4-autotools.patch 12048 SHA256 c34f50a2be30f17ad0f7377589edd7af9720184c8cd6b128c087f81b65c6d386 SHA512 8002c65400407c86d65397db6497b4986e80e043a880546ce445fde6212666b9a6a914258802583929d34ff51ad89a6e69abe86fe5761fb80bfd3e1c6a8094ea WHIRLPOOL 0011607e4c8038ede679ddb929cfed989a23364c5347b83e32546f46ce8d4cd1950d2ded7b843043989361c3458c85a860f348ede3601ed93400319748bf35f5
 DIST zpaq641.zip 576673 SHA256 0d90a6be9a70c9c2b337116da4044385821c3b7bbd1988bff8d21171e5daf86c SHA512 48ee840496ee3b61b33117a7a421903635b515040c1a4414c83be66ae6da2516e26511fb3a09ecd1448a84f6b1e7f6df5069af6806d53361110a11590270e7eb WHIRLPOOL a27c3a06854face7e6a6558863e351700601459b354904d61733e75d3719a047a041fff3b315954801ca610355facdf1242b232edfd630d25bef94a321179e6e
-EBUILD zpaq-6.38.ebuild 1066 SHA256 8abc741e2856a5fd1c3676a14b897c3c18586817b2abb3f858836241faa45f12 SHA512 a3ccbf33cc7db4ad597133b97f99e040a6abe94a240dfb63c32cd417f28b0994d534b3b8ce703ed2ed7d85775fb662af887cd757399ceb3d5e945ee650457578 WHIRLPOOL fb6e8354be1b71d2aec2e1a0a947f85ea3bb1405ab57528296ecb13c4c31626c43571627fe55c87e7611da75d4b2021649b9f65787cc322448c0f206541c67ef
 EBUILD zpaq-6.41.ebuild 1066 SHA256 a5714b2a0158fe305c8155aae69f6db2e70c7b6a238d4c146f19151af86f5fd7 SHA512 362c9dbd689ea0b57c011da608fc14009d7f645e5714ea1e2b1c102d37c085bfc9eefd20435dcbec542e90ae3b6f3fab8069d4536a2efb07ce6e37df6360ef2f WHIRLPOOL 1122fc42f0d84ce5339daafdfaa400a2412caf6d649d3c615a9a6a97ee6438e55453191bfafd0f4ce6b88fa4281a3f40e3e22620976749d8d7a9d00bb1715da8
-MISC ChangeLog 2624 SHA256 9b42313d551a9904fa2710c1e510c83b3271f68b3a006e9a0bcc2b3a085224d9 SHA512 b234cf6205330fdb70bfaf6ab35ff8af3de244087cf2672af2099d2267b903cf29378722b2d3d39ed5dd34722ce6031c9b94b905720db7b48dc375c4834c47a1 WHIRLPOOL 86c569395c43546f558c76f2871c8680fed4fb670f882b60f5f674635fd24849c4136917cba3ecab6622e7db43af7d55e6abacd605ca1e3196e17a61c61bb357
+MISC ChangeLog 2776 SHA256 02015da86f1289f03c2613528d89eef067838bd9a1836f44e5dd5debda92d291 SHA512 34635f783438f5a568413d3509e372c5cbd8a6f33364163d824f85235e6fe12f6d88c09bcd76be1f2b7b2c1a1c3376f03002b8d18c2e677f2b28a2edcf2e5716 WHIRLPOOL 8d12fa9dd2d466b7f010acea41ffbf3ce5bfbd2272cf663fd979b6515457c451a8da34d94eee7f99d13085707fba3bcc1bb8baf14be2c312ea335dc1bb223caf
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSOr4qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTBOKYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnQsQAIMlxo0B+Rdq2q24wglHRXKt
-CicNkIfvvQlvM6DjvaJolYuJPi4uU6peb0CxQHQrnS+z+7Zve84eYIDX662QzhTy
-0nILE32ekuAGDkqbhWSgsRhguhpPx6LlfqetnVXx5IiGWMhwaQiAy50R/C8KnlO+
-4fYxO3gglD33yLMOyN9gBbUXX/piQVdcDCqxgKh8T0IGLYyqObMTkqbjBTwbY6Ub
-NnJMnNXO5TtNTwPuROfSbTMcACg5FTvTZXWjTKWuZgis4/R8iOR+lM+1RTPVHl38
-HSt2KqNF+B1vaAg+FvL1VX1NmSkFYyIOD0mACn691lGbDwfVmsxExxRmSgm/oevs
-2KDXauFyauwF3aUTIJEpGnsUkV92zf7r1tWiRjEFTWMvac54SvxFGY69M9NhbKlJ
-NPSiouLwwLJ8yYjMvUHRJtHq+ecB5H0UeTZzCjSq2Vh9Z2PJPcKH48+hAnLzjYc1
-ewrOXY/d83UQjhUu/FZW6H/f5JCdphJKgMTK4dIotKMpvvuSlXcgMGJK0XQ+n/fE
-vUUFAr7AWOt8a7UvjAkNZ1yl6Lwid2FRx7nMBOinesWVL2tePQtL1k27FySXlUqP
-v1JlzOYuMHgUfhn2cOuiEefIHshMJaFsyhmPsIzy+b+G0PrzsOnJH189OVjzJAVX
-0ewDPNbqGQZkmWZ1rTKV
-=EnBF
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaEMP/jKonLp6ziV/e8H6SsyxpbA0
+fp1KP6bbboYGVfbuWKF9wJsRkgmYB1SxKz5cDeBCEvvx8sK5jMGPOsh/hBzTkQic
+jG1sKY/JjQ5kqTfTuEl2M0amCHZ2b4ZqpBugS2paY+7uVaMBhpEcW/1rnHcukOlB
+AXZ+5fxcoG17Dlzv9sPqVQ6D1deGniQ4FYwsc/dTN8/xXCUFKExRgX3ZHopsZHdl
+INmxTlaaoQy6qS9WEWNvD16fUv5jp1yQcg8Q2j2L2AWhZ0REKNetAFSbu3yfZpkW
+ayGl2U/FUCUd2LILQARKveLXrS3b/ClanKIi/qbeQsFgOTSccrBxIEokmYPHFnkC
+aKu3mwhrE86tsFO/gK2pMgbX08GgEPjouUkWkjf5O2oBYtPssEdD7e8tNv6JEyT8
+dUMPdIIu+c/mHiTCbmkcc4l1rhRY5Boz5K8MiAEPpch4+BtFaIyhS7Sg9k7336+6
+7QpVWJdkpj2pToEjEP8e0BThlmHztELy4WuV5bhG/142uRo7/Rm1V5n8hDQFF/2I
+aT8IEhNHaEp2Y7Gxzd5dhiDeFsNUz9VI21NLrgpC3ZKgt/AhVFohBesoXcj3Ymsu
+co0Y7oAQNcjxgrW1GGDAvtlCcvomqhYniQKGp515hjcvJOV/My7WNU12BVkaFAx2
+62zU7uT55rzXZV2B/lzO
+=8wnW
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq/files/zpaq-4-autotools.patch b/app-arch/zpaq/files/zpaq-4-autotools.patch
index b7d3af1c79d4..099054bc0d00 100644
--- a/app-arch/zpaq/files/zpaq-4-autotools.patch
+++ b/app-arch/zpaq/files/zpaq-4-autotools.patch
@@ -1,46 +1,36 @@
-From 9dbddd291b6d9bda9701346f88093908dfbaaf72 Mon Sep 17 00:00:00 2001
+From 0120bcc43898ebc26af64befabc5552b31fa2992 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Tue, 4 Jan 2011 21:04:53 +0100
 Subject: [PATCH] Add autotools files.
 
 ---
- Makefile.am      |   17 ++++
- configure.ac     |   25 ++++++
- m4/ax_pthread.m4 |  246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 288 insertions(+)
+ Makefile.am      |   7 ++
+ configure.ac     |  19 +++++
+ m4/ax_pthread.m4 | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 272 insertions(+)
  create mode 100644 Makefile.am
  create mode 100644 configure.ac
  create mode 100644 m4/ax_pthread.m4
 
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..c77ba7c
+index 0000000..c1135e5
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,7 @@
 +bin_PROGRAMS = zpaq
 +
 +ACLOCAL_AMFLAGS = -I m4
 +
-+if HAVE_POD2MAN
-+man1_MANS = zpaq.1
-+
-+zpaq.1: zpaq.1.pod
-+	$(POD2MAN) $< > $@
-+endif
-+
 +zpaq_SOURCES = zpaq.cpp
 +zpaq_CXXFLAGS = $(PTHREAD_CFLAGS) $(LIBDIVSUFSORT_CFLAGS)
 +zpaq_LDADD = -lzpaq $(LIBDIVSUFSORT_LIBS)
-+
-+MOSTLYCLEANFILES = zpaq.1
-+EXTRA_DIST = zpaq.1.pod
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
-index 0000000..6f73e86
+index 0000000..d0f5bb2
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,19 @@
 +AC_PREREQ([2.60])
 +AC_INIT([zpaq], [na])
 +AC_CONFIG_AUX_DIR([build-aux])
@@ -51,12 +41,6 @@ index 0000000..6f73e86
 +ACX_PTHREAD
 +PKG_CHECK_MODULES([LIBDIVSUFSORT], [libdivsufsort])
 +
-+AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man])
-+AM_CONDITIONAL([HAVE_POD2MAN], [test x"$POD2MAN" != x""])
-+AS_IF([test "x$POD2MAN" = x], [
-+   AC_MSG_WARN([Unable to find pod2man, manpage will not be generated])
-+])
-+
 +AC_ARG_ENABLE([debug],
 +	[AS_HELP_STRING([--enable-debug],
 +		[Enable debug])])
@@ -319,5 +303,5 @@ index 0000000..3d0806d
 +AC_LANG_POP
 +])dnl AX_PTHREAD
 -- 
-1.7.10
+1.9.0
 
diff --git a/app-arch/zpaq/zpaq-6.38.ebuild b/app-arch/zpaq/zpaq-6.38.ebuild
deleted file mode 100644
index b43eadb94ec9..000000000000
--- a/app-arch/zpaq/zpaq-6.38.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-6.38.ebuild,v 1.1 2013/07/20 14:22:19 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
-
-MY_P=${PN}${PV/./}
-DESCRIPTION="Journaling incremental deduplicating archiving compressor"
-HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
-SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="=app-arch/libzpaq-${PV}
-	dev-libs/libdivsufsort"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/${PN}-4-autotools.patch
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		# man-page is no longer there
-		ac_cv_prog_POD2MAN=
-	)
-
-	autotools-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You may also want to install app-arch/zpaq-extras package which provides"
-	elog "few additional configs and preprocessors for use with zpaq."
-}