Version bump. Remove old.

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

6 files changed, 29 insertions, 496 deletions

diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index 8c79102fe6d1..a2617ebb73ef 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2013/07/20 14:22:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.13 2013/09/19 09:04:02 mgorny Exp $
+
+*zpaq-6.41 (19 Sep 2013)
+
+  19 Sep 2013; Michał Górny <mgorny@gentoo.org> +zpaq-6.41.ebuild,
+  -files/zpaq-2-autotools.patch, -files/zpaq-3-autotools.patch,
+  -zpaq-4.04.ebuild, -zpaq-6.10.ebuild:
+  Version bump. Remove old.
 
 *zpaq-6.38 (20 Jul 2013)
 
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 31178fb3f217..21e819bf45c9 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,33 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zpaq-2-autotools.patch 2098 SHA256 6d02f25c1d327e693fcf9fa3214023cbf6653f60363cb37455ba740f33c289ae SHA512 a730bd8384ad9cd2c56c26f698cd311b57f7e1b7667bac2b75eaa81067a16f47caa3989b0092b6dfeb59acdcb46b87ec9ebee35e835ce5bf3fb2cbb873a9e555 WHIRLPOOL 8899db6aaf1eb9b43ba40fbce1ac862fcfa4f9f7a8b0538e05396e81479c932104c595f42d2129ee08e59a383ef04e4a7a2643085227de3648e154c91dad5c2d
-AUX zpaq-3-autotools.patch 13117 SHA256 d30aea3989594be8fc5512d9ea22a358c9739684efeefbb0cd07bd1bb20b054c SHA512 744c5d686f56f983c1e809ef829a1dae98b0a4f1b1056179fc0b35573ada99319c586ac7c80bb5b6953c4ded58fe29ef1e3dfd0c88619e5e4eeaf573f4f21fba WHIRLPOOL a463716c739592b6434aa5877189573281e67f3e3489fd1113fc8b7b08c5f4ef2ff3330b8784d3b36db865747ff6374ca981f62f4e12631bfacd3f4b48821422
 AUX zpaq-4-autotools.patch 12417 SHA256 7f322b6feda67186c558c0b2582980d2194352af4c1dc686b45ed9033871f96e SHA512 919cfa5d2562cc3f731ae74616141005374dad47b898989bac3917b3d3d065f50e1a02cdd93cfee877c151c40f64da1b391bf2062da9979747af9a6935060e3d WHIRLPOOL 7a8571142a92f73178d13c442ba1a9ca73518f9d17d9173d8b5ad75dca94a7a38afeba7f4592484528e9627a3508e1f6d423e78d691667d004f42324bade5097
-DIST zpaq404.zip 45770 SHA256 ce946b8a9cb92c5656a20ff83a3a0ef88e23b374a58e33c295ef00b1843dfe30 SHA512 b624eeb358550a77979813ad950c940ff9de91636292eaa3b6e034a58474882615c7e8d154e7efd1dbb6ad77e20709d271ddb95897e294281a53d16ce0f26432 WHIRLPOOL b925fde2b55d4ba1006dac86a46abbda7c5ff18f154bec84d4400889ceec1cc9bf23e17490c5a9f6b5fb4088695bb76ffa06ee7b66063317b1682b0659179aee
-DIST zpaq610.zip 266105 SHA256 886caae1779b67e8daa1a3aa7b2dc744da297a5e6d160755ccf3dddb55409f83 SHA512 ff1337877d5393b099392582820cb493d5e695c52070cfd6ce6b1967326bc0c3985e5ac6872959f69ec9c3945ed365570711b4e590f7f437bc1a30e46a61f01f WHIRLPOOL c10a7d98eb694c540832f7c209668d07e40c7e752932d30ed21ab955c13d9a39e557daad928c3faf5b2098654bfc5bffd1a5ab74537dc16a88f9fbbdf1ce38c8
 DIST zpaq638.zip 568402 SHA256 83d6a0a018e8edbac721517225475c06f0e7d88e6a1a69abe3b58e687eb6e13b SHA512 a2c038c6f9861f74c18cbdbf81ed94a18cc4b4440a931e3355abb5a14a906e91ff38f0c1be771b4b43a0442985d7d85779dfe1efed3d57b8155646f379204441 WHIRLPOOL 1d1a8aa7e590f81771ffcee58b12fe253802528e7decaa3442a6448270ef3cf32f1233757e17eee58d3b37a0df9b0c8def9460541ac4ac97e559345a0ca29046
-EBUILD zpaq-4.04.ebuild 998 SHA256 f5f7ed744db64cc047dc447699940290ee2bb273b2223bff6f7ee343c9675f30 SHA512 d648b7b563916232cc32d7ccb253f1965480055a547b81b2f4571c02d4e0290191fe99759e745bf1943f355bcbe0a91949bfe2054a8066c22811eb039c221942 WHIRLPOOL 076ae6b76f0224e35db74b9ccec8333b476eab671f522045be8974f90ebf504b7cdb6b53ffc22a54c588b1d927fe9361c0a4b908c7f86aa872b6994abc4cdd2a
-EBUILD zpaq-6.10.ebuild 1066 SHA256 34eb9581f03900a38c44d6f440428f4c0f1a6621a1fa979b34b87e82d05b26b7 SHA512 15043309dd6cd21e9dcf93875429a6d03f6a8d22b0b636e82cd3de6b42350c5d707ec78848a8cbebb8eb94083fd082b0681037cc22a29e8c096fcb155a3f9fba WHIRLPOOL 05c918a1a53a3bbbd3e29250e3206021083de6a4f3d06c7bb2203c88f059552880305353d9267fcf1544c59870fb50404de937ff000fe0afefd63d62f8052589
+DIST zpaq641.zip 576673 SHA256 0d90a6be9a70c9c2b337116da4044385821c3b7bbd1988bff8d21171e5daf86c SHA512 48ee840496ee3b61b33117a7a421903635b515040c1a4414c83be66ae6da2516e26511fb3a09ecd1448a84f6b1e7f6df5069af6806d53361110a11590270e7eb WHIRLPOOL a27c3a06854face7e6a6558863e351700601459b354904d61733e75d3719a047a041fff3b315954801ca610355facdf1242b232edfd630d25bef94a321179e6e
 EBUILD zpaq-6.38.ebuild 1066 SHA256 8abc741e2856a5fd1c3676a14b897c3c18586817b2abb3f858836241faa45f12 SHA512 a3ccbf33cc7db4ad597133b97f99e040a6abe94a240dfb63c32cd417f28b0994d534b3b8ce703ed2ed7d85775fb662af887cd757399ceb3d5e945ee650457578 WHIRLPOOL fb6e8354be1b71d2aec2e1a0a947f85ea3bb1405ab57528296ecb13c4c31626c43571627fe55c87e7611da75d4b2021649b9f65787cc322448c0f206541c67ef
-MISC ChangeLog 2396 SHA256 367cb3b861ef6b4b282caeef8e819e40aced4b0c3cfc6e34649eed1ca05a5ca4 SHA512 230ecf69b6d766914932c354c15436f7c56f930ec52304f3ed87473613d550412289f522929269ea899e75e7a72b9e1332879eaf529db8d44f56f649aa835d8f WHIRLPOOL 79f48d2fef7441b938f3747a33c451a4f9683a17b31d32444705ef601954aa4ceb307e2b29b6cee870d1727e1158967da067995ea8a52f2dcebc814e7d4f8640
+EBUILD zpaq-6.41.ebuild 1066 SHA256 a5714b2a0158fe305c8155aae69f6db2e70c7b6a238d4c146f19151af86f5fd7 SHA512 362c9dbd689ea0b57c011da608fc14009d7f645e5714ea1e2b1c102d37c085bfc9eefd20435dcbec542e90ae3b6f3fab8069d4536a2efb07ce6e37df6360ef2f WHIRLPOOL 1122fc42f0d84ce5339daafdfaa400a2412caf6d649d3c615a9a6a97ee6438e55453191bfafd0f4ce6b88fa4281a3f40e3e22620976749d8d7a9d00bb1715da8
+MISC ChangeLog 2624 SHA256 9b42313d551a9904fa2710c1e510c83b3271f68b3a006e9a0bcc2b3a085224d9 SHA512 b234cf6205330fdb70bfaf6ab35ff8af3de244087cf2672af2099d2267b903cf29378722b2d3d39ed5dd34722ce6031c9b94b905720db7b48dc375c4834c47a1 WHIRLPOOL 86c569395c43546f558c76f2871c8680fed4fb670f882b60f5f674635fd24849c4136917cba3ecab6622e7db43af7d55e6abacd605ca1e3196e17a61c61bb357
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR6p0tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDIOgQAMArjSBPg5rTFXEqhhD5VRTF
-sPlvHJfj1mEojk3clmM5JNLWP3LocYvTW6ksOtdPg8lUSWI4kYfnszwk+CfBHl6s
-EKJFdm/my1ei5hxOD9iunzlT4vR8A4WcN05UAeFpbhYZwBQm1n3FeYwqjT1QhSj5
-UL65fuEi6v0l9JNG6rM0CMcRz2oZ2HwGdyss1PrKQNhkGPokHhLS4l+6xmDPz+hn
-OedxnjYzdpAnNNEBe++UV4uVsrbsLxMw/EjF3FTzjIGq7NdaDh6vIgCceROEGEYu
-YObjFCdS85rVwZAq4GqwW71GgGlcS+gLx2EkS72AhVqx+m52iWnNeV3c3dKv7Ofn
-IlA6hWKK1FO/5GtyBMaYuvPcZClYF050Lp3xdOdRv8wk/Bwz+f3xf/DpmC5NcnSi
-tRgmr2ad7fRnDaz/JuMw+cfzp16LIENODYtGbwXhjmE1AXA9/Ew+JgW6eCp204JX
-xNL+nnEyy8k49EMkmAUNdWt2lDIhtFoGPbOrSdMRHYj64wGvvyvF+AXIhm4PP+a6
-2nJcavgbyUMOAVYQwQo76nwHSbjf27FWB7vif466jZtVdg+++Br7rrysy+RhnW/y
-ll0vH5qdZbbcisZUN11UmFYbO/V3gIe2vVmxbxU0zXbWnLeN51B6HLNaIz3HdcQa
-mMSAouvQOV3xuMmfhEt9
-=m/NV
+iQJ8BAEBCABmBQJSOr4qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq/files/zpaq-2-autotools.patch b/app-arch/zpaq/files/zpaq-2-autotools.patch
deleted file mode 100644
index 0c2ee1642f6a..000000000000
--- a/app-arch/zpaq/files/zpaq-2-autotools.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0c5836166c1d856eb7f20b9cfc3b6f646b1bf587 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  |   18 ++++++++++++++++++
- configure.ac |   35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 53 insertions(+), 0 deletions(-)
- create mode 100644 Makefile.am
- create mode 100644 configure.ac
-
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..51275c3
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,18 @@
-+bin_PROGRAMS = zpaq
-+lib_LIBRARIES = libzpaqstub.a
-+
-+if HAVE_POD2MAN
-+man1_MANS = zpaq.1
-+
-+zpaq.1: zpaq.1.pod
-+	$(POD2MAN) $< > $@
-+endif
-+
-+libzpaqstub_a_SOURCES = zpaq.cpp
-+
-+zpaq_SOURCES = zpaq.cpp libzpaq.h
-+zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe $(LIBS) -lzpaqstub"'
-+zpaq_LDADD = -lzpaq
-+
-+MOSTLYCLEANFILES = zpaq.1
-+EXTRA_DIST = zpaq.1.pod
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..24dddc6
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,35 @@
-+AC_PREREQ([2.60])
-+AC_INIT([zpaq], [na])
-+AC_CONFIG_AUX_DIR([build-aux])
-+AM_INIT_AUTOMAKE([1.6 foreign no-dependencies])
-+
-+AC_LANG([C++])
-+AC_PROG_CXX
-+AC_PROG_RANLIB
-+
-+runtime_LDFLAGS='-Wl,--strip-all'
-+AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
-+save_LDFLAGS=$LDFLAGS
-+LDFLAGS="$LDFLAGS $runtime_LDFLAGS"
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM([], [])],
-+	[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])
-+runtime_LDFLAGS=])
-+LDFLAGS=$save_LDFLAGS
-+AC_SUBST([RUNTIME_LDFLAGS], [$runtime_LDFLAGS])
-+
-+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])])
-+AS_IF([test x"$enable_debug" != x"yes"], [
-+	AC_DEFINE([NDEBUG], [1], [Set this to disable debug])
-+])
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
--- 
-1.7.6.1
-
diff --git a/app-arch/zpaq/files/zpaq-3-autotools.patch b/app-arch/zpaq/files/zpaq-3-autotools.patch
deleted file mode 100644
index 871fa533f803..000000000000
--- a/app-arch/zpaq/files/zpaq-3-autotools.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-From cb14b21eb30e3c78eb475aabab97a89d3d428d91 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      |   28 ++++++
- configure.ac     |   38 +++++++++
- m4/ax_pthread.m4 |  246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 312 insertions(+), 0 deletions(-)
- 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..d005d5e
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,28 @@
-+bin_PROGRAMS = zpaq
-+bin_SCRIPTS = zpaqopt
-+lib_LIBRARIES = libzpaqstub.a
-+
-+ACLOCAL_AMFLAGS = -I m4
-+
-+if HAVE_POD2MAN
-+man1_MANS = zpaq.1
-+
-+zpaq.1: zpaq.1.pod
-+	$(POD2MAN) $< > $@
-+endif
-+
-+libzpaqstub_a_SOURCES = zpaq.cpp
-+libzpaqstub_a_CPPFLAGS = -DOPT
-+
-+zpaq_SOURCES = zpaq.cpp divsufsort.c divsufsort.h
-+zpaq_CFLAGS = $(OPENMP_CXXFLAGS)
-+zpaq_CXXFLAGS = $(OPENMP_CXXFLAGS) $(PTHREAD_CFLAGS)
-+zpaq_LDADD = -lzpaq $(PTHREAD_LIBS)
-+
-+zpaqopt:
-+	echo '$(CXX) $(CXXFLAGS) $(PTHREAD_CFLAGS) $$1.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o $$1.exe $(LIBS) $(zpaq_LDADD) -lzpaqstub' > $@
-+
-+.PHONY: zpaqopt
-+
-+MOSTLYCLEANFILES = zpaq.1 zpaqopt
-+EXTRA_DIST = zpaq.1.pod
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..b7ad2b7
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,38 @@
-+AC_PREREQ([2.60])
-+AC_INIT([zpaq], [na])
-+AC_CONFIG_AUX_DIR([build-aux])
-+AM_INIT_AUTOMAKE([1.6 foreign no-dependencies])
-+
-+AC_LANG([C++])
-+AC_PROG_CC
-+AC_PROG_CXX
-+AC_PROG_RANLIB
-+AC_OPENMP
-+ACX_PTHREAD
-+
-+runtime_LDFLAGS='-Wl,--strip-all'
-+AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
-+save_LDFLAGS=$LDFLAGS
-+LDFLAGS="$LDFLAGS $runtime_LDFLAGS"
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM([], [])],
-+	[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])
-+runtime_LDFLAGS=])
-+LDFLAGS=$save_LDFLAGS
-+AC_SUBST([RUNTIME_LDFLAGS], [$runtime_LDFLAGS])
-+
-+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])])
-+AS_IF([test x"$enable_debug" != x"yes"], [
-+	AC_DEFINE([NDEBUG], [1], [Set this to disable debug])
-+])
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
-diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
-new file mode 100644
-index 0000000..3d0806d
---- /dev/null
-+++ b/m4/ax_pthread.m4
-@@ -0,0 +1,246 @@
-+# note: dropped PTHREAD_CC, joinable and stuff
-+
-+# ===========================================================================
-+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also link it with them as well. e.g. you should link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threads programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 16
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
-+        AC_MSG_RESULT($ax_pthread_ok)
-+        if test x"$ax_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case "${host_cpu}-${host_os}" in
-+        *solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+        ;;
-+
-+        *-darwin*)
-+        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+        case $flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $flag])
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
-+                if test x"$ax_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$flag])
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+                        static void routine(void *a) { a = 0; }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+                [ax_pthread_ok=yes],
-+                [])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        AC_MSG_RESULT($ax_pthread_ok)
-+        if test "x$ax_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+AC_SUBST(PTHREAD_LIBS)
-+AC_SUBST(PTHREAD_CFLAGS)
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
--- 
-1.7.6.1
-
diff --git a/app-arch/zpaq/zpaq-4.04.ebuild b/app-arch/zpaq/zpaq-4.04.ebuild
deleted file mode 100644
index b7f76d1f7ae6..000000000000
--- a/app-arch/zpaq/zpaq-4.04.ebuild
+++ /dev/null
@@ -1,43 +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/zpaq/zpaq-4.04.ebuild,v 1.3 2012/05/24 04:35:17 vapier Exp $
-
-EAPI=3
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
-
-MY_P=${PN}${PV/./}
-DESCRIPTION="A unified compressor for PAQ algorithms"
-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-5*
-	dev-libs/libdivsufsort"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/${PN}-${PV%.*}-autotools.patch
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-
-	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."
-}
diff --git a/app-arch/zpaq/zpaq-6.10.ebuild b/app-arch/zpaq/zpaq-6.41.ebuild
index c615e88fa7fc..d686554f0d2d 100644
--- a/app-arch/zpaq/zpaq-6.10.ebuild
+++ b/app-arch/zpaq/zpaq-6.41.ebuild
@@ -1,8 +1,8 @@
 # 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.10.ebuild,v 1.2 2013/07/20 14:22:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-6.41.ebuild,v 1.1 2013/09/19 09:04:02 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils eutils