version bump

Package-Manager: portage-2.1.3.9

5 files changed, 144 insertions, 5 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 5d409777ea90..536a8695dca2 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.72 2007/09/17 01:07:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.73 2007/09/23 20:25:03 radek Exp $
+
+*p7zip-4.55 (23 Sep 2007)
+
+  23 Sep 2007; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/p7zip-4.55-open_lzma_alone.patch, +p7zip-4.55.ebuild:
+  version bump with experimental lzma_alone patch
 
   17 Sep 2007; Jeroen Roovers <jer@gentoo.org> p7zip-4.51.ebuild:
   Stable for HPPA too.
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 4020b357f718..5a1d02301bc6 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -2,10 +2,15 @@ AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e2
 MD5 7bca8f207e6b570c09854ecb5e0860a6 files/p7zip 1210
 RMD160 0f331392eb77077ea6c100011326202661e9b6ab files/p7zip 1210
 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 files/p7zip 1210
+AUX p7zip-4.55-open_lzma_alone.patch 1156 RMD160 0fda66b88c257b77943668585a4b62e3b767eabc SHA1 b21e43405d71ffbefd46e92d98b51abc13fadd79 SHA256 9ed847c3135ef0f08a70e1e8bb1072ad9c8d9ffd9bfb039a486231ac01926436
+MD5 5c1c0d4d6d5f02c035692e7b0daee736 files/p7zip-4.55-open_lzma_alone.patch 1156
+RMD160 0fda66b88c257b77943668585a4b62e3b767eabc files/p7zip-4.55-open_lzma_alone.patch 1156
+SHA256 9ed847c3135ef0f08a70e1e8bb1072ad9c8d9ffd9bfb039a486231ac01926436 files/p7zip-4.55-open_lzma_alone.patch 1156
 DIST p7zip_4.44_src_all.tar.bz2 1518820 RMD160 a04f13c55ce21781c463debc578fd4819f171adf SHA1 474e2479a7ceb19fcf75e61784e2c4ecf2d2f7e7 SHA256 cb87304f682e7176ab95ce73d3ce2b7b65384e051272fc34ef934e2427bbd3af
 DIST p7zip_4.45_src_all.tar.bz2 1458299 RMD160 23677f41e1a2c1d8c254073bc17ea40ea90851f1 SHA1 06bdaf755e288539da4efa399fc143648db57acd SHA256 3a2902d532a7673113609232b46c868e6c55dbce0e7ef73d8ef944fb295c7984
 DIST p7zip_4.48_src_all.tar.bz2 1487947 RMD160 2caae333dea746221cb074dc976444f9de5d5daf SHA1 d800f3e7abaffc62d91fd0320eb588a53dafd17c SHA256 33a4e52d9237c38b3d3f695573c2698f01b3e553ba506176cb98bd0a77d5d413
 DIST p7zip_4.51_src_all.tar.bz2 1483484 RMD160 af57615cc9d951516891a3f52b169f3d7c262650 SHA1 e3708dc69ec44dba554ab15d0cacbc226eae9420 SHA256 49926b91b5577a1ebe338edb38209eb537192966972f209e71526160e0e1f50b
+DIST p7zip_4.55_src_all.tar.bz2 1487801 RMD160 d224572461f04b53976e2e45a6d1c34aabda18d8 SHA1 7dd6f75c031f15f3d379af3e208e2e4d65f55bb7 SHA256 5604c21b4fec1b73e6bf8b69b0c3f97a3f269cdd975c3bdc5d961de7ed8a0835
 EBUILD p7zip-4.44.ebuild 2271 RMD160 7c302ce78c67a5ce49f459ac27be9df16a5f223a SHA1 d1a5b2879bccffe199f1548b774922cd779c86e5 SHA256 5888820bf4923baf16df561cdbe353f46dca505c4ed86a7cb145720a030060fd
 MD5 d2675a85dbe4d3ed0fc7e8549f922ed7 p7zip-4.44.ebuild 2271
 RMD160 7c302ce78c67a5ce49f459ac27be9df16a5f223a p7zip-4.44.ebuild 2271
@@ -22,10 +27,14 @@ EBUILD p7zip-4.51.ebuild 2403 RMD160 311502c2b8bf47639b1801aa29b05351e200915d SH
 MD5 674b7fe8807410fd1f977a02e3d83970 p7zip-4.51.ebuild 2403
 RMD160 311502c2b8bf47639b1801aa29b05351e200915d p7zip-4.51.ebuild 2403
 SHA256 6b886375f14451d36acfd1314a13dd6aec7401df8a57c94c3f378bc5459624f8 p7zip-4.51.ebuild 2403
-MISC ChangeLog 9181 RMD160 dde5e1c67b0a292622094677f68b0257fde57194 SHA1 fe52fc1a182425ce620db326e87d846960dfe4df SHA256 65b814bf1cd0ebb51ab34d8200dfb60aa16d6c9404958e133d05b1792680b5dd
-MD5 1ccc85fbf8b03838a9ee1742411fa41b ChangeLog 9181
-RMD160 dde5e1c67b0a292622094677f68b0257fde57194 ChangeLog 9181
-SHA256 65b814bf1cd0ebb51ab34d8200dfb60aa16d6c9404958e133d05b1792680b5dd ChangeLog 9181
+EBUILD p7zip-4.55.ebuild 2534 RMD160 c383e1ec35a948093b002c595214c1563275b9a6 SHA1 d9b82e9022924f357ce42de92faaa43d08ee2fef SHA256 007f99a3449071a32b9f594474f9ae3c7ce11c0cdc2673d1e4eb1cf6c4bec849
+MD5 104b4ad41a7ad3420c7b5b5b1b8e79fb p7zip-4.55.ebuild 2534
+RMD160 c383e1ec35a948093b002c595214c1563275b9a6 p7zip-4.55.ebuild 2534
+SHA256 007f99a3449071a32b9f594474f9ae3c7ce11c0cdc2673d1e4eb1cf6c4bec849 p7zip-4.55.ebuild 2534
+MISC ChangeLog 9378 RMD160 e5ab43d4f7d6ff94f36327fbcbca77550f3da76e SHA1 a4a4b422dbe4b82676a0b6fe0ef220ce03eb92a4 SHA256 e199d976c73f413eb835dfe4eaa453267b2981b59ad218290a47a8f20e76c753
+MD5 9a6456fb6cd7239a44ee49e44742a8b3 ChangeLog 9378
+RMD160 e5ab43d4f7d6ff94f36327fbcbca77550f3da76e ChangeLog 9378
+SHA256 e199d976c73f413eb835dfe4eaa453267b2981b59ad218290a47a8f20e76c753 ChangeLog 9378
 MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
@@ -42,3 +51,6 @@ SHA256 85a3ad83cb0cfedfcdabea48e7946badd3a1231d3f61b32e90e7acfe919a9b46 files/di
 MD5 a6eef66ae11e7ec939a9f8d8536050e5 files/digest-p7zip-4.51 262
 RMD160 d4d9aef4732ec091e9192f3ad09714c4af1ed2f4 files/digest-p7zip-4.51 262
 SHA256 2c2a369ed822a81392a2e1ec82933030adabf110ba12724cc157d14da81170fb files/digest-p7zip-4.51 262
+MD5 0b7a552c87ce54d2b24cda89c34cf3cb files/digest-p7zip-4.55 262
+RMD160 5a5034316deccb119ba32a245b11b12c93920cd6 files/digest-p7zip-4.55 262
+SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/digest-p7zip-4.55 262
diff --git a/app-arch/p7zip/files/digest-p7zip-4.55 b/app-arch/p7zip/files/digest-p7zip-4.55
new file mode 100644
index 000000000000..f6a2ea937c2b
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.55
@@ -0,0 +1,3 @@
+MD5 bb141529cf2374a2e15735f155273172 p7zip_4.55_src_all.tar.bz2 1487801
+RMD160 d224572461f04b53976e2e45a6d1c34aabda18d8 p7zip_4.55_src_all.tar.bz2 1487801
+SHA256 5604c21b4fec1b73e6bf8b69b0c3f97a3f269cdd975c3bdc5d961de7ed8a0835 p7zip_4.55_src_all.tar.bz2 1487801
diff --git a/app-arch/p7zip/files/p7zip-4.55-open_lzma_alone.patch b/app-arch/p7zip/files/p7zip-4.55-open_lzma_alone.patch
new file mode 100644
index 000000000000..d805d82f4aa5
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-4.55-open_lzma_alone.patch
@@ -0,0 +1,37 @@
+--- p7zip_4.55/CPP/7zip/Compress/LZMA_Alone/makefile.org	2007-08-15 12:56:22.000000000 +0200
++++ p7zip_4.55/CPP/7zip/Compress/LZMA_Alone/makefile	2007-09-23 21:56:59.000000000 +0200
+@@ -4,7 +4,7 @@
+ LIB = $(LOCAL_LIBS)
+ RM = rm -f
+ CFLAGS = -c -I. -I../../../  -I../../../myWindows  -I../../../include_windows \
+-         -UENV_UNIX -DCOMPRESS_MF_MT -DBENCH_MT
++         -DENV_UNIX -DCOMPRESS_MF_MT -DBENCH_MT
+ 
+ OBJS = \
+   LzmaAlone.o \
+@@ -32,6 +32,9 @@
+   LzmaDecode.o \
+   LzmaRamDecode.o \
+   C_FileIO.o \
++  FileIO.o \
++  FileFind.o \
++  wine_date_and_time.o \
+   System.o \
+   Threads.o \
+   MatchFinderMt.o
+@@ -80,6 +83,15 @@
+ C_FileIO.o: ../../../Common/C_FileIO.cpp
+ 	$(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
+ 
++FileIO.o: ../../../Windows/FileIO.cpp
++	$(CXX) $(CFLAGS) ../../../Windows/FileIO.cpp
++
++FileFind.o: ../../../Windows/FileFind.cpp
++	$(CXX) $(CFLAGS) ../../../Windows/FileFind.cpp
++
++wine_date_and_time.o: ../../../myWindows/wine_date_and_time.cpp
++	$(CXX) $(CFLAGS) ../../../myWindows/wine_date_and_time.cpp
++
+ CommandLineParser.o: ../../../Common/CommandLineParser.cpp
+ 	$(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
+ 
diff --git a/app-arch/p7zip/p7zip-4.55.ebuild b/app-arch/p7zip/p7zip-4.55.ebuild
new file mode 100644
index 000000000000..778367543260
--- /dev/null
+++ b/app-arch/p7zip/p7zip-4.55.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.55.ebuild,v 1.1 2007/09/23 20:25:03 radek 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 ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static doc"
+
+DEPEND="!app-arch/lzma"
+
+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 ::' \
+		makefile* || die "changing makefiles"
+
+	if use amd64; then
+		ewarn "Using suboptimal -fPIC upstream makefile due to amd64 being detected. See #126722"
+		cp -f makefile.linux_amd64 makefile.machine
+	elif use ppc-macos; 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
+
+	# experimental patch for proper lzma_alone compilation (radek@20070923)
+	epatch ${FILESDIR}/p7zip-4.55-open_lzma_alone.patch
+}
+
+src_compile() {
+	emake all3 || die "compilation error"
+	cd CPP/7zip/Compress/LZMA_Alone
+	emake || die "LZMA_Alone compilation error"
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/lib/${PN}/7zr"
+	make_wrapper 7za "/usr/lib/${PN}/7za"
+	make_wrapper 7z "/usr/lib/${PN}/7z"
+
+	dobin ${FILESDIR}/p7zip
+
+	dobin CPP/7zip/Compress/LZMA_Alone/lzma
+
+	# gzip introduced in 4.42, so beware :)
+	# mv needed just as rename, because dobin installs using old name
+	mv contrib/gzip-like_CLI_wrapper_for_7z/p7zip contrib/gzip-like_CLI_wrapper_for_7z/7zg
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/7zg
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
+	exeinto /usr/$(get_libdir)/${PN}/Codecs
+	doexe bin/Codecs/* || die "doexe Codecs"
+	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
+}