fixed bug #103605, removed unnecesary old versions.

(Portage version: 1.589-cvs)

7 files changed, 22 insertions, 52 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index cb38d0977455..2c1950c40a64 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.23 2005/08/10 09:49:50 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.24 2005/08/27 13:47:43 radek Exp $
+
+*p7zip-4.20-r1 (27 Aug 2005)
+
+  27 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> -p7zip-4.16.ebuild,
+  -p7zip-4.18.ebuild, +p7zip-4.20-r1.ebuild:
+  Fixed #103605 thanks to Bruce Guenter.
+  Removed obsoleted versions.
 
   10 Aug 2005; Luis Medinas <metalgod@gentoo.org> p7zip-4.20.ebuild:
   Marked Stable on AMD64.
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 66ec94f28525..37abaaf5cced 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,12 +1,10 @@
+MD5 b368be36dae31d78a232e8d52aa3c3e2 p7zip-4.20-r1.ebuild 1011
+MD5 b24ad5bd1bc43cfc963731afcdbb72de p7zip-0.91.ebuild 733
 MD5 4c46060e69f79489aa14d4c2aebba0ea ChangeLog 3193
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
-MD5 b24ad5bd1bc43cfc963731afcdbb72de p7zip-0.91.ebuild 733
-MD5 45baa4c5670acbf28c6500fadcfda64a p7zip-4.16.ebuild 940
-MD5 70bc09d33b952151161d65ac4ae695db p7zip-4.18.ebuild 942
 MD5 9366cbb83b1cef1ad42a9a45cd46c029 p7zip-4.20.ebuild 942
 MD5 b536ab563901360bd65cae18d088ee5e files/7z 42
 MD5 b447478697ba987040c8a572b2948310 files/digest-p7zip-0.91 63
-MD5 dc2c48150a6e3814aad4cb461569dceb files/digest-p7zip-4.16 67
-MD5 d59edc8007f0d34689022c8b1e78c1ab files/digest-p7zip-4.18 67
 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20 67
 MD5 5cd8b1eac59c69d93fd0380607d295fc files/p7zip-4.16_x86_static.patch 276
+MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67
diff --git a/app-arch/p7zip/files/digest-p7zip-4.16 b/app-arch/p7zip/files/digest-p7zip-4.16
deleted file mode 100644
index 119763f9541a..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e307fc7f145f3a62ac2cb9f484d58b0b p7zip_4.16_src.tar.bz2 456065
diff --git a/app-arch/p7zip/files/digest-p7zip-4.18 b/app-arch/p7zip/files/digest-p7zip-4.18
deleted file mode 100644
index 687905f8c4d6..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af01bcc0b20b51ced4b66cd15ca894f6 p7zip_4.18_src.tar.bz2 455913
diff --git a/app-arch/p7zip/files/digest-p7zip-4.20-r1 b/app-arch/p7zip/files/digest-p7zip-4.20-r1
new file mode 100644
index 000000000000..6c066396c0ed
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.20-r1
@@ -0,0 +1 @@
+MD5 91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 328976
diff --git a/app-arch/p7zip/p7zip-4.18.ebuild b/app-arch/p7zip/p7zip-4.18.ebuild
deleted file mode 100644
index 04d7db6bf5f0..000000000000
--- a/app-arch/p7zip/p7zip-4.18.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.18.ebuild,v 1.1 2005/05/15 14:38:44 radek 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="~x86 ~amd64 ~ppc"
-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.16.ebuild b/app-arch/p7zip/p7zip-4.20-r1.ebuild
index 8070e47f9e85..a40ff5c6ae55 100644
--- a/app-arch/p7zip/p7zip-4.16.ebuild
+++ b/app-arch/p7zip/p7zip-4.20-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.16.ebuild,v 1.4 2005/06/06 12:17:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.20-r1.ebuild,v 1.1 2005/08/27 13:47:43 radek Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static doc"
 
 S=${WORKDIR}/${PN}_${PV}
 
@@ -31,9 +31,14 @@ src_compile() {
 }
 
 src_install() {
-	#dobin ${FILESDIR}/7z
 	dobin bin/7za || die "dobin"
 	dosym 7za /usr/bin/7z
 
-	dodoc ChangeLog README TODO DOCS/*.txt
+	doman man1/7z.1
+	doman man1/7za.1
+
+	if use doc; then
+		dodoc ChangeLog README TODO DOCS/*.txt
+		dohtml -r DOCS/MANUAL/*
+	fi
 }