Version bump. Add USE=debug. Adjust lib deps. Remove pointless lib check from generated autotools.

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

6 files changed, 424 insertions, 28 deletions

diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index 21bb3fa80c6c..30fcb0f3fd93 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/zpaq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.3 2011/01/06 16:20:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/ChangeLog,v 1.4 2011/08/25 11:34:16 mgorny Exp $
+
+*zpaq-3.01 (25 Aug 2011)
+
+  25 Aug 2011; Michał Górny <mgorny@gentoo.org> zpaq-2.05.ebuild,
+  +zpaq-3.01.ebuild, -files/0001-Add-autotools-files.patch,
+  +files/zpaq-2-autotools.patch, +files/zpaq-3-autotools.patch:
+  Version bump. Add USE=debug. Adjust lib deps. Remove pointless lib check from
+  generated autotools.
 
 *zpaq-2.05 (06 Jan 2011)
 
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index fd0cccbfe87f..0c379358d0c2 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0001-Add-autotools-files.patch 2023 RMD160 4fb63b790cd86a7f0cfa0e290e9cb0eafe96cdb7 SHA1 4c734d2724f95e8df7134298e63ce72e1df74408 SHA256 9ca820d57c506bba12d05cf711b764ca3c8c1478d10a957d2e6b363c883419b7
+AUX zpaq-2-autotools.patch 2098 RMD160 4d78a4c95bd3b4d2c2b5d04b3832070a19e6ab68 SHA1 e964a7b8d8c88e58e95afd9c832178a22f2ca768 SHA256 6d02f25c1d327e693fcf9fa3214023cbf6653f60363cb37455ba740f33c289ae
+AUX zpaq-3-autotools.patch 13085 RMD160 ff8039b549d7520226cb7b3a457bc3866658acdf SHA1 45f8a0b57ddc91758b74de470dbac25e288f4c37 SHA256 9e101a4ed8bcc8096453b1f0037439c12210b11fc2c59ac8d510bfb3ae26560f
 DIST zpaq.205.zip 101297 RMD160 43129c0a6a2b6948b360fc9681c6799bfe32c2e3 SHA1 0767965f7c9f292358157e55b307415f20d22002 SHA256 44e089d52c24dca3346654e3d59806f453873a5fc49b4bedde49c9fc1ba72241
-EBUILD zpaq-2.05.ebuild 859 RMD160 2937bcefb3730f7aec48c0d0bd2d7d07b2135f20 SHA1 38aa594454f47fd987cf676951f447db22462ab4 SHA256 786786d6bbbdb8a39eb862078a2f1bdb8e5bfa14a2ee3cfbb3c8c95afb1d1086
-MISC ChangeLog 969 RMD160 3292ab9e0079b037cade139fec9c735292b9e03e SHA1 ba502d95512cc13a642dd9629651331682248095 SHA256 b4b741f9fa2fddb837c2c5858f1b8ac63abe041aa7f4cc7078d67b182781a206
+DIST zpaq301.zip 197065 RMD160 41647194b0a9f77a962cca6bdb225dc926088f2b SHA1 ae856bf85fea4f126690c842bf67b85ebe52d040 SHA256 bf8b9a1e92604dcea0474f60ab4a6ba9f1aae0bd80247c281f36559d0d7da6e8
+EBUILD zpaq-2.05.ebuild 868 RMD160 6c28c20b51f8dfea71d5d67d07a71c61ea6d1d40 SHA1 61730fa954769df044b635df3c35906566f5f0ad SHA256 aa6f055e45981e7cebce9edeccc905214b72fd17cbe713089eef3e94814b081e
+EBUILD zpaq-3.01.ebuild 878 RMD160 3637303ac02a555b7a0fd9513389db9faf56c71a SHA1 a58021e977dea799a8068a7e5f3911aef0dd4338 SHA256 3550b2969f363db1e8b26373c1df9343486135a474cce5d17c890bac12813f28
+MISC ChangeLog 1291 RMD160 774877b0112bd5af0a35a4f5a800229323d7108b SHA1 7990d31a465023d10e6e06a0d8c23640ff0ecb17 SHA256 3d3eaa07edf43b39ef15f07ef1c797f4004466a3af8dc80f0279a11624762880
 MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk0l6vcACgkQnGSe5QXeB7tyegCfUbPC30fEIowEiJNqrXoUH4Yt
-B64AoIAUbcgta+pyZe/X8yTVJnOvhBAF
-=SEzw
+iJwEAQEIAAYFAk5WM6kACgkQfXuS5UK5QB10IwP/SEOSnUaL+vubWnLrDG/KPqeo
+3GIUcShBnc+gnH70DRAzyg2yv+hcEh+8+yWsEL2Va3OtIllJOEi54/vwHkEzrenm
+TZAznX56QREv4SE1VvhVCidmPfA1KnkSn4X7g0G68DDARtyIJGc7RZS1e53dBDE7
+x8N5X8YgRLiexiCMlNY=
+=pjqH
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zpaq/files/0001-Add-autotools-files.patch b/app-arch/zpaq/files/zpaq-2-autotools.patch
index a93af8a26861..0c2ee1642f6a 100644
--- a/app-arch/zpaq/files/0001-Add-autotools-files.patch
+++ b/app-arch/zpaq/files/zpaq-2-autotools.patch
@@ -1,21 +1,21 @@
-From e1d785c3f47252beab63242408a575fe64bc3e52 Mon Sep 17 00:00:00 2001
+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  |   19 +++++++++++++++++++
- configure.ac |   31 +++++++++++++++++++++++++++++++
- 2 files changed, 50 insertions(+), 0 deletions(-)
+ 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..1fc781a
+index 0000000..51275c3
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,18 @@
 +bin_PROGRAMS = zpaq
 +lib_LIBRARIES = libzpaqstub.a
 +
@@ -30,19 +30,18 @@ index 0000000..1fc781a
 +
 +zpaq_SOURCES = zpaq.cpp libzpaq.h
 +zpaq_CPPFLAGS = $(AM_CPPFLAGS) -DOPT='"$(CXX) $(CXXFLAGS) zpaqopt.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o zpaqopt.exe $(LIBS) -lzpaqstub"'
-+
-+AM_CPPFLAGS = -DNDEBUG
++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..ae211d7
+index 0000000..24dddc6
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,35 @@
 +AC_PREREQ([2.60])
-+AC_INIT([zpaq], [2.04])
++AC_INIT([zpaq], [na])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AM_INIT_AUTOMAKE([1.6 foreign no-dependencies])
 +
@@ -50,9 +49,6 @@ index 0000000..ae211d7
 +AC_PROG_CXX
 +AC_PROG_RANLIB
 +
-+AC_CHECK_LIB([zpaq], [main],,
-+	[AC_MSG_ERROR([Unable to find libzpaq, please install it before zpaq])])
-+
 +runtime_LDFLAGS='-Wl,--strip-all'
 +AC_MSG_CHECKING([whether the linker supports $runtime_LDFLAGS])
 +save_LDFLAGS=$LDFLAGS
@@ -70,8 +66,15 @@ index 0000000..ae211d7
 +   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.3.4
+1.7.6.1
 
diff --git a/app-arch/zpaq/files/zpaq-3-autotools.patch b/app-arch/zpaq/files/zpaq-3-autotools.patch
new file mode 100644
index 000000000000..50977bf4968b
--- /dev/null
+++ b/app-arch/zpaq/files/zpaq-3-autotools.patch
@@ -0,0 +1,347 @@
+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) $$1.cpp $(LDFLAGS) @RUNTIME_LDFLAGS@ -o $$1.exe $(LIBS) -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-2.05.ebuild b/app-arch/zpaq/zpaq-2.05.ebuild
index 0d047d274e06..c42abdc3a031 100644
--- a/app-arch/zpaq/zpaq-2.05.ebuild
+++ b/app-arch/zpaq/zpaq-2.05.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/app-arch/zpaq/zpaq-2.05.ebuild,v 1.1 2011/01/06 16:20:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-2.05.ebuild,v 1.2 2011/08/25 11:34:16 mgorny Exp $
 
 EAPI=3
 inherit autotools autotools-utils
@@ -13,16 +13,16 @@ SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="debug"
 
-RDEPEND="app-arch/libzpaq"
+RDEPEND="=app-arch/libzpaq-2*"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S=${WORKDIR}
 
 src_prepare() {
-	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/0001-Add-autotools-files.patch
+	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/${PN}-${PV%.*}-autotools.patch
 	autotools-utils_src_prepare
 	eautoreconf
 }
diff --git a/app-arch/zpaq/zpaq-3.01.ebuild b/app-arch/zpaq/zpaq-3.01.ebuild
new file mode 100644
index 000000000000..923326fe9e96
--- /dev/null
+++ b/app-arch/zpaq/zpaq-3.01.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq/zpaq-3.01.ebuild,v 1.1 2011/08/25 11:34:16 mgorny Exp $
+
+EAPI=3
+inherit autotools autotools-utils
+
+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 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug openmp"
+
+RDEPEND="=app-arch/libzpaq-3*"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	EPATCH_OPTS+=-p1 epatch "${FILESDIR}"/${PN}-${PV%.*}-autotools.patch
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+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."
+}