Version BUmp, bug #545202

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 186 insertions, 3 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 45a8df05b12a..584faee1a23b 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/p7zip
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.162 2014/05/10 17:09:55 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.163 2015/04/07 08:44:03 jlec Exp $
+
+*p7zip-9.38.1 (07 Apr 2015)
+
+  07 Apr 2015; Justin Lecher <jlec@gentoo.org> +p7zip-9.38.1.ebuild:
+  Version BUmp, bug #545202
 
   10 May 2014; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r5.ebuild:
   Add support for x32, #506602, patch by Luke-Jr
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index b33da9a98c7c..04ea78634449 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,10 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 9.04-makefile.patch 470 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6 SHA512 2c131e0b42ae6c8cd236125be313ea032b47edf858d1248a8648fd0e794ca4094016a3bb06e15fe65582626dd9d611a08a87ad5789695fff0a2244bb7f3cec3d WHIRLPOOL b2a66b46651a8036808985524b2c6311fa0d7dbceba453f1ac4bb1cc0fef9fbe060b1d4c04e20353c4232915f340cf3bd65d0f7e0ccc3eac8651d3ac15d389db
 AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 SHA512 e3f1497cc00669430de336aac1d45a0313831b7f5dc88b9b2ca49e743d8e9e7c73b403d94b4fd9de6cd59875fef47756f9dab9ddf12442ee3fff71e413715553 WHIRLPOOL e14aef0141b8260a5206bd94d22560c927a3ce0e643433ee68d8ade0601655b8a6b7c8ad78f81a0fb97323c7c37eb3fc5483d9e49c2ac259d146b60e678cc973
 AUX p7zip-9.20.1-QA.patch 650 SHA256 695b6836b13699e3db3e019dbd54275e48a01b59210fd353a2d9e46224c60785 SHA512 b07f8608b973be7c547b226bc23dd064d6cc18f6b1ea70ce72aff72fa098852914eb8d331fe7230b7fdfbb1f0fce59eb3404fd3a5b44d151ea847e87fd2d8f39 WHIRLPOOL 077a4bdf44dcbd66a525e795e082aef41321dc7770415a1cd78716d78aa5b5b2e780afcb4194ea7c2ae2947a596292be18ab8dd3f9bce302e47f8d9cdcc6a046
 AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1 SHA512 2b3404554295596dd1113700f72f7149baded7b381e70edea78a2cf66ad69ac6fb03653c490843ecab13e348638a0efaaeb3f5e71a0670255d09a91c70c7977f WHIRLPOOL 4aa1a9632d706c4f9f8b906a9a84929605a56e92c4289a296b767d107e11f85848d40bd58ad4df21c2d87f385318b8e740b71bc7c0467ea3af2bd6c58502d25a
 AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b1056420537f14a1e3fc7715b75dac698704ebf8 SHA512 0895fec9ec2a0eae960e44f181d2dcac618916d4bf7a5576e234ad7d2fc9417da4eb589c115b0b4040f7c9142cd43637355d8d62e8f43201117c0ee2a6da02cb WHIRLPOOL bd2d339a7356f1b3201005fe6f05ad881b2292e5fadf46a32a28c1667d32fe8b5b555105975e7c69dfa90cc157b415b86a4e153e13dfe0b8bfc4ef095c24fb57
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
+DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
 EBUILD p7zip-9.20.1-r4.ebuild 4325 SHA256 d07ded21136afea4e04a6e8b095c25a45690a3720dbbac982d4bd95b1bdd97c5 SHA512 6e3244629d4f92acf669125002f11169efe3bf2dd5377ebfc91856d93c1fe1cd1d33eb99d53d0a4ad08d36313d68feb751cfc0fa9c2bf34b1b1c89a3ad3856b6 WHIRLPOOL a18c74d14d85621453b4dfe59588fd16e176d6a5c2c1161bb7dc4c753f5499de3c22d4df8ebcad450a38e0de5ab61416c7932188f74ebc77b747982bb8799464
 EBUILD p7zip-9.20.1-r5.ebuild 4554 SHA256 6ddaef8ed0e419dc1879fdb540ecbc4484664ecc6a493c594d8bdd8f2cf1720d SHA512 579ceedb14296409dd6bade64ca937e0ff280b69f9c060332d7877fa302606c858b29d717fa14320c67852ddc1d2d1b116e0a7abf0aa6d96a96f85f0965477b8 WHIRLPOOL 3b09742f6ef90c3bfa30426d8085a97956dfbfc422d3d2389e269bbf543ab2d98f6d19bd3174e3a4dbce6cf11177f31650fa983e9ed721a684ad527766f1afbf
-MISC ChangeLog 21403 SHA256 b5def198248f1d7bf32f74be55e619903a5d3923288de960486ede44b742b99c SHA512 ffff3edbecc1cce7b0364c37c67eb379cb718b39d58e768b6b1bd5f296dc3a9a86947b7307289c03ffebc5d504431fedfbcf399de528abb21cd82561ea6e4388 WHIRLPOOL 6b5b4add5765fdc4d7344895d7b482ad8d8366f3aeb7a85e339ff49ee014a1010106596736ed4e76361a1236993962ca45de6b0454bae63119653a0b2fd0acaf
+EBUILD p7zip-9.38.1.ebuild 4345 SHA256 df31210b1fc18b1351370c04fa369ce15c0ab404bcbefbf3d511462a52d8108e SHA512 5423c20207146af58a44b4c5e5672556717547c2f49dec64cda0340fbb639db869f59ad319a03287cb0e6a80a17d2f20d2b860aa6cb7d583bf31aa6c4628b8d8 WHIRLPOOL 95eadea940d262f6c3929c96dfade83aabb037627524b4de40af18ced496cdebf6d073013b2436c93eec2973664b5b2b02097b03bd1caa99f8bbc25d41383bb4
+MISC ChangeLog 21530 SHA256 22f0e460dd2f9513ed60302afb811bc2c788d2174c03a2c8d6932f2d72527d76 SHA512 dee3b10d8bf2c9afd9dfa1e3ffe24a86226229c11ecfe57fdf50e3af64a213be3fa6771dd45eadc2bf6ec8baa0364c31cad10dadec50a06f2ea7ccdec1eb90de WHIRLPOOL 6197b1c928d1b78bf19a562e7324b77e1eb88fe24d71644e24242ff4b67abbdf261e214b022357d14807189e64f4afd5560b18562e3dfd0bdc9087991d139e15
 MISC metadata.xml 332 SHA256 4f1520cfbd8b72e61635d58783a77d08189616c031d0288eb6c47ae20b182353 SHA512 9aee4332f10ec1b28c6f40c580adfb5d7d6220f00ed3cea73c11a5063ca3ca737761b206c1b6f926b9e2418f5db0439df108d9a99747eff1277190f0f6258d86 WHIRLPOOL 1610d8c1a4038ffe903cc16e153745ca611732813a1a0c03601aabff96d42106994a84962dda28783ea8943e3c8c8b11d45b25cd96ebe0926194df96e0e25a99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVI5jTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVireK8P/32nTqeplO806GbsCcmF4cCN
+j/EReralOCNykCueNixPoWQnLDYvMKswPZ9sscPAb4vZD8WSRfQ70GGO1vSh9x6h
+ppmp0oQxKf1U6Qnghi/0eLzUm+VxV8dF+36a4nwwC6yYoA/CFfY5x81amaLYzzt3
+h22IB0Sy4w8rui2zhbxaf2RWL014Uw1hZKm28e/WluymEbGhfm99eazYngFXoiMX
+ddJOFoZ+3hfu+eBmkXu0myStY8Bnzo87KqwHSMAnr/9waHjfTVxmCBmgUvNUmiQk
+OZaIbWR0FHasIRctXVYAvYUn8cBmJdz8SAKpggswIhVuyxbrzd7wsdNbS8AWRMuV
+Xj0wJC2NIZnSm96kXmXO+0KUBNcVMxKitdiWfyICec97bEp5BQmiozuTFM74Y5lg
+QToFarfDvxn+t0CDVSfPMzs94SYzZJk94jHCf7SCZpqpp0ahGevYxmZGzcOPSjpH
+e5tCde3y/xJHfaYWE+Y+svFaND0XL63wAKT7zy8tHZ45JOE6rx6V59GbHgU4tJDA
+aNZDFeii7lyXq7o6eqvgf/CXFg3KRddnytpazoY0Xd6Vqar+bjPSUH7XXUVmrT2r
+QZLVv1pIVuLYypplQS04Z4JhJYDfnM9a82zMvvg/IXxzot/r4E69GuH/bwy0VAHZ
+Wg89FThUyF7CRRor+I+i
+=G0+f
+-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-9.38.1.ebuild b/app-arch/p7zip/p7zip-9.38.1.ebuild
new file mode 100644
index 000000000000..66df95434385
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.38.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.1 2015/04/07 08:44:03 jlec Exp $
+
+EAPI=5
+
+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 ~s390 ~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 abi_x86_x32"
+
+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 )
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	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 's:-O::g' \
+		-e 's:-pipe::g' \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile*
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif 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
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	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" ${PN} "GTK;Utility;Archiving;Compression"
+		make_desktop_entry 7zG "${PN} GUI" ${PN} "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 DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}