Do not install /usr/bin/lzma as there are other/dedicated packages that install just the lzma compression utilities #198324.

Package-Manager: portage-2.1.4_rc4

4 files changed, 105 insertions, 5 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 9ce441a7b965..4ea41b7d6f26 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2007/12/01 17:06:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.83 2007/12/05 20:04:41 vapier Exp $
+
+*p7zip-4.55-r1 (05 Dec 2007)
+
+  05 Dec 2007; Mike Frysinger <vapier@gentoo.org> +p7zip-4.55-r1.ebuild:
+  Do not install /usr/bin/lzma as there are other/dedicated packages that
+  install just the lzma compression utilities #198324.
 
   01 Dec 2007; Markus Rothe <corsair@gentoo.org> p7zip-4.55.ebuild:
   Stable on ppc64
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index b3f1757ee207..68ba5416965f 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
 MD5 7bca8f207e6b570c09854ecb5e0860a6 files/p7zip 1210
 RMD160 0f331392eb77077ea6c100011326202661e9b6ab files/p7zip 1210
@@ -27,14 +30,18 @@ EBUILD p7zip-4.51.ebuild 2248 RMD160 240f7a42b40608678f2867f18b618a26df655b48 SH
 MD5 f5439da02124298a8eb47934e0aa5cd9 p7zip-4.51.ebuild 2248
 RMD160 240f7a42b40608678f2867f18b618a26df655b48 p7zip-4.51.ebuild 2248
 SHA256 55b34fabd3371d052b21dc530ad701b5a15b4699318c450229387364ba8b4b1c p7zip-4.51.ebuild 2248
+EBUILD p7zip-4.55-r1.ebuild 2304 RMD160 e346bc6eda52893ba5917be6cd7fbd1e819b8711 SHA1 88389399d0b09aaead23c3d901a7bdabb0138909 SHA256 92f35b0a1772cf137ba1328b9dd477de37149c4f2ec89aecec9bfb3ae3725835
+MD5 7f32d0d2c50851312b88fc4f11e5f9f3 p7zip-4.55-r1.ebuild 2304
+RMD160 e346bc6eda52893ba5917be6cd7fbd1e819b8711 p7zip-4.55-r1.ebuild 2304
+SHA256 92f35b0a1772cf137ba1328b9dd477de37149c4f2ec89aecec9bfb3ae3725835 p7zip-4.55-r1.ebuild 2304
 EBUILD p7zip-4.55.ebuild 2540 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f SHA1 fdd7396895ba8ca87f04a101a6b1826adbd31a14 SHA256 f3ba929551f5f971a8d9f546438ec31cb898ff127dca0b8aac67d9b068bcdf32
 MD5 01d2b015946fa56cb4c278b65f0d4da8 p7zip-4.55.ebuild 2540
 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f p7zip-4.55.ebuild 2540
 SHA256 f3ba929551f5f971a8d9f546438ec31cb898ff127dca0b8aac67d9b068bcdf32 p7zip-4.55.ebuild 2540
-MISC ChangeLog 10320 RMD160 9e870a76e1094e87c0018ef1f7bac9db224abc30 SHA1 1fd1472a8b81ec18df31b6c0d3dcb7a5f6f7a20b SHA256 5fff1d9d23062dfd0a40a6e858831bc3e9837f1e216d60fe121bffc3ddf280c4
-MD5 673414f6ab424964c83afdbaa9ee8158 ChangeLog 10320
-RMD160 9e870a76e1094e87c0018ef1f7bac9db224abc30 ChangeLog 10320
-SHA256 5fff1d9d23062dfd0a40a6e858831bc3e9837f1e216d60fe121bffc3ddf280c4 ChangeLog 10320
+MISC ChangeLog 10552 RMD160 524733d90a8d1e79cbe22e14d681c00d287776d0 SHA1 d9173833b7000cae92a45cc8abe636925935b4ef SHA256 bc1a98d4fd088e2ad11547b1c3f10e733f5b66484a37d8a044e4de9d43d8208f
+MD5 b4720c4bcc7a5d309ca0979b809e0359 ChangeLog 10552
+RMD160 524733d90a8d1e79cbe22e14d681c00d287776d0 ChangeLog 10552
+SHA256 bc1a98d4fd088e2ad11547b1c3f10e733f5b66484a37d8a044e4de9d43d8208f ChangeLog 10552
 MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
@@ -54,3 +61,13 @@ SHA256 2c2a369ed822a81392a2e1ec82933030adabf110ba12724cc157d14da81170fb files/di
 MD5 0b7a552c87ce54d2b24cda89c34cf3cb files/digest-p7zip-4.55 262
 RMD160 5a5034316deccb119ba32a245b11b12c93920cd6 files/digest-p7zip-4.55 262
 SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/digest-p7zip-4.55 262
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHVwRfp/wUKkr7RBoRAgdmAJ9EiQLcvACSWNNVndY+SD3FugRhKQCfQtw9
+CV6A5o2z9DeR2p9s1DdYYLM=
+=j2FE
+-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/digest-p7zip-4.55-r1 b/app-arch/p7zip/files/digest-p7zip-4.55-r1
new file mode 100644
index 000000000000..f6a2ea937c2b
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.55-r1
@@ -0,0 +1,3 @@
+MD5 bb141529cf2374a2e15735f155273172 p7zip_4.55_src_all.tar.bz2 1487801
+RMD160 d224572461f04b53976e2e45a6d1c34aabda18d8 p7zip_4.55_src_all.tar.bz2 1487801
+SHA256 5604c21b4fec1b73e6bf8b69b0c3f97a3f269cdd975c3bdc5d961de7ed8a0835 p7zip_4.55_src_all.tar.bz2 1487801
diff --git a/app-arch/p7zip/p7zip-4.55-r1.ebuild b/app-arch/p7zip/p7zip-4.55-r1.ebuild
new file mode 100644
index 000000000000..11495ae0a8c7
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.55-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.55-r1.ebuild,v 1.1 2007/12/05 20:04:41 vapier 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 ::' \
+		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
+}
+
+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}/Codecs
+	doexe bin/Codecs/* || die "doexe Codecs"
+	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
+}