Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-arch/unp/ChangeLog9
-rw-r--r--app-arch/unp/files/unp-1.0.15-7z-lzma-xz.diff67
-rw-r--r--app-arch/unp/files/unp-1.0.15-lzma-7z.patch64
-rw-r--r--app-arch/unp/unp-1.0.15-r1.ebuild28
-rw-r--r--app-arch/unp/unp-1.0.15-r2.ebuild27
-rw-r--r--app-arch/unp/unp-2.0_pre5.ebuild42
6 files changed, 7 insertions, 230 deletions
diff --git a/app-arch/unp/ChangeLog b/app-arch/unp/ChangeLog
index 9330a0bbfed4..b57b65207510 100644
--- a/app-arch/unp/ChangeLog
+++ b/app-arch/unp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-arch/unp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/ChangeLog,v 1.31 2012/01/28 15:31:25 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/ChangeLog,v 1.32 2014/08/27 21:02:19 hanno Exp $
+
+ 27 Aug 2014; Hanno Boeck <hanno@gentoo.org> -unp-1.0.15-r1.ebuild,
+ -unp-1.0.15-r2.ebuild, -unp-2.0_pre5.ebuild,
+ -files/unp-1.0.15-7z-lzma-xz.diff, -files/unp-1.0.15-lzma-7z.patch:
+ Remove old.
28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> unp-2.0_pre7.ebuild:
x86 stable wrt bug #396767
diff --git a/app-arch/unp/files/unp-1.0.15-7z-lzma-xz.diff b/app-arch/unp/files/unp-1.0.15-7z-lzma-xz.diff
deleted file mode 100644
index 58070f82034c..000000000000
--- a/app-arch/unp/files/unp-1.0.15-7z-lzma-xz.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur unp-1.0.15/unp unp-1.0.15-1/unp
---- unp-1.0.15/unp 2008-05-18 02:55:54.000000000 +0200
-+++ unp-1.0.15-1/unp 2009-12-22 14:01:13.000000000 +0100
-@@ -38,20 +38,23 @@
- }
-
- %pkgmap = (
-- cpio, "afio $or cpio",
-- afio, "afio $or cpio",
-- rpm2cpio, "rpm, afio $or cpio",
-- unshar, sharutils,
-- uudecode, sharutils,
-- PPMd, ppmd,
-- rar, "rar $or unrar $or unrar-free",
-- ar, binutils,
-- unarj, "unarj $or arj",
-- hexbin, macutils,
-+ "xz", "xz-utils",
-+ "lzma", "lzma",
-+ "7z", "p7zip $or p7zip-full",
-+ "cpio", "afio $or cpio",
-+ "afio", "afio $or cpio",
-+ "rpm2cpio", "rpm, afio $or cpio",
-+ "unshar", "sharutils",
-+ "uudecode", "sharutils",
-+ "PPMd", "ppmd",
-+ "rar", "rar $or unrar $or unrar-free",
-+ "ar", "binutils",
-+ "unarj", "unarj $or arj",
-+ "hexbin", "macutils",
- #macunpack, macunpack,
-- gunzip, gzip,
-- bunzip2, bzip2,
-- formail, "formail, mpack"
-+ "gunzip", "gzip",
-+ "bunzip2", "bzip2",
-+ "formail", "formail, mpack"
- );
-
- &print_usage if ($#ARGV<0 || $ARGV[0] eq "-h");
-@@ -153,6 +156,7 @@
- if ($UNP_FILEstr =~ /CAB file/i) { set_command 'cabextract $UNP_FILE'; }
- if ($UNP_FILEstr =~ /cpio/i) { set_command('afio -Z -v -i $UNP_FILE','cpio -i -d --verbose $UNP_ARGS < $UNP_FILE'); }
- if ($UNP_FILEstr =~ /Zip.*archive/i) { set_command 'unzip $UNP_ARGS $UNP_FILE'; }
-+ if ($UNP_FILEstr =~ /7-zip.*archive/i) { set_command '7z x $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /Zoo.*archive/i) { set_command 'unzoo -x $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /shell.*archive/i) { set_command 'unshar $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /Transport Neutral Encapsulation Format/i) { set_command 'tnef -v $UNP_ARGS $UNP_FILE'; }
-@@ -214,12 +218,13 @@
-
- # check also for _tar, because of broken filenames
- if ($UNP_FILE =~ /(\.|_)tar$/i) { set_command 'tar -xvf $UNP_FILE $UNP_ARGS'; }
-- if ($UNP_FILE =~ /(\.|_)rpm$/i) { set_command 'rpm2cpio < $UNP_FILE | cpio -i -d --verbose $UNP_ARGS';}
-- if ($UNP_FILE =~ /(\.|_)tar\.gz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /(\.|_)rpm$/i) { set_command 'rpm2cpio < $UNP_FILE | cpio -i -d --verbose $UNP_ARGS';}
-+ if ($UNP_FILE =~ /(\.|_)tar\.gz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
- if ($UNP_FILE =~ /(\.|_)tar\.bz2$/i) { set_command 'bunzip2 -c $UNP_FILE | tar -xvf - $UNP_ARGS'; }
--
-- if ($UNP_FILE =~ /\.tgz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-- if ($UNP_FILE =~ /\.(tzo|tar\.lzop)$/i) { set_command 'lzop -v -d $UNP_FILE | tar -xv $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /\.tgz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /\.(tzo|tar\.lzop)$/i) { set_command 'lzop -v -d $UNP_FILE | tar -xv $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /(\.|_)tar\.xz$/i) { set_command 'tar -xvJf $UNP_FILE $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /(\.|_)tar\.lzma$/i) { set_command 'lzma -cd $UNP_FILE | tar -xvf - $UNP_ARGS'; }
- if ($UNP_FILE =~ /\.rar$/i) { set_command('rar x $UNP_ARGS $UNP_FILE || rar x -av- $UNP_ARGS $UNP_FILE','unrar x $UNP_ARGS $UNP_FILE || unrar x -av- $UNP_ARGS $UNP_FILE'); }
- if ($UNP_FILE =~ /\.(ar|deb)$/i) { set_command 'ar -x -v $UNP_FILE $UNP_ARGS'; }
- if ($UNP_FILE =~ /\.l(ha|zh)$/i) { set_command 'lha x $UNP_ARGS $UNP_FILE'; }
diff --git a/app-arch/unp/files/unp-1.0.15-lzma-7z.patch b/app-arch/unp/files/unp-1.0.15-lzma-7z.patch
deleted file mode 100644
index 4f81abf23f23..000000000000
--- a/app-arch/unp/files/unp-1.0.15-lzma-7z.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- /usr/bin/unp 2008-05-18 03:15:15.000000000 +0200
-+++ unp 2009-01-09 02:17:04.000000000 +0100
-@@ -38,20 +38,22 @@
- }
-
- %pkgmap = (
-- cpio, "afio $or cpio",
-- afio, "afio $or cpio",
-- rpm2cpio, "rpm, afio $or cpio",
-- unshar, sharutils,
-- uudecode, sharutils,
-- PPMd, ppmd,
-- rar, "rar $or unrar $or unrar-free",
-- ar, binutils,
-- unarj, "unarj $or arj",
-- hexbin, macutils,
-+ "lzma", "lzma",
-+ "7z", "p7zip $or p7zip-full",
-+ "cpio", "afio $or cpio",
-+ "afio", "afio $or cpio",
-+ "rpm2cpio", "rpm, afio $or cpio",
-+ "unshar", "sharutils",
-+ "uudecode", "sharutils",
-+ "PPMd", "ppmd",
-+ "rar", "rar $or unrar $or unrar-free",
-+ "ar", "binutils",
-+ "unarj", "unarj $or arj",
-+ "hexbin", "macutils",
- #macunpack, macunpack,
-- gunzip, gzip,
-- bunzip2, bzip2,
-- formail, "formail, mpack"
-+ "gunzip", "gzip",
-+ "bunzip2", "bzip2",
-+ "formail", "formail, mpack"
- );
-
- &print_usage if ($#ARGV<0 || $ARGV[0] eq "-h");
-@@ -153,6 +155,7 @@
- if ($UNP_FILEstr =~ /CAB file/i) { set_command 'cabextract $UNP_FILE'; }
- if ($UNP_FILEstr =~ /cpio/i) { set_command('afio -Z -v -i $UNP_FILE','cpio -i -d --verbose $UNP_ARGS < $UNP_FILE'); }
- if ($UNP_FILEstr =~ /Zip.*archive/i) { set_command 'unzip $UNP_ARGS $UNP_FILE'; }
-+ if ($UNP_FILEstr =~ /7-zip.*archive/i) { set_command '7z x $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /Zoo.*archive/i) { set_command 'unzoo -x $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /shell.*archive/i) { set_command 'unshar $UNP_ARGS $UNP_FILE'; }
- if ($UNP_FILEstr =~ /Transport Neutral Encapsulation Format/i) { set_command 'tnef -v $UNP_ARGS $UNP_FILE'; }
-@@ -214,12 +217,12 @@
-
- # check also for _tar, because of broken filenames
- if ($UNP_FILE =~ /(\.|_)tar$/i) { set_command 'tar -xvf $UNP_FILE $UNP_ARGS'; }
-- if ($UNP_FILE =~ /(\.|_)rpm$/i) { set_command 'rpm2cpio < $UNP_FILE | cpio -i -d --verbose $UNP_ARGS';}
-- if ($UNP_FILE =~ /(\.|_)tar\.gz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /(\.|_)rpm$/i) { set_command 'rpm2cpio < $UNP_FILE | cpio -i -d --verbose $UNP_ARGS';}
-+ if ($UNP_FILE =~ /(\.|_)tar\.gz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
- if ($UNP_FILE =~ /(\.|_)tar\.bz2$/i) { set_command 'bunzip2 -c $UNP_FILE | tar -xvf - $UNP_ARGS'; }
--
-- if ($UNP_FILE =~ /\.tgz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-- if ($UNP_FILE =~ /\.(tzo|tar\.lzop)$/i) { set_command 'lzop -v -d $UNP_FILE | tar -xv $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /\.tgz$/i) { set_command 'tar -xvzf $UNP_FILE $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /\.(tzo|tar\.lzop)$/i) { set_command 'lzop -v -d $UNP_FILE | tar -xv $UNP_ARGS'; }
-+ if ($UNP_FILE =~ /(\.|_)tar\.lzma$/i) { set_command 'lzma -cd $UNP_FILE | tar -xvf - $UNP_ARGS'; }
- if ($UNP_FILE =~ /\.rar$/i) { set_command('rar x $UNP_ARGS $UNP_FILE || rar x -av- $UNP_ARGS $UNP_FILE','unrar x $UNP_ARGS $UNP_FILE || unrar x -av- $UNP_ARGS $UNP_FILE'); }
- if ($UNP_FILE =~ /\.(ar|deb)$/i) { set_command 'ar -x -v $UNP_FILE $UNP_ARGS'; }
- if ($UNP_FILE =~ /\.l(ha|zh)$/i) { set_command 'lha x $UNP_ARGS $UNP_FILE'; }
diff --git a/app-arch/unp/unp-1.0.15-r1.ebuild b/app-arch/unp/unp-1.0.15-r1.ebuild
deleted file mode 100644
index 5e81534d72c9..000000000000
--- a/app-arch/unp/unp-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/unp-1.0.15-r1.ebuild,v 1.4 2009/08/27 12:46:37 fauli Exp $
-
-inherit eutils
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="http://packages.qa.debian.org/u/unp.html"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-lzma-7z.patch
-}
-
-src_install() {
- dobin ucat unp || die "dobin failed"
- doman debian/unp.1 || die "doman failed"
-}
diff --git a/app-arch/unp/unp-1.0.15-r2.ebuild b/app-arch/unp/unp-1.0.15-r2.ebuild
deleted file mode 100644
index a8440d842b0b..000000000000
--- a/app-arch/unp/unp-1.0.15-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/unp-1.0.15-r2.ebuild,v 1.2 2010/01/01 19:44:42 fauli Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="http://packages.qa.debian.org/u/unp.html"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-7z-lzma-xz.diff
-}
-
-src_install() {
- dobin ucat unp || die "dobin failed"
- doman debian/unp.1 || die "doman failed"
-}
diff --git a/app-arch/unp/unp-2.0_pre5.ebuild b/app-arch/unp/unp-2.0_pre5.ebuild
deleted file mode 100644
index 4d6e2d71a63c..000000000000
--- a/app-arch/unp/unp-2.0_pre5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/unp-2.0_pre5.ebuild,v 1.1 2010/10/21 19:55:35 hanno Exp $
-
-EAPI=2
-
-inherit eutils bash-completion
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="http://packages.qa.debian.org/u/unp.html"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${PV/_/~}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/~}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
- dev-lang/perl"
-
-src_compile() {
- if use nls; then
- cd po
- emake
- fi
-}
-
-src_install() {
- dobin unp || die "dobin failed"
- dosym /usr/bin/unp /usr/bin/ucat
- doman debian/unp.1 || die "doman failed"
- dodoc debian/changelog debian/README.Debian
- dobashcompletion bash_completion.d/unp
-
- if use nls; then
- cd po
- emake DESTDIR="${D}" install
- fi
-}