| 1 |
jlec 10/11/04 17:31:04 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: p7zip-9.13-r2.ebuild |
| 5 |
Log: |
| 6 |
Installing updated version of p7zip wrapper from upstream instead of out own, #344143 |
| 7 |
|
| 8 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.133 app-arch/p7zip/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.133&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.133&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.132&r2=1.133 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v |
| 20 |
retrieving revision 1.132 |
| 21 |
retrieving revision 1.133 |
| 22 |
diff -u -r1.132 -r1.133 |
| 23 |
--- ChangeLog 2 Oct 2010 12:37:57 -0000 1.132 |
| 24 |
+++ ChangeLog 4 Nov 2010 17:31:04 -0000 1.133 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for app-arch/p7zip |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.132 2010/10/02 12:37:57 grobian Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.133 2010/11/04 17:31:04 jlec Exp $ |
| 30 |
+ |
| 31 |
+*p7zip-9.13-r2 (04 Nov 2010) |
| 32 |
+ |
| 33 |
+ 04 Nov 2010; Justin Lecher <jlec@g.o> +p7zip-9.13-r2.ebuild: |
| 34 |
+ Installing updated version of p7zip wrapper from upstream instead of out |
| 35 |
+ own, #344143 |
| 36 |
|
| 37 |
02 Oct 2010; Fabian Groffen <grobian@g.o> p7zip-9.13-r1.ebuild: |
| 38 |
Marked ~x64-macos, bug #333981 |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 app-arch/p7zip/p7zip-9.13-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.13-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7zip-9.13-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: p7zip-9.13-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2010 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r2.ebuild,v 1.1 2010/11/04 17:31:04 jlec Exp $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
WX_GTK_VER="2.8" |
| 55 |
|
| 56 |
inherit eutils toolchain-funcs multilib wxwidgets |
| 57 |
|
| 58 |
DESCRIPTION="Port of 7-Zip archiver for Unix" |
| 59 |
HOMEPAGE="http://p7zip.sourceforge.net/" |
| 60 |
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" |
| 61 |
|
| 62 |
LICENSE="LGPL-2.1 rar? ( unRAR )" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 65 |
IUSE="doc kde rar +pch static wxwidgets" |
| 66 |
|
| 67 |
RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror ) |
| 68 |
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" |
| 69 |
DEPEND="${RDEPEND}" |
| 70 |
|
| 71 |
S=${WORKDIR}/${PN}_${PV} |
| 72 |
|
| 73 |
pkg_setup() { |
| 74 |
use wxwidgets && wxwidgets_pkg_setup |
| 75 |
} |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
if ! use pch; then |
| 79 |
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die |
| 80 |
fi |
| 81 |
|
| 82 |
sed \ |
| 83 |
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \ |
| 84 |
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \ |
| 85 |
-i makefile* || die |
| 86 |
if use kde && ! use wxwidgets ; then |
| 87 |
einfo "USE-flag kde needs wxwidgets flag" |
| 88 |
einfo "silently enabling wxwidgets flag" |
| 89 |
fi |
| 90 |
|
| 91 |
# remove non-free RAR codec |
| 92 |
if use rar; then |
| 93 |
ewarn "Enabling nonfree RAR decompressor" |
| 94 |
else |
| 95 |
sed -e '/Rar/d' -i makefile* |
| 96 |
rm -rf CPP/7zip/Compress/Rar |
| 97 |
epatch "${FILESDIR}"/9.04-makefile.patch |
| 98 |
fi |
| 99 |
|
| 100 |
sed -i \ |
| 101 |
-e "/^CXX=/s:g++:$(tc-getCXX):" \ |
| 102 |
-e "/^CC=/s:gcc:$(tc-getCC):" \ |
| 103 |
-e '/ALLFLAGS/s:-s ::' \ |
| 104 |
makefile* || die "changing makefiles" |
| 105 |
|
| 106 |
if use amd64; then |
| 107 |
cp -f makefile.linux_amd64 makefile.machine |
| 108 |
elif [[ ${CHOST} == *-darwin* ]] ; then |
| 109 |
# Mac OS X needs this special makefile, because it has a non-GNU linker |
| 110 |
[[ ${CHOST} == *64-* ]] \ |
| 111 |
&& cp -f makefile.macosx_64bits makefile.machine \ |
| 112 |
|| cp -f makefile.macosx_32bits makefile.machine |
| 113 |
# bundles have extension .bundle but don't die because USE=-rar |
| 114 |
# removes the Rar directory |
| 115 |
sed -i -e '/strcpy(name/s/\.so/.bundle/' \ |
| 116 |
CPP/Windows/DLL.cpp || die |
| 117 |
sed -i -e '/^PROG=/s/\.so/.bundle/' \ |
| 118 |
CPP/7zip/Bundles/Format7zFree/makefile \ |
| 119 |
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die |
| 120 |
elif use x86-fbsd; then |
| 121 |
# FreeBSD needs this special makefile, because it hasn't -ldl |
| 122 |
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine |
| 123 |
fi |
| 124 |
use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine |
| 125 |
|
| 126 |
# We can be more parallel |
| 127 |
cp -f makefile.parallel_jobs makefile |
| 128 |
|
| 129 |
epatch "${FILESDIR}"/9.04-kde4.patch |
| 130 |
|
| 131 |
if use kde || use wxwidgets; then |
| 132 |
einfo "Preparing dependency list" |
| 133 |
emake depend || die |
| 134 |
fi |
| 135 |
} |
| 136 |
|
| 137 |
src_compile() { |
| 138 |
emake all3 || die "compilation error" |
| 139 |
if use kde || use wxwidgets; then |
| 140 |
emake 7zG || die "error building GUI" |
| 141 |
fi |
| 142 |
} |
| 143 |
|
| 144 |
src_test() { |
| 145 |
emake test_7z test_7zr || die "test failed" |
| 146 |
} |
| 147 |
|
| 148 |
src_install() { |
| 149 |
# this wrappers can not be symlinks, p7zip should be called with full path |
| 150 |
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr" |
| 151 |
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za" |
| 152 |
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z" |
| 153 |
|
| 154 |
if use kde || use wxwidgets; then |
| 155 |
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" |
| 156 |
|
| 157 |
dobin GUI/p7zipForFilemanager |
| 158 |
exeinto /usr/$(get_libdir)/${PN} |
| 159 |
doexe bin/7zG |
| 160 |
|
| 161 |
insinto /usr/$(get_libdir)/${PN} |
| 162 |
doins -r GUI/{Lang,help} |
| 163 |
|
| 164 |
if use kde; then |
| 165 |
insinto /usr/share/icons/hicolor/16x16/apps/ |
| 166 |
newins GUI/p7zip_16_ok.png p7zip.png |
| 167 |
|
| 168 |
insinto /usr/share/kde4/services/ServiceMenus |
| 169 |
doins GUI/kde/*.desktop |
| 170 |
fi |
| 171 |
fi |
| 172 |
|
| 173 |
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip || die |
| 174 |
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 || die |
| 175 |
|
| 176 |
exeinto /usr/$(get_libdir)/${PN} |
| 177 |
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins" |
| 178 |
doexe bin/*$(get_modname) || die "doexe *$(get_modname) files" |
| 179 |
if use rar; then |
| 180 |
exeinto /usr/$(get_libdir)/${PN}/Codecs/ |
| 181 |
doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files" |
| 182 |
fi |
| 183 |
|
| 184 |
doman man1/7z.1 man1/7za.1 man1/7zr.1 || die |
| 185 |
dodoc ChangeLog README TODO || die |
| 186 |
|
| 187 |
if use doc ; then |
| 188 |
dodoc DOCS/*.txt |
| 189 |
dohtml -r DOCS/MANUAL/* |
| 190 |
fi |
| 191 |
} |
Archives