commit: 11200af417c9dc691229343a2bb55557b5264ac6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jul 7 20:44:02 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jul 7 20:54:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11200af4
app-arch/zpaq: Prune old app-arch/zpaq/Manifest | 2 - app-arch/zpaq/files/zpaq-4-autotools.patch | 307 ----------------------------- app-arch/zpaq/zpaq-6.53.ebuild | 44 ----- app-arch/zpaq/zpaq-7.04.ebuild | 44 ----- app-arch/zpaq/zpaq-7.13.ebuild | 49 ----- 5 files changed, 446 deletions(-) diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest index 5e27e4d..f882cb3 100644 --- a/app-arch/zpaq/Manifest +++ b/app-arch/zpaq/Manifest @@ -1,3 +1 @@ -DIST zpaq653.zip 536808 SHA256 295e4e491958c222bf51a30d36eb2d013a6f427422b91ee9d5be7f1c332590b3 SHA512 7999f0e35e8b0f46b586e5a0f5346b3501f21ab39fa25d57b9bdf5b87eee16d9e846f6b60fc7c447195bbdd0345ec4e220606d8c100167611231afe36f5558ed WHIRLPOOL 9d66fc51d2d48df1853c68686a65bc492756e11378c8e9075d6c976f11e69941fe52405ce66a57497fcde0524879ce04ef0430df3ff84da28e7d2f9d2cc70034 -DIST zpaq704.zip 630426 SHA256 21b595f8452b32c780f6ff29e0fc716cdf3595338774e1f72d4d4b5df212da39 SHA512 2655febd6e1352858c4daa7abe743c77e2b4b554b6c5961e1dde2c4011b1b4dd647decf60b7a86585eb5a1606253789afb85551923c6f542cf31dfecd984eaaa WHIRLPOOL 8a4ff4dd0c9e53d2f4a85c600537d83d7876f24ba4d4371d5a647d873c5ecc92ed80626f7abc3127f62346a1ffa69bc88172366a4fe4e0ea4236086c55a5ee72 DIST zpaq713.zip 829863 SHA256 9120cf4fb1afdecea3ac4f690d7b0577f7cb004ca6b152856edd8ac444f0d919 SHA512 93ef758e9c6c13f4cc89b1969fce3630132c941ee5076959c3a7988b28e12530346c5b489837af9187937be35129bde0c9cf0e8aa8bf326799c893ef9fc74f5f WHIRLPOOL 494c3b9a6e6e0f50cecaf2630bcb4c9edd2433c128c13a1fc7a31d1695cbfbfadeda68f7fa2bd0023a0854d8548221ee52a1c218755b4a5a10b695db6b5a142d diff --git a/app-arch/zpaq/files/zpaq-4-autotools.patch b/app-arch/zpaq/files/zpaq-4-autotools.patch deleted file mode 100644 index 099054b..0000000 --- a/app-arch/zpaq/files/zpaq-4-autotools.patch +++ /dev/null @@ -1,307 +0,0 @@ -From 0120bcc43898ebc26af64befabc5552b31fa2992 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Tue, 4 Jan 2011 21:04:53 +0100 -Subject: [PATCH] Add autotools files. - ---- - 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..c1135e5 ---- /dev/null -+++ b/Makefile.am -@@ -0,0 +1,7 @@ -+bin_PROGRAMS = zpaq -+ -+ACLOCAL_AMFLAGS = -I m4 -+ -+zpaq_SOURCES = zpaq.cpp -+zpaq_CXXFLAGS = $(PTHREAD_CFLAGS) $(LIBDIVSUFSORT_CFLAGS) -+zpaq_LDADD = -lzpaq $(LIBDIVSUFSORT_LIBS) -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..d0f5bb2 ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,19 @@ -+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 -+ACX_PTHREAD -+PKG_CHECK_MODULES([LIBDIVSUFSORT], [libdivsufsort]) -+ -+AC_ARG_ENABLE([debug], -+ [AS_HELP_STRING([--enable-debug], -+ [Enable debug])]) -+AS_IF([test x"$enable_debug" = x"yes"], [ -+ AC_DEFINE([DEBUG], [1], [Set this to enable 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 <stev...@alum.mit.edu> -+# Copyright (c) 2011 Daniel Richard G. <sk...@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.9.0 - diff --git a/app-arch/zpaq/zpaq-6.53.ebuild b/app-arch/zpaq/zpaq-6.53.ebuild deleted file mode 100644 index 7667a97..0000000 --- a/app-arch/zpaq/zpaq-6.53.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils eutils flag-o-matic - -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) - ) - - append-cppflags -Dunix - 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-7.04.ebuild b/app-arch/zpaq/zpaq-7.04.ebuild deleted file mode 100644 index 19f402a..0000000 --- a/app-arch/zpaq/zpaq-7.04.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils eutils flag-o-matic - -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) - ) - - append-cppflags -Dunix - 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-7.13.ebuild b/app-arch/zpaq/zpaq-7.13.ebuild deleted file mode 100644 index ed726ad..0000000 --- a/app-arch/zpaq/zpaq-7.13.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit toolchain-funcs - -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}" -# perl for pod2man -DEPEND="${RDEPEND} - app-arch/unzip - dev-lang/perl" - -S=${WORKDIR} - -src_compile() { - emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" zpaq.o zpaq.1 - # link manually to use shared library - emake -f /dev/null CC="$(tc-getCXX)" LDLIBS="-lzpaq -pthread" zpaq -} - -src_test() { - # no idea why the 'test' needs that - touch libzpaq.so libzpaq.so.1 || die - default -} - -src_install() { - dobin zpaq - doman zpaq.1 -} - -pkg_postinst() { - if ! has_version app-arch/zpaq-extras; then - elog "You may also want to install app-arch/zpaq-extras package which provides" - elog "few additional configs and preprocessors for use with zpaq." - fi -}
