p7zip bump

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-git6 i686

3 files changed, 99 insertions, 2 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 3f63fb96a6ca..37b4a749532f 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.95 2008/03/21 11:23:03 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.96 2008/07/20 22:50:15 hanno Exp $
+
+*p7zip-4.58 (20 Jul 2008)
+
+  20 Jul 2008; Hanno Boeck <hanno@gentoo.org> +p7zip-4.58.ebuild:
+  Version bump.
 
   21 Mar 2008; Radoslaw Stachowiak <radek@gentoo.org>
   -files/p7zip-4.55-open_lzma_alone.patch, -p7zip-4.55-r1.ebuild:
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index a20ebd0f06c7..05721e5a7f67 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
 DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540c50d29d SHA1 eda5de3d35567e2633373dbe60313527a6a4db27 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53
+DIST p7zip_4.58_src_all.tar.bz2 1948207 RMD160 2c31ab657275dc01d2d23c5de2327d5ee46f4e8a SHA1 7525bbb12ec94186e9e40d3614cdfd5f6f63cab6 SHA256 52391559b7782d2bad45b783579ea9825f28670ba6f234fd0d9248af3e82bedd
 EBUILD p7zip-4.57.ebuild 2524 RMD160 8559df68a75b045a97cf4de50a521f6797097483 SHA1 d18c522002c6240cd6db595fce9b2b6c8d1ca113 SHA256 9f83a19a9e06732263b4b7879be8f78f21b992382c234eac7f1bc2631cab23f7
-MISC ChangeLog 11995 RMD160 dcf73f347dd50edd9ddac7cbea01abdb5866d7ac SHA1 6dbd4926db104aee5bdb66f60dbead22e989259f SHA256 7ad18b207449131b2acb82b01af45518fcf12c27a858e9f393331c6ac1ce050e
+EBUILD p7zip-4.58.ebuild 2529 RMD160 5499c59e728f5b504679ca276b363f37a915a042 SHA1 604e70f5e51bf4a891c0d471fc715c296ce93f79 SHA256 108569f2f5871e6465228ad1ba1139b88d75ec5a3e428958815b558447a88a94
+MISC ChangeLog 12105 RMD160 82f1a78ac0e02fa1b9d86d917dd1713d85b01c67 SHA1 fbf3402810550b0f37d8fa4f51e504ea7a8e1962 SHA256 f8555569d01c9f352b72e5042a239bfef9d1f62a84b0ed7ba289207f4b728a94
 MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiDwS0ACgkQr2QksT29OyAsZACbBeSIBgO8gPcM5ngOyxvSFUUp
+khQAnA3cSOhvaKLiU22Q286HBEbJSGUQ
+=LgiM
+-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-4.58.ebuild b/app-arch/p7zip/p7zip-4.58.ebuild
new file mode 100644
index 000000000000..bd80162a1a3d
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.58.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.58.ebuild,v 1.1 2008/07/20 22:50:15 hanno 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 for rar support"
+}