Version bump and fix for 194354

Package-Manager: portage-2.1.4_rc11

4 files changed, 101 insertions, 5 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 5e04fb3948a9..686d9a84ab1e 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.84 2007/12/05 20:27:02 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.85 2007/12/25 22:32:07 radek Exp $
+
+*p7zip-4.57 (25 Dec 2007)
+
+  25 Dec 2007; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.57.ebuild:
+  Version bump and fix for 194354
 
   05 Dec 2007; Samuli Suominen <drac@gentoo.org> p7zip-4.55-r1.ebuild:
   amd64 stable as part of bug 198314, file-collision with lzma-utils.
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index a786468799f6..7e6846fd7db6 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -11,6 +11,7 @@ DIST p7zip_4.45_src_all.tar.bz2 1458299 RMD160 23677f41e1a2c1d8c254073bc17ea40ea
 DIST p7zip_4.48_src_all.tar.bz2 1487947 RMD160 2caae333dea746221cb074dc976444f9de5d5daf SHA1 d800f3e7abaffc62d91fd0320eb588a53dafd17c SHA256 33a4e52d9237c38b3d3f695573c2698f01b3e553ba506176cb98bd0a77d5d413
 DIST p7zip_4.51_src_all.tar.bz2 1483484 RMD160 af57615cc9d951516891a3f52b169f3d7c262650 SHA1 e3708dc69ec44dba554ab15d0cacbc226eae9420 SHA256 49926b91b5577a1ebe338edb38209eb537192966972f209e71526160e0e1f50b
 DIST p7zip_4.55_src_all.tar.bz2 1487801 RMD160 d224572461f04b53976e2e45a6d1c34aabda18d8 SHA1 7dd6f75c031f15f3d379af3e208e2e4d65f55bb7 SHA256 5604c21b4fec1b73e6bf8b69b0c3f97a3f269cdd975c3bdc5d961de7ed8a0835
+DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540c50d29d SHA1 eda5de3d35567e2633373dbe60313527a6a4db27 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53
 EBUILD p7zip-4.44.ebuild 2118 RMD160 687f123108a872f9c18dfe657862798741889267 SHA1 d117ce9b2e34497523b7774a4dc52b617626d42e SHA256 f8b83ca7953f492cbd794b8dbfd65f0362d5c91b694a66e397ad81687c720b16
 MD5 21fa539299cc142a9750e983e5ee46a4 p7zip-4.44.ebuild 2118
 RMD160 687f123108a872f9c18dfe657862798741889267 p7zip-4.44.ebuild 2118
@@ -35,10 +36,14 @@ EBUILD p7zip-4.55.ebuild 2540 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f SH
 MD5 01d2b015946fa56cb4c278b65f0d4da8 p7zip-4.55.ebuild 2540
 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f p7zip-4.55.ebuild 2540
 SHA256 f3ba929551f5f971a8d9f546438ec31cb898ff127dca0b8aac67d9b068bcdf32 p7zip-4.55.ebuild 2540
-MISC ChangeLog 10692 RMD160 e3b1e69ef36a651e9cd04429a8fc01c7a398710c SHA1 729c340e9b4d552aafc8e0201016974809f45c86 SHA256 fce2836feaef12f5c63c2a18724d8e11841a7fcb54343aa2aa001b8ada99e44f
-MD5 5fbaeece8894d9c6c52db45a0660c856 ChangeLog 10692
-RMD160 e3b1e69ef36a651e9cd04429a8fc01c7a398710c ChangeLog 10692
-SHA256 fce2836feaef12f5c63c2a18724d8e11841a7fcb54343aa2aa001b8ada99e44f ChangeLog 10692
+EBUILD p7zip-4.57.ebuild 2538 RMD160 4473a572038db707b2da2a81502bdd10b12d294b SHA1 d641c95f21a2fc2857cec34cee1c7896bbc83ebd SHA256 3f06c5c8b781df0fb6e423a8a325346a8102dd35da0a61e5b8592c105ae86e74
+MD5 fb93b9ca70eb33c9507da19624574809 p7zip-4.57.ebuild 2538
+RMD160 4473a572038db707b2da2a81502bdd10b12d294b p7zip-4.57.ebuild 2538
+SHA256 3f06c5c8b781df0fb6e423a8a325346a8102dd35da0a61e5b8592c105ae86e74 p7zip-4.57.ebuild 2538
+MISC ChangeLog 10829 RMD160 8d8ad557cca3b7a052dfd183b0670f8a3b75a3e5 SHA1 5e914d4d4cbd3e05b1db51b697ac65b9d122354e SHA256 7cdd55b0c74b3ab86119facf86a3878d0e61e9b7fa4169d3f3d19a92ac0ba21c
+MD5 9c82c71e212de70171cff1cd478ec41e ChangeLog 10829
+RMD160 8d8ad557cca3b7a052dfd183b0670f8a3b75a3e5 ChangeLog 10829
+SHA256 7cdd55b0c74b3ab86119facf86a3878d0e61e9b7fa4169d3f3d19a92ac0ba21c ChangeLog 10829
 MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
@@ -61,3 +66,6 @@ SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/di
 MD5 0b7a552c87ce54d2b24cda89c34cf3cb files/digest-p7zip-4.55-r1 262
 RMD160 5a5034316deccb119ba32a245b11b12c93920cd6 files/digest-p7zip-4.55-r1 262
 SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/digest-p7zip-4.55-r1 262
+MD5 b3fc26f415d6402afd13efe319f2bb65 files/digest-p7zip-4.57 262
+RMD160 3bfa3d84ec499c94bff8b28eb235517b6b7b4216 files/digest-p7zip-4.57 262
+SHA256 75af3669af847f56a977cae1a2a7b391bca23d278c1e08c7939ed57ea086560e files/digest-p7zip-4.57 262
diff --git a/app-arch/p7zip/files/digest-p7zip-4.57 b/app-arch/p7zip/files/digest-p7zip-4.57
new file mode 100644
index 000000000000..57102795975e
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.57
@@ -0,0 +1,3 @@
+MD5 773f78d8b297eb858626667d4dfa93c7 p7zip_4.57_src_all.tar.bz2 1473608
+RMD160 af40563b4ead84d138e9fff03a2677540c50d29d p7zip_4.57_src_all.tar.bz2 1473608
+SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53 p7zip_4.57_src_all.tar.bz2 1473608
diff --git a/app-arch/p7zip/p7zip-4.57.ebuild b/app-arch/p7zip/p7zip-4.57.ebuild
new file mode 100644
index 000000000000..4b1543520353
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.57.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.57.ebuild,v 1.1 2007/12/25 22:32:07 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_all.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static doc"
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
+		-e 's:-s ::' \
+		-e '/Rar/d' \
+		makefile* || die "changing makefiles"
+
+	if use amd64; then
+		ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722"
+		cp -f makefile.linux_amd64 makefile.machine
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		cp -f makefile.macosx makefile.machine
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+	use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
+
+	# patching to not included nonfree RAR decompression code is higher a sed call
+	# But we're removing nonfree code just in case sed wasnt enough
+	rm -rf CPP/7zip/Compress/Rar
+}
+
+src_compile() {
+	emake all3 || die "compilation error"
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/lib/${PN}/7zr"
+	make_wrapper 7za "/usr/lib/${PN}/7za"
+	make_wrapper 7z "/usr/lib/${PN}/7z"
+
+	dobin "${FILESDIR}/p7zip" || die
+
+	# gzip introduced in 4.42, so beware :)
+	# mv needed just as rename, because dobin installs using old name
+	mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg || die
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg || die
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/*.so || die "doexe *.so files"
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+	dodoc ChangeLog README TODO
+
+	if use doc ; then
+		dodoc DOCS/*.txt
+		dohtml -r DOCS/MANUAL/*
+	fi
+
+	einfo "Please be aware that rar support was removed (it's nonfree)"
+	einfo "You can use app-arch/rar-unpacker for rar support"
+}