Version Bump

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

3 files changed, 148 insertions, 5 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index c7b1266326c4..032d7d0213d0 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.118 2010/06/07 06:43:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.119 2010/06/07 06:52:52 jlec Exp $
+
+*p7zip-9.13 (07 Jun 2010)
+
+  07 Jun 2010; Justin Lecher <jlec@gentoo.org> +p7zip-9.13.ebuild:
+  Version Bump
 
   07 Jun 2010; Justin Lecher <jlec@gentoo.org> p7zip-4.65.ebuild,
   p7zip-4.65-r1.ebuild, p7zip-9.04.ebuild:
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 8cf0d532bab0..8f24fc93b3df 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -11,18 +11,20 @@ DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540
 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
 DIST p7zip_9.04_src_all.tar.bz2 3759021 RMD160 2d9caf81dd3fc038441be7e1e592a972a1114df7 SHA1 6430fcd3a5e16d0a30f1eebf34a085e5372b813b SHA256 ddfbb6795a14bcab1f9622096fe9385c239b43c3f6a9a80d85021849f738f9ab
+DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c76b7ab19 SHA1 81da0729561ce123c0a82656ec96a04ad5bfa522 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923
 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 3706 RMD160 f29d076cd521e6bc9b27cb786f7b8da31e7db2a1 SHA1 128e6843829a5a20266a6d61da434ab6429d4995 SHA256 fdb6ebfc724460b165d61ab015ed5b5dc414b660c5f4555755c9a7b3a49755dc
 EBUILD p7zip-4.65.ebuild 3569 RMD160 69d6e9832afda983f9d49152098477f6f30bb31f SHA1 4f518c09fb52758e55c6d8386ac0bf84f8b04bf5 SHA256 e9fc6d80a362b239d06e76fa6b211b44739ca9107c0b82ba19a9d03dd4f8c82f
 EBUILD p7zip-9.04.ebuild 3853 RMD160 e3bbef3c3cf2964b8a59eb0c124470d4717bf285 SHA1 152cb137784ff2ba5af503874be03c6cb3079a09 SHA256 ff4216229edc3944fc5e2c6505dca1cf2d04f3c257c6f1b16777de14edada6e8
-MISC ChangeLog 15222 RMD160 ec142091b9a84f82bd5c3b295a9c48da1888aa21 SHA1 eed688c289311d563bb0623172188f3f7f8f0c67 SHA256 935c9a4de343ee32c90daf97db894ac1d96b3e3cbaf35ab93a5198fb70436182
+EBUILD p7zip-9.13.ebuild 3851 RMD160 a46257880d667167b1b2006cd6b708a870093ae9 SHA1 d0b46ffcf7179e0ebab8c8f56c6c54ecd123b0cb SHA256 1aadb8f238fe9733606961d95d3b517e75b8ad100a3f47fa8d37eebba2456387
+MISC ChangeLog 15332 RMD160 2886558468a11cfb53a93474bac6d3263167a05b SHA1 389f52069949c6a7bdd859d1ddfbe7c6e443356c SHA256 6cbe82590c953c6d3db4c244dbce5937b05f3f1a406af461ac12c12a656f934f
 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwMlT0ACgkQgAnW8HDreRaJXQCgxSIAKB+qWxeSqDWH1lGRkXka
-fxQAn1/kcyW8jXZBurRMeieWyWLAcZg7
-=dU8w
+iEYEARECAAYFAkwMl1MACgkQgAnW8HDreRbf1gCgnn3r6vbTnbt6gKq3FpDJweRZ
+peoAn0dKHRfBkcOZsfRa+XI/xKPeY6Cj
+=ey3Z
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-9.13.ebuild b/app-arch/p7zip/p7zip-9.13.ebuild
new file mode 100644
index 000000000000..dab73fbb68ef
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.13.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-9.13.ebuild,v 1.1 2010/06/07 06:52:52 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}"/9.04-makefile.patch
+	fi
+
+	sed -i \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
+		-e "/^CC=/s:gcc:$(tc-getCC):" \
+		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
+		-e '/ALLFLAGS/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
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			CPP/7zip/Compress/Rar/makefile
+	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}"/9.04-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"
+}
+
+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
+}