Version bump to fix insecure zlib.

(Portage version: 2.0.51.22-r2)

9 files changed, 21 insertions, 67 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index b9b68abdce71..a134d822cbe9 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.31 2005/07/31 21:00:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.32 2005/08/01 00:26:55 herbs Exp $
+
+*emul-linux-x86-baselibs-2.1.2 (31 Jul 2005)
+
+  31 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  +emul-linux-x86-baselibs-2.1.2.ebuild,
+  -emul-linux-x86-baselibs-2.2.ebuild,
+  -emul-linux-x86-baselibs-2.2.2.ebuild,
+  -emul-linux-x86-baselibs-2.2.3.ebuild:
+  Made 2.1.2 release based on 2.1.1 with upgraded libz (to satisfy security
+  bug #100686). Shunted 2.2* as they proved to be too buggy.
 
 *emul-linux-x86-baselibs-2.2.3 (31 Jul 2005)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index aa6ef47e612f..f1402a561bcc 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,17 +1,13 @@
-MD5 0622d00b6376e2ec9f536a1a56c8d904 ChangeLog 5140
-MD5 aca848a28509f354586241514a531e33 emul-linux-x86-baselibs-1.2.2-r2.ebuild 1127
 MD5 fc033876db8a037e2728f3eee4169ae0 emul-linux-x86-baselibs-1.2.3.ebuild 935
+MD5 aca848a28509f354586241514a531e33 emul-linux-x86-baselibs-1.2.2-r2.ebuild 1127
+MD5 81fdf51361b97a1d50b73180d6d768fe emul-linux-x86-baselibs-2.1.2.ebuild 690
 MD5 6cb980a717e004d158d33ddb06df0422 emul-linux-x86-baselibs-2.1.ebuild 689
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
+MD5 a63f48e7947ed4d2f629d3303410b769 ChangeLog 5535
 MD5 81fdf51361b97a1d50b73180d6d768fe emul-linux-x86-baselibs-2.1.1.ebuild 690
-MD5 882e419a54a6f95e8a0355f223b94fcc emul-linux-x86-baselibs-2.2.ebuild 688
-MD5 358bb8888bb780fafb3147fa0a4d85ab emul-linux-x86-baselibs-2.2.2.ebuild 690
-MD5 88e8d88af9e4e569489474c02b1f6b55 emul-linux-x86-baselibs-2.2.3.ebuild 690
-MD5 3ac141b3a5850345c246b5c4ce924ccc files/75emul-linux-x86-base 51
-MD5 da0bdfe31fa4eb39ad7e1a660f4844cf files/digest-emul-linux-x86-baselibs-1.2.2-r2 83
+MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 31f67d1cdf921a2f2b2f9c382b0aa8a6 files/digest-emul-linux-x86-baselibs-1.2.3 83
-MD5 e2d7a44fb61bff476666cd877b51ccdf files/digest-emul-linux-x86-baselibs-2.1 81
 MD5 77cda1aa5665e5285b628704bdfbd798 files/digest-emul-linux-x86-baselibs-2.1.1 83
-MD5 caa4362fc0f56b2879dc6a03af790884 files/digest-emul-linux-x86-baselibs-2.2 81
-MD5 ed417c9bd0dbb43ea770327b1eb029bc files/digest-emul-linux-x86-baselibs-2.2.2 83
-MD5 59bb124908fb4e9e39da2a92d1fd0662 files/digest-emul-linux-x86-baselibs-2.2.3 83
+MD5 11a6590d407c63c518cd590a011d76a3 files/digest-emul-linux-x86-baselibs-2.1.2 83
+MD5 da0bdfe31fa4eb39ad7e1a660f4844cf files/digest-emul-linux-x86-baselibs-1.2.2-r2 83
+MD5 3ac141b3a5850345c246b5c4ce924ccc files/75emul-linux-x86-base 51
+MD5 e2d7a44fb61bff476666cd877b51ccdf files/digest-emul-linux-x86-baselibs-2.1 81
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.2.ebuild
index fa3775740f6c..2318f72741a4 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.2.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.2.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-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.2.ebuild,v 1.3 2005/07/30 19:34:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.2.ebuild,v 1.1 2005/08/01 00:26:55 herbs Exp $
 
 DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/emul-linux-x86-baselibs-${PV}.tar.bz2"
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.3.ebuild
deleted file mode 100644
index a8d2cfee4a09..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.3.ebuild,v 1.1 2005/07/31 21:00:18 blubb Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/emul-linux-x86-baselibs-${PV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND="virtual/libc
-	app-emulation/emul-linux-x86-glibc
-	app-emulation/emul-linux-x86-compat"
-
-src_install() {
-	cd ${WORKDIR}
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	doenvd ${FILESDIR}/75emul-linux-x86-base
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.ebuild
deleted file mode 100644
index 3eb08c583bed..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.2.ebuild,v 1.1 2005/07/29 19:18:18 blubb Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/emul-linux-x86-baselibs-${PV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND="virtual/libc
-	app-emulation/emul-linux-x86-glibc
-	app-emulation/emul-linux-x86-compat"
-
-src_install() {
-	cd ${WORKDIR}
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	doenvd ${FILESDIR}/75emul-linux-x86-base
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.1.2 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.1.2
new file mode 100644
index 000000000000..c10f15f365be
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.1.2
@@ -0,0 +1 @@
+MD5 9fbb1c1dabf885da1641d1984f95c9e4 emul-linux-x86-baselibs-2.1.2.tar.bz2 4418642
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2
deleted file mode 100644
index ed7bd0042dfa..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f76daa8c1c820cb11ea1a03d8585360e emul-linux-x86-baselibs-2.2.tar.bz2 7632859
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.2 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.2
deleted file mode 100644
index 13b4cd4f9ce8..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 515bb3f538aa925b7cdcbf6348ddf1bc emul-linux-x86-baselibs-2.2.2.tar.bz2 8722543
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.3 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.3
deleted file mode 100644
index 4144413c1c68..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96ef2a38f1d3873ee8fa18260a686ef1 emul-linux-x86-baselibs-2.2.3.tar.bz2 9153665