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