removed old 4.14. version bump for 4.20

(Portage version: 2.0.51.22-r1)

6 files changed, 15 insertions, 27 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 7edaddcd4397..12fa86993587 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2005/06/06 12:17:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.20 2005/06/06 20:11:34 radek Exp $
+
+*p7zip-4.20 (06 Jun 2005)
+
+  06 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/p7zip-4.14_x86_static.patch, -p7zip-4.14.ebuild,
+  +p7zip-4.20.ebuild:
+  Removed old 4.14 ebuild.
+  Added new 4.20 (version bump).
 
   06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> p7zip-4.16.ebuild:
   amd64 stable
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 051a445e413b..a35610a03453 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 70bc09d33b952151161d65ac4ae695db p7zip-4.18.ebuild 942
 MD5 b24ad5bd1bc43cfc963731afcdbb72de p7zip-0.91.ebuild 733
-MD5 9feeac60743a835f5f0f70a0d2df8421 p7zip-4.14.ebuild 940
 MD5 7498303c70f1aefe61472e749c68e0ee ChangeLog 2687
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
+MD5 70bc09d33b952151161d65ac4ae695db p7zip-4.20.ebuild 942
 MD5 45baa4c5670acbf28c6500fadcfda64a p7zip-4.16.ebuild 940
 MD5 b536ab563901360bd65cae18d088ee5e files/7z 42
 MD5 b447478697ba987040c8a572b2948310 files/digest-p7zip-0.91 63
-MD5 a69aaf3dc158e9ea8eded2ca40930c63 files/digest-p7zip-4.14 67
 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 f80a2436133e5458e0083f83afff052c files/p7zip-4.14_x86_static.patch 284
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCpD8xevY57Fted3ERArw3AKDSjohi++pzTd3mfDwQvneJje9EagCdE06c
-QbyNGun0D9zQDWPmVcBQ3Rs=
-=B0I5
------END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/digest-p7zip-4.14 b/app-arch/p7zip/files/digest-p7zip-4.14
deleted file mode 100644
index 457e0a66589f..000000000000
--- a/app-arch/p7zip/files/digest-p7zip-4.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1452c602c04547f0b96a100e9411258b p7zip_4.14_src.tar.bz2 459185
diff --git a/app-arch/p7zip/files/digest-p7zip-4.20 b/app-arch/p7zip/files/digest-p7zip-4.20
new file mode 100644
index 000000000000..6c066396c0ed
--- /dev/null
+++ b/app-arch/p7zip/files/digest-p7zip-4.20
@@ -0,0 +1 @@
+MD5 91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 328976
diff --git a/app-arch/p7zip/files/p7zip-4.14_x86_static.patch b/app-arch/p7zip/files/p7zip-4.14_x86_static.patch
deleted file mode 100644
index 4000e18151db..000000000000
--- a/app-arch/p7zip/files/p7zip-4.14_x86_static.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- makefile.machine.orig       2005-01-14 22:07:49.314274448 +0100
-+++ makefile.machine    2005-01-14 22:07:58.214921344 +0100
-@@ -12,5 +12,5 @@
- LOCAL_LIBS=-lpthread
- LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
- # static linkage
--# LOCAL_LIBS=-static -lpthread
-+LOCAL_LIBS=-static -lpthread
-
diff --git a/app-arch/p7zip/p7zip-4.14.ebuild b/app-arch/p7zip/p7zip-4.20.ebuild
index 85d9f47ed156..74a2e1d3a4b2 100644
--- a/app-arch/p7zip/p7zip-4.14.ebuild
+++ b/app-arch/p7zip/p7zip-4.20.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.14.ebuild,v 1.4 2005/05/09 19:36:57 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.20.ebuild,v 1.1 2005/06/06 20:11:34 radek Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86 ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="static"
 
 S=${WORKDIR}/${PN}_${PV}
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}_${PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use static && epatch ${FILESDIR}/p7zip-4.14_x86_static.patch
+	use static && epatch ${FILESDIR}/p7zip-4.16_x86_static.patch
 	sed -i \
 		-e "/^CXX=/s:g++:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \