Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating changes from Flameeyes, Sergey Dryabzhinsky, Ilya Kashirin, A.C.Heron and Chi-Thanh Christopher Nguyen.

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

6 files changed, 176 insertions, 3 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 8259779972d0..966d261935c5 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.104 2009/01/25 19:29:15 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.105 2009/04/26 20:59:25 patrick Exp $
+
+*p7zip-4.65 (26 Apr 2009)
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/4.65-hardlink.patch, +files/4.65-makefile.patch, metadata.xml,
+  +p7zip-4.65.ebuild:
+  Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating
+  changes from Flameeyes, Sergey Dryabzhinsky, Ilya Kashirin, A.C.Heron and
+  Chi-Thanh Christopher Nguyen.
 
   25 Jan 2009; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.58.ebuild:
   Removed unnecesary warning as per bug #126722
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index fe657f7bea8d..e4c6b49bcaee 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,7 +1,11 @@
+AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8
+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.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd
-MISC ChangeLog 12920 RMD160 ed2d15d282b627806ae0a191ce5f8ae2a784d9a1 SHA1 52f1c0fada827dc9c73f1e73e26380e544c943e7 SHA256 725ae161cffb7b104f0ae2f9ae1e04e58bfac619fb726503931c2c15570fba6d
-MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
+EBUILD p7zip-4.65.ebuild 3299 RMD160 4826c931a055278896122ebd8b6334cf5c17fe56 SHA1 107650ab2c6693fdc527db16424408d368864169 SHA256 93b9a33ee7629b57136e852f639df21014eb9144a7527f4f4b34c8b2a55510e5
+MISC ChangeLog 13277 RMD160 bf8a4632848b3ace13ee5c623d15eb27ced5d693 SHA1 b4baa228516713b4a6ddbe9ac7149d91a8f6b10b SHA256 2e745924198ccc78bc90c61af29d0a74a6aee75e9a3f0c2a8dce58da7ad13c8e
+MISC metadata.xml 300 RMD160 f76ed2c3264d6158356f9bdd432ca52a208df139 SHA1 bf620c137824a1fda712f420057baa45d65c730a SHA256 2f5efaa8198a11a57160098296e657540fd27abd43d6c388c820a070fc1d9da2
diff --git a/app-arch/p7zip/files/4.65-hardlink.patch b/app-arch/p7zip/files/4.65-hardlink.patch
new file mode 100644
index 000000000000..05d9e71c8e65
--- /dev/null
+++ b/app-arch/p7zip/files/4.65-hardlink.patch
@@ -0,0 +1,13 @@
+--- makefile	2009-02-25 16:03:33.000000000 +0100
++++ makefile.new	2009-02-25 16:03:17.000000000 +0100
+@@ -55,8 +55,8 @@
+ 	$(MAKE) -C CPP/7zip/UI/Console           all
+ 
+ 7zG: common7z
+-	cd bin ; rm -f Lang ; ln ../GUI/Lang .
+-	cd bin ; rm -f help ; ln ../GUI/help .
++	cd bin ; rm -f Lang ; ln -sf ../GUI/Lang .
++	cd bin ; rm -f help ; ln -sf ../GUI/help .
+ 	$(MAKE) -C CPP/7zip/UI/GUI               all
+ 
+ clean:
diff --git a/app-arch/p7zip/files/4.65-makefile.patch b/app-arch/p7zip/files/4.65-makefile.patch
new file mode 100644
index 000000000000..b0297f8d2014
--- /dev/null
+++ b/app-arch/p7zip/files/4.65-makefile.patch
@@ -0,0 +1,20 @@
+--- CPP/7zip/Bundles/Format7zFree/makefile	2009-02-09 21:47:24.000000000 +0100
++++ CPP/7zip/Bundles/Format7zFree/makefile.new	2009-02-25 14:18:31.000000000 +0100
+@@ -271,8 +271,6 @@
+   MyAes.o \
+   Pbkdf2HmacSha1.o \
+   RandGen.o \
+-  Rar20Crypto.o \
+-  RarAes.o \
+   Sha1.o \
+   WzAes.o \
+   ZipCrypto.o \
+@@ -313,7 +313,6 @@
+   $(LZH_OBJS) \
+   $(LZM_OBJS) \
+   $(NSIS_OBJS) \
+-  $(RAR_OBJS) \
+   $(SPLIT_OBJS) \
+   $(TAR_OBJS) \
+   $(UDF_OBJS) \
+
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index eb56bf3495be..90bea9afac7f 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>radek@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="rar">Enable support for non-free rar decoder</flag>
+</use>	
 </pkgmetadata>
diff --git a/app-arch/p7zip/p7zip-4.65.ebuild b/app-arch/p7zip/p7zip-4.65.ebuild
new file mode 100644
index 000000000000..0efa4bce750b
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.65.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.1 2009/04/26 20:59:25 patrick 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="~amd64 ~x86"
+IUSE="wxwindows doc kde rar static"
+
+RDEPEND="wxwindows? ( x11-libs/wxGTK[X] )
+	kde? ( || ( kde-base/konqueror:3.5 kde-base/kdebase-meta:3.5 kde-base/kdebase:3.5 ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	if use kde && ! use wxwindows ; then
+		eerror "USE-flag kde needs wxwindows flag"
+		die "do USE=\"kde wxwindows\" emerge p7zip"
+	fi
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Adding 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
+	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
+}
+
+src_compile() {
+	emake all3 || die "compilation error"
+	if use wxwindows; then
+		emake 7zG || die "error building GUI"
+	fi
+}
+
+src_test() {
+	emake test_7z test_7zr || die "test failed"
+	if use wxwindows; 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 wxwindows; 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/apps/konqueror/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/*.so || die "doexe *.so files"
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*.so || die "doexe Codecs/*.so 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
+}
+