KDE4 compatibility, fix for building against debug version of wxGTK, respect multilib enviroments bug 278821 273566 282079 282228, added myself as maintainer

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

6 files changed, 319 insertions, 6 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index d801b7a3587d..e1b80c4dc96a 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.111 2010/01/15 01:26:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.112 2010/02/15 21:10:46 jlec Exp $
+
+*p7zip-4.58-r1 (15 Feb 2010)
+*p7zip-4.65-r1 (15 Feb 2010)
+
+  15 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/4.65-kde4.patch, +p7zip-4.58-r1.ebuild, +p7zip-4.65-r1.ebuild,
+  metadata.xml:
+  added myself as maintainer, Respect multilib enviroments per 282228,
+  Fixes for kde4 per 273566, thanks Chin Yee for the contribution,
+  fixes for compilation with debug version of wxGTK #282079
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org> p7zip-4.65.ebuild:
   Add prefix keywords
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 6d475742dc3f..01ab47eea03f 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8
+AUX 4.65-kde4.patch 3453 RMD160 11e1f44bb848ad9a1538056ce6399fd8ede16c8b SHA1 9a48bde358b6081723f551c9ca589c9de46e7213 SHA256 43c7acd4fafd45d64c059bacf0cae038845f5c29fb9b6dd4ce67ebf0764eeb50
 AUX 4.65-makefile.patch 450 RMD160 9f3de770dd3d74d3546c871364ee527bb9c9d3b6 SHA1 7fdcbf714b65c25e5749ee78b34256bba84adee0 SHA256 d36e71be74fdcc3c2afaf2217cb4712f00e3e75f3d23efd6c288f058092c4120
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
 DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540c50d29d SHA1 eda5de3d35567e2633373dbe60313527a6a4db27 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53
 DIST p7zip_4.58_src_all.tar.bz2 1948207 RMD160 2c31ab657275dc01d2d23c5de2327d5ee46f4e8a SHA1 7525bbb12ec94186e9e40d3614cdfd5f6f63cab6 SHA256 52391559b7782d2bad45b783579ea9825f28670ba6f234fd0d9248af3e82bedd
 DIST p7zip_4.65_src_all.tar.bz2 2501418 RMD160 1749032c16e7c5afaa79bc123db33d61acc79eba SHA1 988f6ec63e93e6ec23492fd39e3b48a58fd695d1 SHA256 691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f
 EBUILD p7zip-4.57.ebuild 2524 RMD160 8559df68a75b045a97cf4de50a521f6797097483 SHA1 d18c522002c6240cd6db595fce9b2b6c8d1ca113 SHA256 9f83a19a9e06732263b4b7879be8f78f21b992382c234eac7f1bc2631cab23f7
+EBUILD p7zip-4.58-r1.ebuild 2314 RMD160 4110d47453070a41cd567aba2f14cf8698df7ce4 SHA1 197cc7670f4a3362062a6e6eccf049c38a52cd9a SHA256 9efeda274daf10f1ea62e7312910aa1d3a17216ded8496af6d70749654eddbe4
 EBUILD p7zip-4.58.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd
+EBUILD p7zip-4.65-r1.ebuild 3787 RMD160 2ae4e204783c9210164e25c560d74774e1241ce8 SHA1 b09e8e5c9c28e7ca9c8c6221629059e0a4f530a8 SHA256 201340751542774394fb3b2b0a3155e083d29ed2f00157c7890bf02d3df30dc0
 EBUILD p7zip-4.65.ebuild 3649 RMD160 22bba5fd32243bc77a8358de62cafd2c44f2dcc5 SHA1 2434016c8c40a5d96176e9e4d588874c25c7cf8b SHA256 cd810dfd73d62d3073f33369ce0bac1eb1e7458d15d96aa7ea6ace4b8b18fdb4
-MISC ChangeLog 14077 RMD160 ca8158514a63ff73df898222b9a0fbd6de3c7e88 SHA1 5cf8cdfd822fa7719fec9360e5e0755b27e837ff SHA256 3b883e807042711ae4a41a3a92411732d768ff20ccdf1e745b4a2e47750454e4
-MISC metadata.xml 300 RMD160 f76ed2c3264d6158356f9bdd432ca52a208df139 SHA1 bf620c137824a1fda712f420057baa45d65c730a SHA256 2f5efaa8198a11a57160098296e657540fd27abd43d6c388c820a070fc1d9da2
+MISC ChangeLog 14477 RMD160 b1f43a147a47ddc0070046ecde5f06d382f6d41a SHA1 08214e44962dea9e2413f222f870ede8224c8763 SHA256 13cb5a62f6b1865783066df26ffcda452816ad9edafaec3dfcf4e04062bbf934
+MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktPxDYACgkQOypDUo0oQOrhWQCfS79QN+NidLkrxc3pZgR851ii
-p44Anj7IxKGXgMdrMlXROc9Ds0odFZm6
-=2Tr2
+iEYEARECAAYFAkt5uFwACgkQgAnW8HDreRbX8QCdEjGBpZ3OWoMY45A31q8CK0cp
+K2QAnA4rxhLQZ+RH4htumZTGOEoeC4Pb
+=stw1
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/4.65-kde4.patch b/app-arch/p7zip/files/4.65-kde4.patch
new file mode 100644
index 000000000000..fae64e446b7b
--- /dev/null
+++ b/app-arch/p7zip/files/4.65-kde4.patch
@@ -0,0 +1,83 @@
+diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
+index 9010fbd..53f25ec 100644
+--- a/GUI/kde/p7zip_compress.desktop
++++ b/GUI/kde/p7zip_compress.desktop
+@@ -1,6 +1,9 @@
+ [Desktop Entry]
+-ServiceTypes=inode/directory
+-Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
++Encoding=UTF-8
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=all/all;
++Actions=CompressDialog;Compress7z;CompressZip;Benchmark
+ X-KDE-Priority=TopLevel
+ X-KDE-Submenu=7-Zip
+ X-KDE-Icon=p7zip
+@@ -20,26 +23,6 @@ Name=Add to Zip Archive
+ Icon=p7zip
+ Exec=p7zipForFilemanager a -tzip %U
+ 
+-[Desktop Action extractHere]
+-Name=Extract Here
+-Exec=p7zipForFilemanager x %U
+-Icon=p7zip
+-
+-[Desktop Action ExtractSubdir]
+-Name=Extract to subdirectory
+-Icon=p7zip
+-Exec=p7zipForFilemanager xs %U
+-
+-[Desktop Action ExtractTo]
+-Name=Extract to ...
+-Icon=p7zip
+-Exec=p7zipForFilemanager xd %U
+-
+-[Desktop Action test]
+-Name=Test Archive
+-Exec=p7zipForFilemanager t %U
+-Icon=p7zip
+-
+ [Desktop Action Benchmark]
+ Name=Benchmark
+ Icon=p7zip
+diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop
+index 9038c76..4eda887 100644
+--- a/GUI/kde/p7zip_extract.desktop
++++ b/GUI/kde/p7zip_extract.desktop
+@@ -1,10 +1,30 @@
+ [Desktop Entry]
+-X-SuSE-translate=true
+ Encoding=UTF-8
+-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+-Actions=extractHere
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak;
++#MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-rar-compressed;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;
++Actions=extractHere;ExtractSubdir;ExtractTo;test;
++X-KDE-Priority=TopLevel
++X-KDE-Submenu=7-Zip
++X-KDE-Icon=p7zip
+ 
+ [Desktop Action extractHere]
+-Name=Extract Here with 7-zip
++Name=Extract Here
+ Exec=p7zipForFilemanager x %U
+ Icon=p7zip
++
++[Desktop Action ExtractSubdir]
++Name=Extract to subdirectory
++Icon=p7zip
++Exec=p7zipForFilemanager xs %U
++
++[Desktop Action ExtractTo]
++Name=Extract to ...
++Icon=p7zip
++Exec=p7zipForFilemanager xd %U
++
++[Desktop Action test]
++Name=Test Archive
++Exec=p7zipForFilemanager t %U
++Icon=p7zip
+\ No newline at end of file
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 90bea9afac7f..65e45663b649 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -5,6 +5,10 @@
 <maintainer>
   <email>radek@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>jlec@gentoo.org</email>
+	<description>Bug fixing guy</description>
+</maintainer>
 <use>
 	<flag name="rar">Enable support for non-free rar decoder</flag>
 </use>	
diff --git a/app-arch/p7zip/p7zip-4.58-r1.ebuild b/app-arch/p7zip/p7zip-4.58-r1.ebuild
new file mode 100644
index 000000000000..5a5c9f04f988
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.58-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.58-r1.ebuild,v 1.1 2010/02/15 21:10:46 jlec Exp $
+
+inherit eutils toolchain-funcs multilib
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static doc"
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
+		-e 's:-s ::' \
+		-e '/Rar/d' \
+		makefile* || die "changing makefiles"
+
+	if use amd64; then
+		cp -f makefile.linux_amd64 makefile.machine
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		cp -f makefile.macosx makefile.machine
+	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
+
+	# patching to not included nonfree RAR decompression code is higher a sed call
+	# But we're removing nonfree code just in case sed wasnt enough
+	rm -rf CPP/7zip/Compress/Rar
+}
+
+src_compile() {
+	emake all3 || die "compilation error"
+}
+
+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"
+
+	dobin "${FILESDIR}/p7zip" || die
+
+	# gzip introduced in 4.42, so beware :)
+	newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/*.so || die "doexe *.so files"
+
+	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
+
+	einfo "Please be aware that rar support was removed (it's nonfree)"
+	einfo "You can use app-arch/rar for rar support"
+}
diff --git a/app-arch/p7zip/p7zip-4.65-r1.ebuild b/app-arch/p7zip/p7zip-4.65-r1.ebuild
new file mode 100644
index 000000000000..0b9aae41d426
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.65-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65-r1.ebuild,v 1.1 2010/02/15 21:10:46 jlec Exp $
+
+EAPI="2"
+WX_GTK_VER="2.8"
+
+inherit eutils toolchain-funcs multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc kde rar static wxwidgets"
+
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}_${PV}
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	if use kde && ! use wxwidgets ; then
+		einfo "USE-flag kde needs wxwidgets flag"
+		einfo "silently enabling wxwidgets flag"
+	fi
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed -e '/Rar/d' -i makefile*
+		rm -rf CPP/7zip/Compress/Rar
+		epatch "${FILESDIR}"/${PV}-makefile.patch
+	fi
+
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
+		-e 's:-s ::' \
+		makefile* || die "changing makefiles"
+
+	if use amd64; then
+		cp -f makefile.linux_amd64 makefile.machine
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU linker
+		cp -f makefile.macosx makefile.machine
+		# bundles have extension .bundle
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/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
+
+	# We can be more parallel
+	cp -f makefile.parallel_jobs makefile
+
+	epatch "${FILESDIR}"/${PV}-hardlink.patch
+	epatch "${FILESDIR}"/${PV}-kde4.patch
+
+	if use kde || use wxwidgets; then
+		einfo "Preparing dependency list"
+		emake depend || die
+	fi
+}
+
+src_compile() {
+	emake all3 || die "compilation error"
+	if use kde || use wxwidgets; then
+		emake 7zG || die "error building GUI"
+	fi
+}
+
+src_test() {
+	emake test_7z test_7zr || die "test failed"
+	if use kde || use wxwidgets; then
+		emake test_7zG || die "GUI test failed"
+	fi
+}
+
+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"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/{Lang,help}
+
+		if use kde; then
+			insinto /usr/share/icons/hicolor/16x16/apps/
+			newins GUI/p7zip_16_ok.png p7zip.png
+
+			insinto  /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde/*.desktop
+		fi
+	fi
+
+	dobin "${FILESDIR}/p7zip" || die
+
+	# gzip introduced in 4.42, so beware :)
+	newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
+	doexe bin/*$(get_modname) || die "doexe *$(get_modname) files"
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) files"
+	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
+}