Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/
Date: Fri, 15 Jul 2016 02:32:42
Message-Id: 1468549925.98be5eb1827845a1551e998392c603e692815ccc.prometheanfire@gentoo
1 commit: 98be5eb1827845a1551e998392c603e692815ccc
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 15 02:32:05 2016 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 15 02:32:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98be5eb1
7
8 app-arch/p7zip: bup for bug 582832
9
10 Package-Manager: portage-2.2.28
11
12 app-arch/p7zip/Manifest | 1 +
13 app-arch/p7zip/files/p7zip-16.02-darwin.patch | 11 ++
14 app-arch/p7zip/p7zip-16.02.ebuild | 158 ++++++++++++++++++++++++++
15 3 files changed, 170 insertions(+)
16
17 diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
18 index 7f85deb..fb57004 100644
19 --- a/app-arch/p7zip/Manifest
20 +++ b/app-arch/p7zip/Manifest
21 @@ -1,5 +1,6 @@
22 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
23 DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd WHIRLPOOL ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
24 DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5 WHIRLPOOL 52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
25 +DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f WHIRLPOOL b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
26 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
27 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
28
29 diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
30 new file mode 100644
31 index 0000000..e7f40f5
32 --- /dev/null
33 +++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
34 @@ -0,0 +1,11 @@
35 +--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
36 ++++ p7zip_15.14.1/CPP/myWindows/StdAfx.h
37 +@@ -32,7 +32,7 @@
38 + #include <errno.h>
39 + #include <math.h>
40 +
41 +-#ifdef __NETWARE__
42 ++#if defined(__NETWARE__) || defined(__MACH__)
43 + #include <sys/types.h>
44 + #endif
45 +
46
47 diff --git a/app-arch/p7zip/p7zip-16.02.ebuild b/app-arch/p7zip/p7zip-16.02.ebuild
48 new file mode 100644
49 index 0000000..a2efa29
50 --- /dev/null
51 +++ b/app-arch/p7zip/p7zip-16.02.ebuild
52 @@ -0,0 +1,158 @@
53 +# Copyright 1999-2016 Gentoo Foundation
54 +# Distributed under the terms of the GNU General Public License v2
55 +# $Id$
56 +
57 +EAPI=5
58 +
59 +WX_GTK_VER="3.0"
60 +
61 +inherit eutils multilib toolchain-funcs wxwidgets
62 +
63 +DESCRIPTION="Port of 7-Zip archiver for Unix"
64 +HOMEPAGE="http://p7zip.sourceforge.net/"
65 +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
66 +
67 +LICENSE="LGPL-2.1 rar? ( unRAR )"
68 +SLOT="0"
69 +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"
70 +IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
71 +
72 +REQUIRED_USE="kde? ( wxwidgets )"
73 +
74 +RDEPEND="
75 + kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
76 + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
77 +DEPEND="${RDEPEND}
78 + amd64? ( dev-lang/yasm )
79 + abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
80 + x86? ( dev-lang/nasm )"
81 +
82 +S=${WORKDIR}/${PN}_${PV}
83 +
84 +src_prepare() {
85 + epatch "${FILESDIR}"/${P}-darwin.patch
86 +
87 + if ! use pch; then
88 + sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
89 + fi
90 +
91 + sed \
92 + -e 's:-m32 ::g' \
93 + -e 's:-m64 ::g' \
94 + -e 's:-pipe::g' \
95 + -e '/ALLFLAGS/s:-s ::' \
96 + -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
97 + -i makefile* || die
98 +
99 + # remove non-free RAR codec
100 + if use rar; then
101 + ewarn "Enabling nonfree RAR decompressor"
102 + else
103 + sed \
104 + -e '/Rar/d' \
105 + -e '/RAR/d' \
106 + -i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
107 + rm -rf CPP/7zip/Compress/Rar || die
108 + fi
109 +
110 + if use abi_x86_x32; then
111 + sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
112 + cp -f makefile.linux_amd64_asm makefile.machine || die
113 + elif use amd64; then
114 + cp -f makefile.linux_amd64_asm makefile.machine || die
115 + elif use x86; then
116 + cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
117 + elif [[ ${CHOST} == *-darwin* ]] ; then
118 + # Mac OS X needs this special makefile, because it has a non-GNU
119 + # linker, it doesn't matter so much for bitwidth, for it doesn't
120 + # do anything with it
121 + cp -f makefile.macosx_llvm_64bits makefile.machine
122 + # bundles have extension .bundle but don't die because USE=-rar
123 + # removes the Rar directory
124 + sed -i -e '/strcpy(name/s/\.so/.bundle/' \
125 + CPP/Windows/DLL.cpp || die
126 + sed -i -e '/^PROG=/s/\.so/.bundle/' \
127 + CPP/7zip/Bundles/Format7zFree/makefile.list \
128 + $(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
129 + elif use x86-fbsd; then
130 + # FreeBSD needs this special makefile, because it hasn't -ldl
131 + sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
132 + fi
133 +
134 + if use static; then
135 + sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
136 + fi
137 +
138 + if use kde || use wxwidgets; then
139 + need-wxwidgets unicode
140 + einfo "Preparing dependency list"
141 + emake depend
142 + fi
143 +}
144 +
145 +src_compile() {
146 + emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
147 + if use kde || use wxwidgets; then
148 + emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
149 +# emake -- 7zFM
150 + fi
151 +}
152 +
153 +src_test() {
154 + emake test test_7z test_7zr
155 +}
156 +
157 +src_install() {
158 + # this wrappers can not be symlinks, p7zip should be called with full path
159 + make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
160 + make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
161 + make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
162 +
163 + if use kde || use wxwidgets; then
164 + make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
165 +# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
166 +
167 +# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
168 +
169 + dobin GUI/p7zipForFilemanager
170 + exeinto /usr/$(get_libdir)/${PN}
171 +# doexe bin/7z{G,FM}
172 + doexe bin/7zG
173 +
174 + insinto /usr/$(get_libdir)/${PN}
175 + doins -r GUI/{Lang,help}
176 +
177 + insinto /usr/share/icons/hicolor/16x16/apps/
178 + newins GUI/p7zip_16_ok.png p7zip.png
179 +
180 + if use kde; then
181 + rm GUI/kde4/p7zip_compress.desktop || die
182 + insinto /usr/share/kde4/services/ServiceMenus
183 + doins GUI/kde4/*.desktop
184 + dodir /usr/share/kservices5/ServiceMenus
185 + for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
186 + item="$(basename ${item})"
187 + dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
188 + done
189 + fi
190 + fi
191 +
192 + dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
193 + doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
194 +
195 + exeinto /usr/$(get_libdir)/${PN}
196 + doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
197 + doexe bin/*$(get_modname)
198 + if use rar; then
199 + exeinto /usr/$(get_libdir)/${PN}/Codecs/
200 + doexe bin/Codecs/*$(get_modname)
201 + fi
202 +
203 + doman man1/7z.1 man1/7za.1 man1/7zr.1
204 + dodoc ChangeLog README TODO
205 +
206 + if use doc; then
207 + dodoc DOC/*.txt
208 + dohtml -r DOC/MANUAL/*
209 + fi
210 +}