app-arch/p7zip: Give desktop files better names, #418179; drop in no execstack pacth from fedora

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 197 insertions, 8 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index c0a584815f4b..5a2109dad1a7 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.144 2012/04/23 10:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.145 2012/05/30 19:46:18 jlec Exp $
+
+*p7zip-9.20.1-r2 (30 May 2012)
+
+  30 May 2012; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r1.ebuild,
+  +p7zip-9.20.1-r2.ebuild, +files/p7zip-9.20.1-execstack.patch:
+  Give desktop files better names, #418179; drop in no execstack pacth from
+  fedora
 
 *p7zip-9.20.1-r1 (23 Apr 2012)
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 459c09232bc1..f42ee57af347 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -4,18 +4,21 @@ Hash: SHA512
 AUX 9.04-kde4.patch 5185 RMD160 57433a9b1dbfb44b7d8b362e1cee5a5a9b5e641c SHA1 e2bbbc7ac6563ac5f097e66263b5801ecdebbc80 SHA256 facc613f8c684ca2c0baff4c89e99f0abe29b12b96ef2281e17a0041e07631c3
 AUX 9.04-makefile.patch 470 RMD160 3b114968d83174ef78acc0e9fce81fcfc7fe862e SHA1 3a3333d4703955664fdd4023c624ab4828af0ab1 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
+AUX p7zip-9.20.1-execstack.patch 785 RMD160 f038096e23cbef43c77456d20ed6407bc9969b3a SHA1 7501cd3570fec18c2aef45d76fc9faac1595ad53 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1
 DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c76b7ab19 SHA1 81da0729561ce123c0a82656ec96a04ad5bfa522 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 RMD160 c3ff2dd12459282b46d9a68ab4af7800ff46039f SHA1 1cd567e043ee054bf08244ce15f32cb3258306b7 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
 EBUILD p7zip-9.13-r3.ebuild 4286 RMD160 5b83e47910ac32954aeacf0ef7ae59334df9d29f SHA1 8dbbe22a74eaeb60e01a85bb9cc97bbf8ae7b817 SHA256 febdc3f7e02e6baa97309ba5dd7b81b18ae3f4a5db1fd79400af1af3d47cd9dd
 EBUILD p7zip-9.13.ebuild 3848 RMD160 753ffbc07e3eccc8db7d31d7d06ad92d23c4fd9d SHA1 1420dfa76ba1226a17c204d7230450907e15ff3e SHA256 cec2dc8b759c6f952c7d57b346711df1bf84697df477a7525b8ecd5ee8d67a76
-EBUILD p7zip-9.20.1-r1.ebuild 4231 RMD160 10870285fb05fccf480309b0716b9504f09d9e01 SHA1 35489c51f422cebfda43eda3775b8b2fb3af78e1 SHA256 55d2e7e6e8bd17503bcf0c93348a6c2dc97151a855d8d8c4136cc4e6741a104d
+EBUILD p7zip-9.20.1-r1.ebuild 4231 RMD160 cc6be0fe30acddff3dc7debf2947073abb55f5da SHA1 31684f177cb936348b72295d1a3adc040348e1d1 SHA256 e928b9734d787fb83aaefdb1fb47780f0f15da8e9cfbcd4ca0ec23a208f315e9
+EBUILD p7zip-9.20.1-r2.ebuild 4290 RMD160 4b29c24053d60dff21149cb3a65b9414b72079a3 SHA1 4ec746cfb5b905e38b738f195d9b4d3977579046 SHA256 2196d9898178fa1571993bcd281acccfb2c03076556fed835946d80daf5139d7
 EBUILD p7zip-9.20.1.ebuild 4303 RMD160 1597ea7f6b8e8c013fe56e19e8df8cabbe908c0a SHA1 2808ca790f02d69236fcea50b1d7ecf2265f4bf9 SHA256 cc85ab8d55e5de0d59a3441ee05106fbcab44677e7ad84b676146dc09e05f9a9
-MISC ChangeLog 18687 RMD160 06ce7779b8fb10b88082f43067489b45ce6b4dbe SHA1 fcd8f1630dc1560723244ba2f9442b4c3e07ac07 SHA256 219156f83f2d9c6456c322df2218b9765cf141727989a9470a10e08701f3e307
+MISC ChangeLog 18940 RMD160 c22b9b3db11926047f9152ac9bbc9890be4cadad SHA1 fe04eb64a16ffcf706eb8474d102674d6006b7fa SHA256 6bbb7c98f68719714f2e6742f11f5cfa7ffb70550bf8f08761a42825912c3e6b
 MISC metadata.xml 322 RMD160 787cc0c7ce3c7080a3b847c4a02435522f831981 SHA1 84bd3fdb3f094c1c74f0d5abb1f8a446aeb284ed SHA256 4850c2010e5785e0498e0fb0a73101f2b934c71ae6daf06782938b821a0f9142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+VM/UACgkQgAnW8HDreRalBACfTmkdn5R+glxqPxiH8l1Asl/R
-X/kAoMwaPH/giDQ5SCIB6lWw6y+bFPzZ
-=pqEx
+iEYEAREKAAYFAk/GeRAACgkQgAnW8HDreRYFJQCgxQeMie7v1kWubMTSN2M6NtC2
+CkwAn0SV243d2q3DSTm8XJW6skuPN6rj
+=1o+q
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch b/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch
new file mode 100644
index 000000000000..1fdff481cf36
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-9.20.1-execstack.patch
@@ -0,0 +1,24 @@
+diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm
+--- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm	2008-08-14 11:18:07.000000000 +0200
++++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm	2011-07-26 17:43:57.727910278 +0200
+@@ -101,3 +101,8 @@ _CrcUpdateT8:

+     ret

+ 

+ end

++

++%ifidn __OUTPUT_FORMAT__,elf

++section .note.GNU-stack noalloc noexec nowrite progbits

++%endif

++

+diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm
+--- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm	2009-07-14 12:44:15.000000000 +0200
++++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm	2011-07-26 17:44:23.938864508 +0200
+@@ -99,3 +99,8 @@ _CrcUpdateT8:

+ 

+ 

+ ; end

++

++%ifidn __OUTPUT_FORMAT__,elf

++section .note.GNU-stack noalloc noexec nowrite progbits

++%endif

++

diff --git a/app-arch/p7zip/p7zip-9.20.1-r1.ebuild b/app-arch/p7zip/p7zip-9.20.1-r1.ebuild
index ecf86c89aaee..a5425a860505 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r1.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r1.ebuild,v 1.1 2012/04/23 10:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r1.ebuild,v 1.2 2012/05/30 19:46:18 jlec Exp $
 
 EAPI=4
 
 WX_GTK_VER="2.8"
 
-inherit eutils toolchain-funcs multilib wxwidgets
+inherit eutils multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/"
diff --git a/app-arch/p7zip/p7zip-9.20.1-r2.ebuild b/app-arch/p7zip/p7zip-9.20.1-r2.ebuild
new file mode 100644
index 000000000000..93d6dff8d6e7
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.20.1-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r2.ebuild,v 1.1 2012/05/30 19:46:18 jlec Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+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 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-execstack.patch
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
+		-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed -e '/Rar/d' -i makefile* || die
+		rm -rf CPP/7zip/Compress/Rar || die
+		epatch "${FILESDIR}"/9.04-makefile.patch
+	fi
+
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e '/ALLFLAGS/s:-s ::' \
+		makefile* || die "changing makefiles"
+
+	if use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
+	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
+
+	if use kde || use wxwidgets; then
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake all3
+	if use kde || use wxwidgets; then
+		emake 7zG
+		emake 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+		make_desktop_entry 7zFM "${PN} FM" "GTK;Utility;Archiving;Compression"
+		make_desktop_entry 7zG "${PN} GUI" "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+		doexe bin/7z{G,FM}
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/{Lang,help}
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+
+			rm GUI/kde4/p7zip_compress.desktop
+			insinto  /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde4/*.desktop
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	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
+}