remove older glib, fixes #153930

(Portage version: 2.1.2_rc1-r1)
 (Unsigned Manifest commit)

3 files changed, 4 insertions, 87 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index fd6c384a8734..5d8c87f7743f 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -37,7 +37,6 @@ SHA256 2c98a14c2df57484e73525c4cc249a7e1a73da3ae97193b34dbc83981d5df9d6 files/gl
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
 DIST glib-2.10.3.tar.bz2 2774011 RMD160 da56e238f4f6e9c6e7c08d4e53f75128b5178047 SHA1 bba1dea73c4426f6a130c82e0b7a07b78dfc73ce SHA256 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f
 DIST glib-2.12.4.tar.bz2 2868828 RMD160 3aac5f23cedcef25f7fd7acb6d4ebfa744e38edc SHA1 35be8f8a7ce47bb0f53ffcd50605a6f9596ebd04 SHA256 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d
-DIST glib-2.6.5.tar.bz2 2357089 RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e SHA1 82818f9173b0bdc2b26af018e8393eb76318552e SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
 DIST glib-2.8.4.tar.bz2 2583226 RMD160 97090315719c578930b0d645aa6571a2c7fd49d0 SHA1 d6168689dee919013de71481286dc090e2d855d1 SHA256 386a10871ec48e2227d33c91c92ad026a5125a73a2fb64c687e354cdaffe9e33
 DIST glib-2.8.5.tar.bz2 2593263 RMD160 74de27c721360572b91ea3a40f22677d3c484c1e SHA1 40f0be13c1631988d795c440f86f75939690f341 SHA256 db0d7ee9e6d3d226415eb9be8f17d3798a5ad31fe15cd396dfcd92466e85d035
 DIST glib-2.8.6.tar.bz2 2691171 RMD160 54b3b5c96f5050793fbadbd523bc33b6bd36b257 SHA1 28731dc4799efc1824610971c88a571f18bd8471 SHA256 e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea
@@ -57,10 +56,6 @@ EBUILD glib-2.12.4-r1.ebuild 2323 RMD160 eae5f226dfb278aed49fdff9f0b89f5a7472c16
 MD5 3223bad5ae927df46071d5d8ad1d24ef glib-2.12.4-r1.ebuild 2323
 RMD160 eae5f226dfb278aed49fdff9f0b89f5a7472c166 glib-2.12.4-r1.ebuild 2323
 SHA256 3192a9d8975b6c84552cf0d060cbb68e65c09012f9d6b5b82c8dc2b37c28e7ec glib-2.12.4-r1.ebuild 2323
-EBUILD glib-2.6.5.ebuild 1637 RMD160 45bfe2cac23a1b6c1d4763288edf95caca1f3bf8 SHA1 b158294e78e20257d3cca2100e3aa2c7f496dc36 SHA256 9bb2c2fc744d01fdbefcf1b65788a9b21bbc99e33cede0ef6e06beb4234de234
-MD5 20bef98b3a8d7320ea7ef0370c4f733b glib-2.6.5.ebuild 1637
-RMD160 45bfe2cac23a1b6c1d4763288edf95caca1f3bf8 glib-2.6.5.ebuild 1637
-SHA256 9bb2c2fc744d01fdbefcf1b65788a9b21bbc99e33cede0ef6e06beb4234de234 glib-2.6.5.ebuild 1637
 EBUILD glib-2.8.4.ebuild 1680 RMD160 2a4399deadb61bee4976c0a6820997e8ecb224b4 SHA1 5eede016b67b62fc10a4d837c3dc7a8561f6a103 SHA256 439b0f83ee670b269fc00b93e92f02c6b8a19ef23b79f795195bfab3674dc420
 MD5 ede6270b3ec2da953bf762b51ad7f3e9 glib-2.8.4.ebuild 1680
 RMD160 2a4399deadb61bee4976c0a6820997e8ecb224b4 glib-2.8.4.ebuild 1680
@@ -73,10 +68,10 @@ EBUILD glib-2.8.6.ebuild 1595 RMD160 eac1d46e7a3853788c6454357acdb1496395e85f SH
 MD5 54af78d77d485d67e6ed85c88ac7a2ce glib-2.8.6.ebuild 1595
 RMD160 eac1d46e7a3853788c6454357acdb1496395e85f glib-2.8.6.ebuild 1595
 SHA256 ce7e945b7757aadb7fee653a5ccf51f5f2f8844b8d1b470efd9788d1836fa3db glib-2.8.6.ebuild 1595
-MISC ChangeLog 26365 RMD160 5c9d8d789c9caa896ec8e3c6bff42882be53cb1b SHA1 4879ea08fd958f35ae6e1dde58645e9acab929bf SHA256 c281edf3f9d71ceab23980f110cac85c128dd31a3ef8c3f56033191696d6f061
-MD5 7191ceb467052432f5b1d048da7cb83c ChangeLog 26365
-RMD160 5c9d8d789c9caa896ec8e3c6bff42882be53cb1b ChangeLog 26365
-SHA256 c281edf3f9d71ceab23980f110cac85c128dd31a3ef8c3f56033191696d6f061 ChangeLog 26365
+MISC ChangeLog 26479 RMD160 4f141661a57f5cfcd247859a19562b6306b76e44 SHA1 83cc337800be52328429b3e817642bf029b4a9b2 SHA256 5b7d5f41320df3636d6c602b9f5b685ea02e0d20198926042573945c7e15f6c4
+MD5 71487ed7577d10aabca63b0eb2e894ce ChangeLog 26479
+RMD160 4f141661a57f5cfcd247859a19562b6306b76e44 ChangeLog 26479
+SHA256 5b7d5f41320df3636d6c602b9f5b685ea02e0d20198926042573945c7e15f6c4 ChangeLog 26479
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -93,9 +88,6 @@ SHA256 d26cfbb6a042eef4f64ad487901b9f1ac518d1b68ae6d9210dc4c360d296b122 files/di
 MD5 a818fa2e2d171393aa71ad8ca6e41c57 files/digest-glib-2.12.4-r1 241
 RMD160 55fd2b02f9b2eb2d2fe2d327082d160804561aa4 files/digest-glib-2.12.4-r1 241
 SHA256 515021fa1093a388a691b5b8da0a6b7af19751778bde6a27be8986f56de93e3d files/digest-glib-2.12.4-r1 241
-MD5 a7b9d3a06223fc9e56965396cbf750f4 files/digest-glib-2.6.5 238
-RMD160 85d58622a049c71022ea3df8d74431c8234cefaa files/digest-glib-2.6.5 238
-SHA256 21157556ac047e73d0d2c475fad38b69abcf33ab2819d8fcbdf781c00bb53309 files/digest-glib-2.6.5 238
 MD5 fb587bb370ae7240e73de5e1a6edcca9 files/digest-glib-2.8.4 238
 RMD160 2cbd0b0ff439a75e4dcc32f265c612509505d176 files/digest-glib-2.8.4 238
 SHA256 7476e17946496973deac34edaf9781c82e206c9e9d0557ccdfd17bbee3e2361b files/digest-glib-2.8.4 238
diff --git a/dev-libs/glib/files/digest-glib-2.6.5 b/dev-libs/glib/files/digest-glib-2.6.5
deleted file mode 100644
index bd0809927402..000000000000
--- a/dev-libs/glib/files/digest-glib-2.6.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 777d2e34a60edad28319207b576cda91 glib-2.6.5.tar.bz2 2357089
-RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e glib-2.6.5.tar.bz2 2357089
-SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca glib-2.6.5.tar.bz2 2357089
diff --git a/dev-libs/glib/glib-2.6.5.ebuild b/dev-libs/glib/glib-2.6.5.ebuild
deleted file mode 100644
index 08158999a770..000000000000
--- a/dev-libs/glib/glib-2.6.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.5.ebuild,v 1.13 2006/11/03 15:04:21 grobian Exp $
-
-inherit libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc hardened static"
-
-DEPEND=">=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? ( >=dev-util/gtk-doc-1
-		=app-text/docbook-xml-dtd-4.1.2-r5 )"
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch
-
-	if use ppc64 && use hardened; then
-		replace-flags -O[2-3] -O1
-		epatch ${FILESDIR}/glib-2.6.3-testglib-ssp.patch
-	fi
-
-}
-
-src_compile() {
-
-	epunt_cxx
-
-	if use ppc-macos; then
-		glibtoolize
-		append-ldflags "-L/usr/lib -lpthread"
-	fi
-
-	econf \
-		--with-threads=posix \
-		`use_enable static` \
-		`use_enable doc gtk-doc` \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	# Do not install charset.alias for ppc-macos since it already exists.
-	if use ppc-macos ; then
-		einfo "Not installing charset.alias on macos"
-		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
-	fi
-
-	# Consider invalid UTF-8 filenames as locale-specific.
-	# FIXME : we should probably move to suggesting G_FILENAME_ENC
-	dodir /etc/env.d
-	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
-
-	dodoc AUTHORS ChangeLog* README* INSTALL NEWS*
-
-}