1 |
jlec 13/08/01 06:28:47 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: p7zip-9.20.1-r4.ebuild |
5 |
Removed: p7zip-9.20.1-r3.ebuild |
6 |
Log: |
7 |
app-arch/p7zip: Fix icon in desktop file, #478706 |
8 |
|
9 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B9D4F231BD1558AB!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.9 app-arch/p7zip/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/metadata.xml?rev=1.9&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/metadata.xml?rev=1.9&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/metadata.xml?r1=1.8&r2=1.9 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/metadata.xml,v |
21 |
retrieving revision 1.8 |
22 |
retrieving revision 1.9 |
23 |
diff -u -r1.8 -r1.9 |
24 |
--- metadata.xml 7 Oct 2011 15:27:28 -0000 1.8 |
25 |
+++ metadata.xml 1 Aug 2013 06:28:47 -0000 1.9 |
26 |
@@ -1,11 +1,11 @@ |
27 |
<?xml version="1.0" encoding="UTF-8"?> |
28 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
29 |
<pkgmetadata> |
30 |
- <maintainer> |
31 |
- <email>jlec@g.o</email> |
32 |
- <description>maintainer</description> |
33 |
- </maintainer> |
34 |
- <use> |
35 |
- <flag name="rar">Enable support for non-free rar decoder</flag> |
36 |
- </use> |
37 |
+ <maintainer> |
38 |
+ <email>jlec@g.o</email> |
39 |
+ <description>maintainer</description> |
40 |
+ </maintainer> |
41 |
+ <use> |
42 |
+ <flag name="rar">Enable support for non-free rar decoder</flag> |
43 |
+ </use> |
44 |
</pkgmetadata> |
45 |
|
46 |
|
47 |
|
48 |
1.154 app-arch/p7zip/ChangeLog |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.154&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.154&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.153&r2=1.154 |
53 |
|
54 |
Index: ChangeLog |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v |
57 |
retrieving revision 1.153 |
58 |
retrieving revision 1.154 |
59 |
diff -u -r1.153 -r1.154 |
60 |
--- ChangeLog 30 Jul 2013 12:33:19 -0000 1.153 |
61 |
+++ ChangeLog 1 Aug 2013 06:28:47 -0000 1.154 |
62 |
@@ -1,6 +1,12 @@ |
63 |
# ChangeLog for app-arch/p7zip |
64 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.153 2013/07/30 12:33:19 ago Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.154 2013/08/01 06:28:47 jlec Exp $ |
67 |
+ |
68 |
+*p7zip-9.20.1-r4 (01 Aug 2013) |
69 |
+ |
70 |
+ 01 Aug 2013; Justin Lecher <jlec@g.o> -p7zip-9.20.1-r3.ebuild, |
71 |
+ +p7zip-9.20.1-r4.ebuild, metadata.xml: |
72 |
+ Fix icon in desktop file, #478706 |
73 |
|
74 |
30 Jul 2013; Agostino Sarubbo <ago@g.o> p7zip-9.20.1-r3.ebuild: |
75 |
Stable for alpha, wrt bug #477180 |
76 |
|
77 |
|
78 |
|
79 |
1.1 app-arch/p7zip/p7zip-9.20.1-r4.ebuild |
80 |
|
81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild?rev=1.1&view=markup |
82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild?rev=1.1&content-type=text/plain |
83 |
|
84 |
Index: p7zip-9.20.1-r4.ebuild |
85 |
=================================================================== |
86 |
# Copyright 1999-2013 Gentoo Foundation |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild,v 1.1 2013/08/01 06:28:47 jlec Exp $ |
89 |
|
90 |
EAPI=4 |
91 |
|
92 |
WX_GTK_VER="2.8" |
93 |
|
94 |
inherit eutils multilib toolchain-funcs wxwidgets |
95 |
|
96 |
DESCRIPTION="Port of 7-Zip archiver for Unix" |
97 |
HOMEPAGE="http://p7zip.sourceforge.net/" |
98 |
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" |
99 |
|
100 |
LICENSE="LGPL-2.1 rar? ( unRAR )" |
101 |
SLOT="0" |
102 |
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" |
103 |
IUSE="doc kde rar +pch static wxwidgets" |
104 |
|
105 |
REQUIRED_USE="kde? ( wxwidgets )" |
106 |
|
107 |
RDEPEND=" |
108 |
kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) |
109 |
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" |
110 |
DEPEND="${RDEPEND} |
111 |
amd64? ( dev-lang/yasm ) |
112 |
x86? ( dev-lang/nasm )" |
113 |
|
114 |
S=${WORKDIR}/${PN}_${PV} |
115 |
|
116 |
pkg_setup() { |
117 |
use wxwidgets && wxwidgets_pkg_setup |
118 |
} |
119 |
|
120 |
src_prepare() { |
121 |
epatch \ |
122 |
"${FILESDIR}"/${P}-execstack.patch \ |
123 |
"${FILESDIR}"/${P}-QA.patch |
124 |
|
125 |
if ! use pch; then |
126 |
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die |
127 |
fi |
128 |
|
129 |
sed \ |
130 |
-e 's:-m32 ::g' \ |
131 |
-e 's:-m64 ::g' \ |
132 |
-e 's:-O::g' \ |
133 |
-e 's:-pipe::g' \ |
134 |
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \ |
135 |
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \ |
136 |
-i makefile* || die |
137 |
|
138 |
# remove non-free RAR codec |
139 |
if use rar; then |
140 |
ewarn "Enabling nonfree RAR decompressor" |
141 |
else |
142 |
sed -e '/Rar/d' -i makefile* || die |
143 |
rm -rf CPP/7zip/Compress/Rar || die |
144 |
epatch "${FILESDIR}"/9.04-makefile.patch |
145 |
fi |
146 |
|
147 |
sed -i \ |
148 |
-e "/^CXX=/s:g++:$(tc-getCXX):" \ |
149 |
-e "/^CC=/s:gcc:$(tc-getCC):" \ |
150 |
-e '/ALLFLAGS/s:-s ::' \ |
151 |
makefile* || die "changing makefiles" |
152 |
|
153 |
if use amd64; then |
154 |
cp -f makefile.linux_amd64_asm makefile.machine || die |
155 |
elif use x86; then |
156 |
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die |
157 |
elif [[ ${CHOST} == *-darwin* ]] ; then |
158 |
# Mac OS X needs this special makefile, because it has a non-GNU linker |
159 |
[[ ${CHOST} == *64-* ]] \ |
160 |
&& cp -f makefile.macosx_64bits makefile.machine \ |
161 |
|| cp -f makefile.macosx_32bits makefile.machine |
162 |
# bundles have extension .bundle but don't die because USE=-rar |
163 |
# removes the Rar directory |
164 |
sed -i -e '/strcpy(name/s/\.so/.bundle/' \ |
165 |
CPP/Windows/DLL.cpp || die |
166 |
sed -i -e '/^PROG=/s/\.so/.bundle/' \ |
167 |
CPP/7zip/Bundles/Format7zFree/makefile \ |
168 |
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die |
169 |
elif use x86-fbsd; then |
170 |
# FreeBSD needs this special makefile, because it hasn't -ldl |
171 |
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine |
172 |
fi |
173 |
|
174 |
use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine |
175 |
|
176 |
if use kde || use wxwidgets; then |
177 |
einfo "Preparing dependency list" |
178 |
emake depend |
179 |
fi |
180 |
} |
181 |
|
182 |
src_compile() { |
183 |
emake all3 |
184 |
if use kde || use wxwidgets; then |
185 |
emake -- 7zG |
186 |
emake -- 7zFM |
187 |
fi |
188 |
} |
189 |
|
190 |
src_test() { |
191 |
emake test test_7z test_7zr |
192 |
} |
193 |
|
194 |
src_install() { |
195 |
# this wrappers can not be symlinks, p7zip should be called with full path |
196 |
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" |
197 |
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" |
198 |
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" |
199 |
|
200 |
if use kde || use wxwidgets; then |
201 |
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" |
202 |
make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM" |
203 |
|
204 |
make_desktop_entry 7zFM "${PN} FM" /usr/share/icons/hicolor/16x16/apps/p7zip.png "GTK;Utility;Archiving;Compression" |
205 |
make_desktop_entry 7zG "${PN} GUI" /usr/share/icons/hicolor/16x16/apps/p7zip.png "GTK;Utility;Archiving;Compression" |
206 |
|
207 |
dobin GUI/p7zipForFilemanager |
208 |
exeinto /usr/$(get_libdir)/${PN} |
209 |
doexe bin/7z{G,FM} |
210 |
|
211 |
insinto /usr/$(get_libdir)/${PN} |
212 |
doins -r GUI/{Lang,help} |
213 |
|
214 |
insinto /usr/share/icons/hicolor/16x16/apps/ |
215 |
newins GUI/p7zip_16_ok.png p7zip.png |
216 |
|
217 |
if use kde; then |
218 |
|
219 |
rm GUI/kde4/p7zip_compress.desktop |
220 |
insinto /usr/share/kde4/services/ServiceMenus |
221 |
doins GUI/kde4/*.desktop |
222 |
fi |
223 |
fi |
224 |
|
225 |
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip |
226 |
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 |
227 |
|
228 |
exeinto /usr/$(get_libdir)/${PN} |
229 |
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx |
230 |
doexe bin/*$(get_modname) |
231 |
if use rar; then |
232 |
exeinto /usr/$(get_libdir)/${PN}/Codecs/ |
233 |
doexe bin/Codecs/*$(get_modname) |
234 |
fi |
235 |
|
236 |
doman man1/7z.1 man1/7za.1 man1/7zr.1 |
237 |
dodoc ChangeLog README TODO |
238 |
|
239 |
if use doc; then |
240 |
dodoc DOCS/*.txt |
241 |
dohtml -r DOCS/MANUAL/* |
242 |
fi |
243 |
} |