version bump, and orphaned files cleaning

(Portage version: 2.1.3_rc6)

18 files changed, 17 insertions, 405 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 0f5000262a56..a5117326a8ac 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,15 @@
 # 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.64 2007/06/12 14:49:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.65 2007/07/01 23:33:30 radek Exp $
+
+*p7zip-4.48 (01 Jul 2007)
+
+  01 Jul 2007; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/p7zip-4.30-gcc41.diff, -files/7z, -files/7za,
+  -files/p7zip-4.16_x86_static.patch, -p7zip-4.20.ebuild,
+  -p7zip-4.30.ebuild, -p7zip-4.33.ebuild, -p7zip-4.39.ebuild,
+  -p7zip-4.42.ebuild, -p7zip-4.43.ebuild, +p7zip-4.48.ebuild:
+  version bump, and orphaned files cleaning
 
   12 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> p7zip-4.45.ebuild:
   Stable on sparc
diff --git a/app-arch/p7zip/files/7z b/app-arch/p7zip/files/7z
deleted file mode 100644
index 05c70869d09f..000000000000
--- a/app-arch/p7zip/files/7z
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# 7z wrapper, p7zip, should be called with full path
-# so symlink and copy should not be used instead.
-
-exec /usr/lib/p7zip/7z "$@"
diff --git a/app-arch/p7zip/files/7za b/app-arch/p7zip/files/7za
deleted file mode 100644
index f718bb4fed54..000000000000
--- a/app-arch/p7zip/files/7za
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# 7za wrapper, p7zip, should be called with full path
-# so symlink and copy should not be used instead.
-
-exec /usr/lib/p7zip/7za "$@"
diff --git a/app-arch/p7zip/files/digest-p7zip-4.20 b/app-arch/p7zip/files/digest-p7zip-4.20
deleted file mode 100644
index fe52208d40b9..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 328976
-RMD160 3ae10d0ed32a1334728d0b59adfa7574e3216ba3 p7zip_4.20_src.tar.bz2 328976
-SHA256 a8fd139d6c590beb7448a75eb746d0e9308bab9c2e6b88cab5746f6a272a8c3d p7zip_4.20_src.tar.bz2 328976
diff --git a/app-arch/p7zip/files/digest-p7zip-4.30 b/app-arch/p7zip/files/digest-p7zip-4.30
deleted file mode 100644
index 7f0392694db7..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 427869
-RMD160 3fc1e8b373bb0ceb3cbadaf4f7900d44d53fe0df p7zip_4.30_src_all.tar.bz2 427869
-SHA256 2d5ba5c96b82cbcc9987ef81a843f77b886ee5c5d2ff9149f4d11f4f380fc8a9 p7zip_4.30_src_all.tar.bz2 427869
diff --git a/app-arch/p7zip/files/digest-p7zip-4.33 b/app-arch/p7zip/files/digest-p7zip-4.33
deleted file mode 100644
index f1d31ee117dd..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.33
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6333633173f6bcd851ed087402af60d2 p7zip_4.33_src_all.tar.bz2 1443942
-RMD160 c0647421c4b18e8cdd99d03f8346d1cfe8f188fe p7zip_4.33_src_all.tar.bz2 1443942
-SHA256 dfd3e18cc74445604f032cd8d1b29d907beeadbc845780dcf1f23b206df2889a p7zip_4.33_src_all.tar.bz2 1443942
diff --git a/app-arch/p7zip/files/digest-p7zip-4.39 b/app-arch/p7zip/files/digest-p7zip-4.39
deleted file mode 100644
index 6482626874d4..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.39
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 081be9cfb67c9be4e526913b14dd6f86 p7zip_4.39_src_all.tar.bz2 1445834
-RMD160 5b2e319ca462f8c3cb4df4e57e3116e1a847c1ff p7zip_4.39_src_all.tar.bz2 1445834
-SHA256 8eef1c3907f58a2fd2b15bce94334635d8199e21d5daab541057a828b7e7da0e p7zip_4.39_src_all.tar.bz2 1445834
diff --git a/app-arch/p7zip/files/digest-p7zip-4.42 b/app-arch/p7zip/files/digest-p7zip-4.42
deleted file mode 100644
index 8922d9780778..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.42
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a5475fdfdde39dd3f8dae20efc479cb9 p7zip_4.42_src_all.tar.bz2 1461812
-RMD160 a7d0867e0f16cf2a58a9788a266b298edd7ecd1d p7zip_4.42_src_all.tar.bz2 1461812
-SHA256 029ab89f0a553987abdbe0c14605efdf9c11f0f4074b854a6fc4181345d6ac44 p7zip_4.42_src_all.tar.bz2 1461812
diff --git a/app-arch/p7zip/files/digest-p7zip-4.43 b/app-arch/p7zip/files/digest-p7zip-4.43
deleted file mode 100644
index e680ce6de351..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.43
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9fb8982262f66b4ec0377a67c171cfcb p7zip_4.43_src_all.tar.bz2 1482271
-RMD160 227741c37e1c69260898ef7a4aa827835cac8a6c p7zip_4.43_src_all.tar.bz2 1482271
-SHA256 736a1c301d95ed2d5ce917a859d6fca3f378345e8253a1143bd26f7333a7fb5c p7zip_4.43_src_all.tar.bz2 1482271
diff --git a/app-arch/p7zip/files/digest-p7zip-4.48 b/app-arch/p7zip/files/digest-p7zip-4.48
new file mode 100644
index 000000000000..e047332d32ec
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.48
@@ -0,0 +1,3 @@
+MD5 4e41eb39aa0e866228db65cedfbbb845 p7zip_4.48_src_all.tar.bz2 1487947
+RMD160 2caae333dea746221cb074dc976444f9de5d5daf p7zip_4.48_src_all.tar.bz2 1487947
+SHA256 33a4e52d9237c38b3d3f695573c2698f01b3e553ba506176cb98bd0a77d5d413 p7zip_4.48_src_all.tar.bz2 1487947
diff --git a/app-arch/p7zip/files/p7zip-4.16_x86_static.patch b/app-arch/p7zip/files/p7zip-4.16_x86_static.patch
deleted file mode 100644
index c52ef865f68e..000000000000
--- a/app-arch/p7zip/files/p7zip-4.16_x86_static.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- makefile.machine.orig       2005-04-15 18:31:10.000000000 +0200
-+++ makefile.machine    2005-04-15 18:12:26.000000000 +0200
-@@ -11,6 +11,6 @@
- CC=gcc $(ALLFLAGS)
- LINK_SHARED=-shared
-
--LOCAL_LIBS=-lpthread
-+LOCAL_LIBS=-lpthread -static
- LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
-
diff --git a/app-arch/p7zip/files/p7zip-4.30-gcc41.diff b/app-arch/p7zip/files/p7zip-4.30-gcc41.diff
deleted file mode 100644
index ac2fb49b9efa..000000000000
--- a/app-arch/p7zip/files/p7zip-4.30-gcc41.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur p7zip_4.30/7zip/Archive/7z/7zIn.h p7zip_4.30-gcc41/7zip/Archive/7z/7zIn.h
---- p7zip_4.30/7zip/Archive/7z/7zIn.h	2005-09-22 19:53:23.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/Archive/7z/7zIn.h	2006-01-31 22:09:46.209606000 +0100
-@@ -244,7 +244,7 @@
-       CRecordVector<bool> &digestsDefined, 
-       CRecordVector<UInt32> &digests);
- 
--  HRESULT CInArchive::ReadStreamsInfo(
-+  HRESULT ReadStreamsInfo(
-       const CObjectVector<CByteBuffer> *dataVector,
-       UInt64 &dataOffset,
-       CRecordVector<UInt64> &packSizes,
-diff -Naur p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder1.h
---- p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder1.h	2006-01-31 22:09:46.209606000 +0100
-@@ -58,7 +58,7 @@
-   UInt32 c_table[CTABLESIZE];
-   UInt32 pt_table[PTABLESIZE];
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-diff -Naur p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder2.h
---- p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder2.h	2006-01-31 22:09:46.209606000 +0100
-@@ -26,7 +26,7 @@
-   CLZOutWindow m_OutWindowStream;
-   NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-diff -Naur p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateDecoder.h
---- p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h	2005-09-22 19:53:20.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateDecoder.h	2006-01-31 22:09:46.209606000 +0100
-@@ -60,7 +60,7 @@
-   void DeCodeLevelTable(Byte *newLevels, int numLevels);
-   bool ReadTables();
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     ReleaseInStream();
-diff -Naur p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateEncoder.h
---- p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h	2005-11-19 22:09:02.000000000 +0100
-+++ p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateEncoder.h	2006-01-31 22:09:46.209606000 +0100
-@@ -115,7 +115,7 @@
-   void CopyBackBlockOp(UInt32 distance, UInt32 length);
-   void WriteBlockData(bool writeMode, bool finalBlock);
- 
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     // m_MatchFinder.ReleaseStream();
-     m_OutStream.ReleaseStream();
-diff -Naur p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30-gcc41/7zip/Compress/Lzh/LzhDecoder.h
---- p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/Compress/Lzh/LzhDecoder.h	2006-01-31 22:09:46.209606000 +0100
-@@ -53,7 +53,7 @@
-   CHuffmanDecoder<kNumDistanceSymbols> m_PHuffmanDecoder;
-   CHuffmanDecoder<kNumCSymbols> m_CHuffmanDecoder;
- 
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-diff -Naur p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30-gcc41/7zip/UI/Console/ExtractCallbackConsole.h
---- p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h	2005-09-22 19:53:22.000000000 +0200
-+++ p7zip_4.30-gcc41/7zip/UI/Console/ExtractCallbackConsole.h	2006-01-31 22:09:46.209606000 +0100
-@@ -52,7 +52,7 @@
- 
-   CStdOutStream *OutStream;
- 
--  void CExtractCallbackConsole::Init()
-+  void Init()
-   {
-     NumArchives = 0;
-     NumArchiveErrors = 0;
diff --git a/app-arch/p7zip/p7zip-4.20.ebuild b/app-arch/p7zip/p7zip-4.20.ebuild
deleted file mode 100644
index db65bec00bdc..000000000000
--- a/app-arch/p7zip/p7zip-4.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.20.ebuild,v 1.4 2005/08/10 09:49:50 metalgod Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use static && epatch ${FILESDIR}/p7zip-4.16_x86_static.patch
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:-O2 -s -fPIC:${CXXFLAGS}:" \
-		makefile* || die "cleaning up makefiles"
-}
-
-src_compile() {
-	emake || die "compilation error"
-}
-
-src_install() {
-	#dobin ${FILESDIR}/7z
-	dobin bin/7za || die "dobin"
-	dosym 7za /usr/bin/7z
-
-	dodoc ChangeLog README TODO DOCS/*.txt
-}
diff --git a/app-arch/p7zip/p7zip-4.30.ebuild b/app-arch/p7zip/p7zip-4.30.ebuild
deleted file mode 100644
index bc6edbf981cb..000000000000
--- a/app-arch/p7zip/p7zip-4.30.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.30.ebuild,v 1.2 2006/01/31 21:26:56 hanno 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="~amd64 ~hppa ~ppc ~x86"
-IUSE="static doc"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-gcc41.diff
-	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:-O1 -s:${CXXFLAGS}:" \
-		makefile* || die "cleaning up makefiles"
-}
-
-src_compile() {
-	emake all2 || die "compilation error"
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7za "/usr/lib/${PN}/7za"
-	make_wrapper 7z "/usr/lib/${PN}/7z"
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins"
-	exeinto /usr/$(get_libdir)/${PN}/Codecs
-	doexe bin/Codecs/* || die "doexe Codecs"
-	exeinto /usr/$(get_libdir)/${PN}/Formats
-	doexe bin/Formats/* || die "doexe Formats"
-
-	doman man1/7z.1 man1/7za.1
-	dodoc ChangeLog README TODO
-
-	if use doc ; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-4.33.ebuild b/app-arch/p7zip/p7zip-4.33.ebuild
deleted file mode 100644
index 1da66fb92aca..000000000000
--- a/app-arch/p7zip/p7zip-4.33.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.33.ebuild,v 1.2 2006/03/22 09:49:53 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="~hppa ~ppc ~x86"
-IUSE="static doc"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
-	# be aware that CXX is now gcc in pattern due to upstream  (radek@20060318)
-	sed -i \
-		-e "/^CXX=/s:gcc:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:-O1 -s:${CXXFLAGS}:" \
-		makefile* || die "cleaning up makefiles"
-}
-
-src_compile() {
-	emake all2 || die "compilation error"
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7za "/usr/lib/${PN}/7za"
-	make_wrapper 7z "/usr/lib/${PN}/7z"
-
-	dobin ${FILESDIR}/p7zip
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins"
-	exeinto /usr/$(get_libdir)/${PN}/Codecs
-	doexe bin/Codecs/* || die "doexe Codecs"
-	exeinto /usr/$(get_libdir)/${PN}/Formats
-	doexe bin/Formats/* || die "doexe Formats"
-
-	doman man1/7z.1 man1/7za.1
-	dodoc ChangeLog README TODO
-
-	if use doc ; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-4.39.ebuild b/app-arch/p7zip/p7zip-4.39.ebuild
deleted file mode 100644
index bae519931e41..000000000000
--- a/app-arch/p7zip/p7zip-4.39.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.39.ebuild,v 1.4 2006/06/10 09:24:52 hansmi 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="~hppa ppc x86"
-IUSE="static doc"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
-	# be aware that CXX is now gcc in pattern due to upstream  (radek@20060318)
-	sed -i \
-		-e "/^CXX=/s:gcc:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:-O1 -s:${CXXFLAGS}:" \
-		-e "s:-O -s:${CXXFLAGS}:" \
-		makefile* || die "cleaning up 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
-	fi
-}
-
-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/lib/${PN}/7zr"
-	make_wrapper 7za "/usr/lib/${PN}/7za"
-	make_wrapper 7z "/usr/lib/${PN}/7z"
-
-	dobin ${FILESDIR}/p7zip
-
-	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}/Formats
-	doexe bin/Formats/* || die "doexe Formats"
-
-	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
-}
diff --git a/app-arch/p7zip/p7zip-4.42.ebuild b/app-arch/p7zip/p7zip-4.42.ebuild
deleted file mode 100644
index c5de627f4498..000000000000
--- a/app-arch/p7zip/p7zip-4.42.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.42.ebuild,v 1.10 2007/02/02 19:05:10 gustavoz 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="amd64 ~hppa ppc ~ppc-macos sparc x86"
-IUSE="static doc"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
-		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
-	fi
-}
-
-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/lib/${PN}/7zr"
-	make_wrapper 7za "/usr/lib/${PN}/7za"
-	make_wrapper 7z "/usr/lib/${PN}/7z"
-
-	dobin ${FILESDIR}/p7zip
-
-	# gzip introduced in 4.42 but i havent' got enough time to check it carefully
-	# so for now just leaving it commented
-	# 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}/Formats
-	doexe bin/Formats/* || die "doexe Formats"
-
-	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
-}
diff --git a/app-arch/p7zip/p7zip-4.43.ebuild b/app-arch/p7zip/p7zip-4.48.ebuild
index 9d4379465d68..905043f0a9aa 100644
--- a/app-arch/p7zip/p7zip-4.43.ebuild
+++ b/app-arch/p7zip/p7zip-4.48.ebuild
@@ -1,6 +1,6 @@
 # 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.43.ebuild,v 1.6 2007/06/26 01:32:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.48.ebuild,v 1.1 2007/07/01 23:33:30 radek Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="static doc"
 
 S=${WORKDIR}/${PN}_${PV}
@@ -59,8 +59,8 @@ src_install() {
 	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}/Formats
-	doexe bin/Formats/* || die "doexe Formats"
+	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