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

(Portage version: 2.2_rc62/cvs/Linux x86_64)

5 files changed, 311 insertions, 1 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/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
+}