From: Justin Lecher Date: Mon, 4 May 2015 12:23:36 +0000 (+0000) Subject: Correctly fix bug #465296, thanks Wadlax figuring this out X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cacb826a4d6bf535a1886fc78bb1d888782d81ef;p=gentoo.git Correctly fix bug #465296, thanks Wadlax figuring this out Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index 4454321e7995..1a0380ab9282 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.166 2015/04/08 12:31:38 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.167 2015/05/04 12:23:31 jlec Exp $ + +*p7zip-9.38.1-r1 (04 May 2015) + + 04 May 2015; Justin Lecher +p7zip-9.38.1-r1.ebuild, + -p7zip-9.20.1-r5.ebuild, -p7zip-9.38.1.ebuild, p7zip-9.20.1-r4.ebuild: + Correctly fix bug #465296, thanks Wadlax figuring this out 08 Apr 2015; Justin Lecher +files/p7zip-9.38.1-osversion.patch, p7zip-9.38.1.ebuild: diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 8b379bbbef5b..b88c134a22cb 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -9,27 +9,26 @@ AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b10564205 AUX p7zip-9.38.1-osversion.patch 838 SHA256 135de03123263910ed99d1afa07ee4a39e471fc257e9dcbe7a8ce0477634cc54 SHA512 28a798a2930552ee940f4f400e66e11cf7ee113c3c0fcf782404c45b95b5774c52b0518520a5f38cc9d7abe795756fce14a0c0e143c31f8da50253bcda423909 WHIRLPOOL 6c6f0e024ba590139fbb6f61ae8f3699e841ac8b00d530e6f7418ccc182aca2f5ffa81925b2bc2b1520cfbd617f0bf8f3c3f95b74222a5300b0f89b10ec19604 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 4237 SHA256 847ac11b93c4d17cf14a43baff094044a46cfd4b48ee0d76c11966b0c42cc57c SHA512 138c20e3ebd2ae0c9b2eeec74dd58815f1f74881514eb6bb792546c499b7eaa78a2af07ca9e2c18df48ec9f005abbf8f4075aed067591ee7ab849e9580547a71 WHIRLPOOL 29bceb1b07206805e721949877ba24a37a12f98fac93af79c07830b31f4c342d237b72ab37c4de0a66cc051afa93ed8e2e75e79cfdad545789a9dc5fac7d968b -EBUILD p7zip-9.20.1-r5.ebuild 4471 SHA256 60d3321b38d933f78e473ced4e9a8a915fb2ea903144e3eb9a606dc9a5e358e4 SHA512 092f71fa786ff9ade07b6a35696682c1944952233e58583fc1d895b78f4e7f18355afd7d7759e601c241cfd8aae4f829e72bea1b355cdac8600a7b89127b999d WHIRLPOOL 440beccba8d4f16f6c6dd64e89e4709604cc46e14c4a64f7272702d433191b4d08824993b7df8d9149700b85136edb8c448739cf2a02f771510b061839810f9e -EBUILD p7zip-9.38.1.ebuild 4313 SHA256 87f21e8e36cf6d88d26a5a7913d776304df4a47e0858db0ceb8f8ddcc6a9643a SHA512 5d8ef712e79d4a5166a3484a3596bedd6aecc0b6ef5dfd1566ca08c7b5d683ecaca20579acf0870be3dbf7aed49ab4e5f455eb8ac660a94d23c1a3377244dfbd WHIRLPOOL cfc0862dcb4283899fb4479e9bf40d4c0865802b2bbbcd8545410b2172ae5238063881ae1180b3b98e24b0425846d8e7640c01d231fa445fa69eb56deec05d1e -MISC ChangeLog 21846 SHA256 5d9f027ddad07f6963a840a407a73f80c0ad7f7c0a4ca6846c9a1c3b2f9e7012 SHA512 0c1b4b9a39123781df8e8887bd61145ddb57c8dc7d56bbd5ffe893070146af2008809036d3ee1d0aa92c1ed708be7d18d6b54325a8a5d36a249cdaf78eb085bd WHIRLPOOL 400a94f11d1f02ccec8c464ab54da949fc497b7be1314ae2f4c94f2b0a32dc83d958ecb33ccca8309251b9d4719419a2de17637bff31de12c8ee332106a40887 +EBUILD p7zip-9.20.1-r4.ebuild 4260 SHA256 8de34f46051d81c9b92f6479c3e77e1f366af48eec839908056c837bb11d569d SHA512 c19950e5a629d3f3f0b9083a00330ee93ef40e7dd2e69602c544938e96eaa0242df4f02813c5ca0b0ca8d1b69d2fed308150a79a1b8bc55b4f35c2933e77310a WHIRLPOOL 184124262c40eea989041d0076ba814f87f457b8407c1294c3596b983b33b2c91d29e0adbf3af5df42ee73f94aa4a9c491ed88f0ac3b95f3e8034c9097c7faf9 +EBUILD p7zip-9.38.1-r1.ebuild 4320 SHA256 e434505eec4776080c5a1a6fef1876750158e6c2763dae767cc0f1bdefd3f049 SHA512 0e3c12a59c08df1de264abadf281592c1fb3617391f31ae6a9154fe90dbc5723bb1a7bec89a8873a3044a7688edcb2917299fdc44e87c752018c066d009c1d81 WHIRLPOOL 43056a742c6dfa93988223334ff8b4462e9c82a809a2675230d010bc35225e55c1e41a6b240ac500bfc07b3dee253edfbb762f7b420f19535f58a62c2c25ed50 +MISC ChangeLog 22085 SHA256 f38d1661ceb4d4271bb5ffe6877ae2a3cb10fd361e9bf5b3dba99e6e92c4ef11 SHA512 58e1469136a2a7a543e3d8dfc5fcc89d55cc62400d9fb45f3f60ca38817df3ff40c208ed399664ac73d2a2114d43df6932ca1c8c67b573eda73c52e826dd4d7c WHIRLPOOL 8d10fdf2684269b72c21000aa942f5b493ec2d4a1d8441a1923cdfeee7cb0d0221fe101ff516aa2cb5452e3e4237204096a0e9e341b60d92e6142f042fbee496 MISC metadata.xml 332 SHA256 4f1520cfbd8b72e61635d58783a77d08189616c031d0288eb6c47ae20b182353 SHA512 9aee4332f10ec1b28c6f40c580adfb5d7d6220f00ed3cea73c11a5063ca3ca737761b206c1b6f926b9e2418f5db0439df108d9a99747eff1277190f0f6258d86 WHIRLPOOL 1610d8c1a4038ffe903cc16e153745ca611732813a1a0c03601aabff96d42106994a84962dda28783ea8943e3c8c8b11d45b25cd96ebe0926194df96e0e25a99 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2.1 -iQJ8BAEBCgBmBQJVJR+rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJVR2S3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUzcP/28k1C7vjMJw8KAZ1vL82Owj -o0HuUVuWcNIgsUtaGWnglv+prXW7hVH0RLpQu1qbO8Fd5wjBKe0Q3cEsknOKfcyM -QA0dy8R6N4m9xizes/P2xz655lwlty6r4UIFEd5ww6C812wAa0o7To9BO2NsE8XY -bcCeEA87yD5qt5bh3AQEMcX5V6LZBUehraZdSSQ1IDXltkvgYkM5wMBDD51r5y9n -B03WBKu0pwndYSUPITVnKDEqy6sLH6SZrjfJQe2VGTS3OXFgEgLAuDfPgIC2uanr -3wsBwGmXp7zz1KHo4QqPAG3TYM79Fxf+w1rT5WDoUc7mL25l6sXhs4rF9eD0lNP+ -0cTfyq9DWDa8LMJY8vpX4gOVR0juLPE/RkCxlx4MxvFZ+jWtrRZsPSI9R1CMxGQB -UO23eYgSCwSf5GQe3cfinoONVv6uKPnOMMF/JiJetvMBkz/8F1RgDlvNEdRfVcCQ -s03+5L73LaOF/hxLPbdiFtxMAvZj4hAYigLK5OQ3m3U3SrCuO7PIjjKKmWNijTTr -2veo/kuZw5ZbcT71sOJVDBs14CPlXI+JEKndT9mKV3NVuba42MyLKgRt2LKNL0ky -3SYqLQheoxf49TPtia0eQuK2dGDj9bqskjfRSxKnpQbhejO2P/dO9RvtLYyOsGNt -UrrerI1zyLBBQi4e1N42 -=otf+ +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUaQP/3fzvHy+MJIBDHIOd0GzBfrM +R+cxSt//8G236DoUmhToJTUXW7VBkfePQU2cTwSTi1WpQNOublvQhFnd+9o6xgiw +gfSBCUHN3MJtWV+XDKSJj4ix9G/YqSNRqnQdzF/wN+irgKHLZHj42HSJ2Xsfr9i1 +9U6ow6zPtMJY2+e/mRkRfSqjFcOkGFPan9r4AJegLD2P3D4XB56CFzSGte4KV0O0 +inpmmvmXFA9ZOx6N7yQWn6y83N0H+AGYvPjt/PNzxr4yrskKANzZWg+1G/1C7xyM +TCnuLhndh94n9Xa93ktRlCf+3T/owXcmIynidgrO75AwFf3JGjWyhNxoZxJdYGav +pAxsbAxWZqTuZL1n4e1BzdyWcRiLaU29la2KLg7IdAVCKGYo5ZDZFI2f1w1BBsLj +uqn6S4Wra/bd6KCRBHOsEJil/DLfVhdAszE32/tJO547v/9yB1XrPBAQYHHzE2oa +EPS+s9K0jlVuMSAHfm3jGHvDFkSR2tQ37uY44j/jls8NvHOqx9sFH0wvl+V7QnUL +TMxUa0FNRkXmF2KZKE2HqzXAyO9KHtjEJuCig1/untRfiIZhoabx5o/MER4/xT25 +duiH7kBeCOza5peCMQTXO4vs/U1JADLvgyXPlcra9qxHGb1o5f0RVVNa/a1E1tNE +uxlmeuqe0h9ynM8OPHJM +=BDjx -----END PGP SIGNATURE----- diff --git a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild b/app-arch/p7zip/p7zip-9.20.1-r4.ebuild index aaf0cfe528ea..93f1530bfadb 100644 --- a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild +++ b/app-arch/p7zip/p7zip-9.20.1-r4.ebuild @@ -1,6 +1,6 @@ # 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.20.1-r4.ebuild,v 1.6 2015/04/07 10:10:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild,v 1.7 2015/05/04 12:23:31 jlec Exp $ EAPI=4 @@ -82,7 +82,9 @@ src_prepare() { 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 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" @@ -116,7 +118,7 @@ src_install() { dobin GUI/p7zipForFilemanager exeinto /usr/$(get_libdir)/${PN} - doexe bin/7zFM + doexe bin/7z{G,FM} insinto /usr/$(get_libdir)/${PN} doins -r GUI/{Lang,help} diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild deleted file mode 100644 index e2403ce7dddc..000000000000 --- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# 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.20.1-r5.ebuild,v 1.5 2015/04/07 10:10:39 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() { - epatch \ - "${FILESDIR}"/${P}-execstack.patch \ - "${FILESDIR}"/${P}-QA.patch \ - "${FILESDIR}"/${P}-long_rar_pwd.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 's:-O::g' \ - -e 's:-pipe::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 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 - - 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" ${PN} "GTK;Utility;Archiving;Compression" - - dobin GUI/p7zipForFilemanager - exeinto /usr/$(get_libdir)/${PN} - doexe bin/7zFM - - 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 -} diff --git a/app-arch/p7zip/p7zip-9.38.1.ebuild b/app-arch/p7zip/p7zip-9.38.1-r1.ebuild similarity index 96% rename from app-arch/p7zip/p7zip-9.38.1.ebuild rename to app-arch/p7zip/p7zip-9.38.1-r1.ebuild index 897bb08c78ea..baf02da63dd2 100644 --- a/app-arch/p7zip/p7zip-9.38.1.ebuild +++ b/app-arch/p7zip/p7zip-9.38.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.3 2015/04/08 12:31:38 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1-r1.ebuild,v 1.1 2015/05/04 12:23:31 jlec Exp $ EAPI=5 @@ -118,7 +118,7 @@ src_install() { dobin GUI/p7zipForFilemanager exeinto /usr/$(get_libdir)/${PN} - doexe bin/7zFM + doexe bin/7z{G,FM} insinto /usr/$(get_libdir)/${PN} doins -r GUI/{Lang,help}