version bump

(Portage version: 2.1_pre6-r3)

8 files changed, 100 insertions, 73 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 528ddff2ca6d..f89a72162d7c 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.32 2006/01/31 21:26:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.33 2006/03/18 15:44:53 radek Exp $
+
+*p7zip-4.33 (18 Mar 2006)
+
+  18 Mar 2006; Radoslaw Stachowiak <radek@gentoo.org> +files/p7zip,
+  -p7zip-4.20-r1.ebuild, -p7zip-4.27.ebuild, +p7zip-4.33.ebuild:
+  version bump to 4.33, not using gcc-4.1 patch anymore
+  removed obsolete versions (4.2*)
 
   31 Jan 2006; Hanno Boeck <hanno@gentoo.org> +files/p7zip-4.30-gcc41.diff,
   p7zip-4.30.ebuild:
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index b0a490ce2ac5..1718f01b9ecc 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e09d02cbb10f0e9d3209bcc17f3f2336 ChangeLog 4561
 RMD160 7e1610f73692f9cdb8c2ebe5a1b612efa3ad5414 ChangeLog 4561
 SHA256 fcbe9502ad6b9e2bbb54151dd0637dd74acde96ca744fed9ea3177b8d31e7722 ChangeLog 4561
@@ -13,15 +10,15 @@ SHA256 15a7f37e025d1188ee52a262027a268cdfcbd1347171da9aa560a3a1a824366b files/7z
 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20 67
 RMD160 9571fbff8cf2b7f8113dbf91efecfc93525229f2 files/digest-p7zip-4.20 67
 SHA256 b1cd24be70273834a2992b1ea9a59d0a7f012e7dba74b67d2bd88423c0fa1915 files/digest-p7zip-4.20 67
-MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67
-RMD160 9571fbff8cf2b7f8113dbf91efecfc93525229f2 files/digest-p7zip-4.20-r1 67
-SHA256 b1cd24be70273834a2992b1ea9a59d0a7f012e7dba74b67d2bd88423c0fa1915 files/digest-p7zip-4.20-r1 67
-MD5 4ed52dc9ef4b9514b9a07b51b450257a files/digest-p7zip-4.27 67
-RMD160 61e80dbcca91d6acbe7e154b0ec629c7e45eb2dc files/digest-p7zip-4.27 67
-SHA256 fd0dd434fff643408f11df182927ba5651c42c91d096a028bf10c829dd7004d7 files/digest-p7zip-4.27 67
 MD5 808322fe91496fb53dc5e11254d9c476 files/digest-p7zip-4.30 71
 RMD160 06eafdfb6dd3ebbbb17e7d87223bcf6566ac5645 files/digest-p7zip-4.30 71
 SHA256 4cdaa53eba46f274cde899cc7b22de6af70102e21181ea18b3e5e373675cc427 files/digest-p7zip-4.30 71
+MD5 9585aac183476ae0d88d2fe920cdfe26 files/digest-p7zip-4.33 262
+RMD160 9d9e9027ba3c3ee3b6a6c2371fe69870627df35d files/digest-p7zip-4.33 262
+SHA256 148e8076a035b15cbb36ad217184577855667b7c40c5c1ef0c2da74c403b30c5 files/digest-p7zip-4.33 262
+MD5 7bca8f207e6b570c09854ecb5e0860a6 files/p7zip 1210
+RMD160 0f331392eb77077ea6c100011326202661e9b6ab files/p7zip 1210
+SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 files/p7zip 1210
 MD5 5cd8b1eac59c69d93fd0380607d295fc files/p7zip-4.16_x86_static.patch 276
 RMD160 4065b0a5142e9e4d7845403b2e008cdee86a9570 files/p7zip-4.16_x86_static.patch 276
 SHA256 09fa439da270e1f96d580425a4addaeb4684b3f727d01d08e9b293124646797d files/p7zip-4.16_x86_static.patch 276
@@ -31,22 +28,12 @@ SHA256 c2747d78b920a9312312dfea679ddbd84527e98171e5b694e3031b0c46f3a681 files/p7
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a metadata.xml 221
-MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024
-RMD160 0f14a0a72b4503263f7df51582e9baaea0629653 p7zip-4.20-r1.ebuild 1024
-SHA256 894810f55e47aa3afbd981cd2b3bbabeb11f94719872592de2788f6d9da575bb p7zip-4.20-r1.ebuild 1024
 MD5 9366cbb83b1cef1ad42a9a45cd46c029 p7zip-4.20.ebuild 942
 RMD160 7c76a4aeff52a2665fa29be964d316ee310c6354 p7zip-4.20.ebuild 942
 SHA256 afa2d20a1bec4c025a0774e55d011309ed260cda141e65008b039fbb084b5dfc p7zip-4.20.ebuild 942
-MD5 f07d6aa7e772761dc637dcc822912835 p7zip-4.27.ebuild 1387
-RMD160 c655fdb7ac5013fd5a1ecb12b259d6ddb1d98e05 p7zip-4.27.ebuild 1387
-SHA256 60e4f47f445b44c2a292b69ff3a1db2a138df383d060338334c08f7654320b0c p7zip-4.27.ebuild 1387
 MD5 27704899bd476506c7a9f802bfd52251 p7zip-4.30.ebuild 1426
 RMD160 9a11a7a87ebebe96e6ba2006ae9f96f788d47007 p7zip-4.30.ebuild 1426
 SHA256 e13fb062eac840026c163c950581bb0b1e24cb24152623f8733370fd4e17983b p7zip-4.30.ebuild 1426
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD39o7r2QksT29OyARAiPbAJwOBFJIoNuUp7EqhddMHdIf+jcScQCcDit3
-Ec3FJrvxh0h3Qe0zFUS3Xqs=
-=1A5U
------END PGP SIGNATURE-----
+MD5 391ba74c43d7c70aa00ccb2dc8cc0f96 p7zip-4.33.ebuild 1493
+RMD160 d5afdf6e61014b1704898eccf1509b0f020bb28d p7zip-4.33.ebuild 1493
+SHA256 1fa5ef007b3c0d630916f807d9d836b600fcce78da45094a7303a41ed3756dfd p7zip-4.33.ebuild 1493
diff --git a/app-arch/p7zip/files/digest-p7zip-4.20-r1 b/app-arch/p7zip/files/digest-p7zip-4.20-r1
deleted file mode 100644
index 6c066396c0ed..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.20-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 328976
diff --git a/app-arch/p7zip/files/digest-p7zip-4.27 b/app-arch/p7zip/files/digest-p7zip-4.27
deleted file mode 100644
index 948f659df8fc..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ba68ada07e41e1b472a7dc18cb191b2 p7zip_4.27_src.tar.bz2 416045
diff --git a/app-arch/p7zip/files/digest-p7zip-4.33 b/app-arch/p7zip/files/digest-p7zip-4.33
new file mode 100644
index 000000000000..f1d31ee117dd
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.33
@@ -0,0 +1,3 @@
+MD5 6333633173f6bcd851ed087402af60d2 p7zip_4.33_src_all.tar.bz2 1443942
+RMD160 c0647421c4b18e8cdd99d03f8346d1cfe8f188fe p7zip_4.33_src_all.tar.bz2 1443942
+SHA256 dfd3e18cc74445604f032cd8d1b29d907beeadbc845780dcf1f23b206df2889a p7zip_4.33_src_all.tar.bz2 1443942
diff --git a/app-arch/p7zip/files/p7zip b/app-arch/p7zip/files/p7zip
new file mode 100644
index 000000000000..9aaf078cbe00
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip
@@ -0,0 +1,73 @@
+#!/bin/bash
+# gzip-like CLI wrapper for p7zip
+set -e
+
+compress=true
+file=
+
+usage ()
+  {
+    echo "Usage: $0 [-d] [-h|--help] [file]"
+    exit 1
+  }
+
+while [ "$#" != "0" ] ; do
+  case "$1" in
+    -d) compress=false ;;
+    -c) echo "$0: ignoring $1 option (not yet implemented)" ;;
+    -h|--help) usage ;;
+    *)
+      if [ "${file}" = "" ] ; then
+        file="$1"
+      else
+        usage
+      fi
+    ;;
+  esac
+  shift
+done
+
+# make sure they're present, before we screw up
+for i in mktemp 7z rm cat tty ; do
+  if ! which $i > /dev/null ; then
+    echo "$0: $i: command not found"
+    exit 1
+  fi
+done
+
+if [ "${file}" != "" ] ; then
+  if ${compress} ; then
+    7z a ${file}.7z ${file}
+    rm ${file}
+  else
+    case ${file} in
+      *.7z)
+        7z x ${file}
+        rm ${file}
+      ;;
+      *)
+        echo "$0: ${file}: unknown suffix -- ignored"
+      ;;
+    esac
+  fi
+  exit 0
+fi
+
+tmp=`mktemp`
+trap "rm -f ${tmp}" 0
+
+if ${compress} ; then
+  if tty > /dev/null ; then
+    echo "$0: compressed data not written to a terminal."
+    echo "For help, type: $0 -h"
+    exit 1
+  fi
+  rm -f ${tmp}
+  7z a ${tmp} -si >/dev/null
+  cat ${tmp}
+else
+  cat > ${tmp}
+  7z x ${tmp} -so 2>/dev/null | cat
+fi
+
+rm -f ${tmp}
diff --git a/app-arch/p7zip/p7zip-4.20-r1.ebuild b/app-arch/p7zip/p7zip-4.20-r1.ebuild
deleted file mode 100644
index 3a903a36b805..000000000000
--- a/app-arch/p7zip/p7zip-4.20-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.20-r1.ebuild,v 1.2 2005/09/14 17:28:41 grobian Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-IUSE="static doc"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use static && epatch ${FILESDIR}/p7zip-4.16_x86_static.patch
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:-O2 -s -fPIC:${CXXFLAGS}:" \
-		makefile* || die "cleaning up makefiles"
-}
-
-src_compile() {
-	emake || die "compilation error"
-}
-
-src_install() {
-	dobin bin/7za || die "dobin"
-	dosym 7za /usr/bin/7z
-
-	doman man1/7z.1
-	doman man1/7za.1
-
-	if use doc; then
-		dodoc ChangeLog README TODO DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-4.27.ebuild b/app-arch/p7zip/p7zip-4.33.ebuild
index c04f7d8ec1c7..6b6381675af2 100644
--- a/app-arch/p7zip/p7zip-4.27.ebuild
+++ b/app-arch/p7zip/p7zip-4.33.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.27.ebuild,v 1.6 2005/11/29 02:59:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.33.ebuild,v 1.1 2006/03/18 15:44:53 radek Exp $
 
 inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -19,8 +19,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
+	# be aware that CXX is now gcc in pattern due to upstream  (radek@20060318)
 	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CXX=/s:gcc:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
 		-e "s:-O1 -s:${CXXFLAGS}:" \
 		makefile* || die "cleaning up makefiles"
@@ -35,6 +36,8 @@ src_install() {
 	make_wrapper 7za "/usr/lib/${PN}/7za"
 	make_wrapper 7z "/usr/lib/${PN}/7z"
 
+	dobin ${FILESDIR}/p7zip
+
 	exeinto /usr/$(get_libdir)/${PN}
 	doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins"
 	exeinto /usr/$(get_libdir)/${PN}/Codecs