Clean up old revisions.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

10 files changed, 22 insertions, 554 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 78f3230a718f..f6cfa4c868df 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.346 2009/02/15 12:33:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.347 2009/02/15 23:07:23 eva Exp $
+
+  15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/glib-2.16.3-pcre-buffer-overflow.patch, -glib-2.14.3.ebuild,
+  -glib-2.14.6.ebuild, -glib-2.16.3-r1.ebuild, glib-2.16.5.ebuild,
+  -glib-2.18.1.ebuild, -glib-2.18.2.ebuild, -glib-2.18.3.ebuild:
+  Clean up old revisions.
 
   15 Feb 2009; Raúl Porcel <armin76@gentoo.org> glib-2.16.6.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #245092
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 9a154287e374..49e1f3eea20e 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,33 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
 AUX glib-1.2.10-gcc34-fix.patch 2008 RMD160 7e92b8842a8232cada12453d7f5e5a587a2bf496 SHA1 cb9c6e2f5320590713b3fba61f1d984e569d5d08 SHA256 848620bc200c2a42d726744fe6c36e20a396624e82b0c742b726dd72287e6cdd
 AUX glib-1.2.10-m4.patch 225 RMD160 65218d0099218a1008827c1364b6e51c073d236b SHA1 e9198bde79320d76ad942d42a0292acb5d216a86 SHA256 c470b3ecc3b8fd6a2d52df816a1c4ccb3ad2d6048e37894f415c8ea9c7925b68
 AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
-AUX glib-2.16.3-pcre-buffer-overflow.patch 615 RMD160 b7f582308f450da71a8f686674953ae33e14d3af SHA1 e9798ea68ab2d54d64cf37c9a8d527d207fb91d7 SHA256 612f39f6daab94f1f497ee694963d436fa27bf2616c210a3c5dc6ba0546e3397
 AUX glib-2.18.1-gdesktopappinfo-memleak-fix.patch 923 RMD160 d2faf5b5e56cbd18964a6ff9e16c9ab4a293b291 SHA1 3cc525ae5a72a136e6a6865fd798a8a243f62954 SHA256 4da338e3e1406a8a6097990173abe1ba56a3440df35f610524bcf243f69afafe
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
-DIST glib-2.14.3.tar.bz2 3339169 RMD160 d66ec2f7bf8e9fe1ab9e0191b55f46f9b711ca4c SHA1 3aef290ceaf17379b2fe24d8fdfb5ce6755d5f25 SHA256 9aab688e48771f49072ba5b483d17d9275959db404d623452fa36b85cd776993
-DIST glib-2.14.6.tar.bz2 3406651 RMD160 a5ba2792f16c1e0dafc3190e71e3f529cd687c2f SHA1 f2e2a5323357516ccb813d9e7f3921ef1e490079 SHA256 78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba
-DIST glib-2.16.3.tar.bz2 4540919 RMD160 72260f5f9022ee3f97b79b5705ad6117adc279fd SHA1 f73fd53130a46f21ff4ee9faa69b9956787c571e SHA256 562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
 DIST glib-2.16.5.tar.bz2 4570123 RMD160 ba5e2b0b0867fdcc570ffc3a074ac5ff04b7d72f SHA1 9f5921bd46ccdf4ad80084cf424b8516f2dddd19 SHA256 cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
 DIST glib-2.16.6.tar.bz2 4575345 RMD160 3ab0a0353a4d890841cc1b5e640ea41c58e57a6e SHA1 d481c9a99d5fe89ff8137da7fd7d690f5a479795 SHA256 c3d8f831b8d127905f8e7f066ff5398668fa26f6a180945b32a5641c03c42925
-DIST glib-2.18.1.tar.bz2 4725213 RMD160 264b37584419d983685910adde8f7b282eccc1ad SHA1 d34a30cfccc8322dfe4198d26cf6bfc0210f141b SHA256 57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0
-DIST glib-2.18.2.tar.bz2 4760532 RMD160 52df56375dd97c07837ae085dc045cf29d6f59a1 SHA1 4eaf73feda42e8ecf00654f56e38f7fedd6a9266 SHA256 95e99ab4f1ccc9abd48636ae2aeefa102d9749a5fc8ea6386e44683942fd7333
-DIST glib-2.18.3.tar.bz2 4835503 RMD160 cf43fbba04250becaabdb7b7f55bcdec584f019e SHA1 293f639fb85ea47347eb34e122327c60ef7606e4 SHA256 9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36
 DIST glib-2.18.4.tar.bz2 4809051 RMD160 c47a71708fd13ade70d72d3443799d3e74a0459d SHA1 3e21395c6980e3970d5260b46ecb6b87f2482c61 SHA256 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100
 EBUILD glib-1.2.10-r5.ebuild 1764 RMD160 dc6544841f2acb73d5951100ce9c9182f4d9560e SHA1 e6649f70934720527f69995ab0b8c845032cfb0f SHA256 24442b44089e15432a4f1411d2d59dff9d5c2fbfb91c801b96087588ff71373b
-EBUILD glib-2.14.3.ebuild 2117 RMD160 dd9252c97f6ed30b63151a6afd72aaf5b74b490a SHA1 21c8a126ccafb902c8956f66c009ec13970ee0eb SHA256 05227d4c85af5cc106c9db1793eaf73cb86efd874733a975b88723f9d57becbd
-EBUILD glib-2.14.6.ebuild 2109 RMD160 18cc0a114af0aebdb3ac77cad458f703e8608a42 SHA1 1dd51dededab2638cb55422da117141d0c386dd2 SHA256 f95e75f918769c3f3fbc33763d3f3f9ff14f49cd621832e3d53f817ef1c8663b
-EBUILD glib-2.16.3-r1.ebuild 2690 RMD160 74e741f77323a19adfd8f4a7a149d9f8a5cc9f65 SHA1 f8b2e9895c9b5fb1a1448ada9ffd0192f65dd2b8 SHA256 d712d44150b5ce754e6ccec1b9870940385fab7b42d6f4cfe25dc062c1ed8680
-EBUILD glib-2.16.5.ebuild 2235 RMD160 7c7a628807ae5631130fd48185079266ac48bf6d SHA1 d7305721ec3be2fb9d0382aaba846ccf31197137 SHA256 d3a577e3e856a5ce7c08b2a64201b9999c1ca97b62de87f185bd5717dad40ae8
+EBUILD glib-2.16.5.ebuild 2162 RMD160 be6b9ae702d6f3ef43cc168f69c44552096c6643 SHA1 4d08cc26f212f27ceee2e996272f5860265b3710 SHA256 e15e58de2ffe109511f8b929cc6cb5fc1786b785869cd4055252ed00dec15f53
 EBUILD glib-2.16.6.ebuild 2415 RMD160 3b72cc010d5726ed9293531ac4279f9c558ba0a4 SHA1 db87f07c3f9589e5a5fe15f8ea0c9ec8540409fc SHA256 e0edfd65f9077bfe4ede1b78c4a3a50585d96b345b79f6171bf56cbb2fad6147
-EBUILD glib-2.18.1.ebuild 2589 RMD160 b440f9f4e929005b4df183bd69a3d5a6535df495 SHA1 294d3a96d9c45c510d804c4809ef01eae7cc5551 SHA256 c5f750e7099adeaffd8f73089c06cc948295de24afa032ceb1a5e3555a7e7718
-EBUILD glib-2.18.2.ebuild 2475 RMD160 ddf57e63ed53b2fcef38b595c9e1bf7cd8d1bcab SHA1 8a9b0cdd01c2fcfa6e9a4ec6b0d3e9a413eac0b9 SHA256 1c573caf7b544d2cfb0dac121a7864e6030486ed8ecf09d5d87021f2054e67a1
-EBUILD glib-2.18.3.ebuild 2475 RMD160 aff7bf7ed0212f93ac642419c17f5372e47540ea SHA1 c44b7f30fdee7f9a7cc8310794dcbd5f593edbbc SHA256 1dc3c2fab427f7220be83c09610ba34815ac20a47ccd38ac15cc84f89e65882b
 EBUILD glib-2.18.4.ebuild 2475 RMD160 a90c807e1d0b3b387d5b695fa9a6d4e62d0e4e86 SHA1 48aec9739b13c23869bc74f5bd73220cbc8b2181 SHA256 9919f50a5eff9f90024bd1f4fdc11658bf1d7740f8fcbe3724c5e2b33d851d15
-MISC ChangeLog 41996 RMD160 4a877390a96ba4fe8b576291a470a5b7bcbc9d1e SHA1 3f331760a2fae083f1d29e36657f4fc9064536fb SHA256 8efe96b5d73a4f319956e730f936571d60a5559eedbefcefadb1dff6c41c3674
+MISC ChangeLog 42275 RMD160 c14c01ae219fad72503935e9688a452b1cbbf134 SHA1 6e53742c2c10549282f85a3684b569b94fb7d660 SHA256 465c415412449d3498402c47c60d8830e45314fff5012973df645d6c794e2533
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmYoDIACgkQ1fmVwcYIWAbElACgq/X91KLixFbEe28ic2EaHI3c
+rs0AoMiG+M5nsaXlO+seXSwu/0Ti5R2b
+=6BLk
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch b/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch
deleted file mode 100644
index 18fd0525be48..000000000000
--- a/dev-libs/glib/files/glib-2.16.3-pcre-buffer-overflow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- glib/pcre/pcre_compile.c.orig	2008-06-30 10:42:54.000000000 +0300
-+++ glib/pcre/pcre_compile.c	2008-06-30 10:43:10.000000000 +0300
-@@ -4699,11 +4699,11 @@ we set the flag only if there is a liter
-           {
-           if (code == cd->start_code + 1 + LINK_SIZE &&
-                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
-             {
-             cd->external_options = newoptions;
--            options = newoptions;
-+            options = *optionsptr = newoptions;
-             }
-          else
-             {
-             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
-               {
diff --git a/dev-libs/glib/glib-2.14.3.ebuild b/dev-libs/glib/glib-2.14.3.ebuild
deleted file mode 100644
index 081e89e7d7fe..000000000000
--- a/dev-libs/glib/glib-2.14.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.14.3.ebuild,v 1.14 2008/08/03 22:36:31 eva Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="arm m68k ~mips s390 sh"
-IUSE="debug doc hardened"
-
-RDEPEND="virtual/libc
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.14
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# help the asyncqueue-test pass:
-	use hppa && replace-flags -O[2-3] -O1
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	sed -e "s/MATCH_LIMIT_RECURSION=10000000/MATCH_LIMIT_RECURSION=8192/g" \
-		-i "${S}/glib/pcre/Makefile.in" "${S}/glib/pcre/Makefile.am"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	epunt_cxx
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf \
-		$(use_enable doc gtk-doc) \
-		${myconf} \
-		--with-threads=posix \
-		--enable-static || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}
diff --git a/dev-libs/glib/glib-2.14.6.ebuild b/dev-libs/glib/glib-2.14.6.ebuild
deleted file mode 100644
index 052fa41847d1..000000000000
--- a/dev-libs/glib/glib-2.14.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.14.6.ebuild,v 1.8 2008/11/04 03:36:55 vapier Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc hardened"
-
-RDEPEND="virtual/libc
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.11
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	sed -e "s/MATCH_LIMIT_RECURSION=10000000/MATCH_LIMIT_RECURSION=8192/g" \
-		-i "${S}/glib/pcre/Makefile.in" "${S}/glib/pcre/Makefile.am"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	epunt_cxx
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf \
-		$(use_enable doc gtk-doc) \
-		${myconf} \
-		--with-threads=posix \
-		--enable-static || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}
diff --git a/dev-libs/glib/glib-2.16.3-r1.ebuild b/dev-libs/glib/glib-2.16.3-r1.ebuild
deleted file mode 100644
index 55911e94b66d..000000000000
--- a/dev-libs/glib/glib-2.16.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.16.3-r1.ebuild,v 1.4 2008/11/04 03:36:55 vapier Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libc
-		 virtual/libiconv
-		 xattr? ( sys-apps/attr )
-		 fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.16
-		>=sys-devel/gettext-0.11
-		doc?	(
-					>=dev-libs/libxslt-1.0
-					>=dev-util/gtk-doc-1.8
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	sed -e "s/MATCH_LIMIT_RECURSION=10000000/MATCH_LIMIT_RECURSION=8192/g" \
-		-i "${S}/glib/pcre/Makefile.in" "${S}/glib/pcre/Makefile.am"
-
-	# Bug 230039, heap based buffer overflow in included copy of pcre (CVE-2008-2371)
-	epatch "${FILESDIR}/${P}-pcre-buffer-overflow.patch"
-
-	# GNOME bug #538836, fix gio test failure on various arches
-	sed -i -e 's:|\\<g_atomic_int\\|:|\\<g_atomic_int\\|\\<g_atomic_pointer_get\\|:' \
-		"${S}/gio/pltcheck.sh"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --with-threads=posix || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}
diff --git a/dev-libs/glib/glib-2.16.5.ebuild b/dev-libs/glib/glib-2.16.5.ebuild
index 55cc56483fe5..707e12a79938 100644
--- a/dev-libs/glib/glib-2.16.5.ebuild
+++ b/dev-libs/glib/glib-2.16.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.16.5.ebuild,v 1.9 2008/11/13 18:56:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.16.5.ebuild,v 1.10 2009/02/15 23:07:23 eva Exp $
 
 inherit gnome.org libtool eutils flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS=" m68k ppc ppc64"
 IUSE="debug fam hardened selinux xattr"
 
 RDEPEND="virtual/libc
diff --git a/dev-libs/glib/glib-2.18.1.ebuild b/dev-libs/glib/glib-2.18.1.ebuild
deleted file mode 100644
index b5a2488e5462..000000000000
--- a/dev-libs/glib/glib-2.18.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.1.ebuild,v 1.3 2009/02/13 21:41:14 klausman Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libc
-		 virtual/libiconv
-		 xattr? ( sys-apps/attr )
-		 fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.16
-		>=sys-devel/gettext-0.11
-		doc?	(
-					>=dev-libs/libxslt-1.0
-					>=dev-util/gtk-doc-1.8
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Plug a small memory leak, will be included in 2.18.2
-	epatch "${FILESDIR}/${P}-gdesktopappinfo-memleak-fix.patch"
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${P}-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --with-threads=posix || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}
diff --git a/dev-libs/glib/glib-2.18.2.ebuild b/dev-libs/glib/glib-2.18.2.ebuild
deleted file mode 100644
index 469612343ac2..000000000000
--- a/dev-libs/glib/glib-2.18.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.2.ebuild,v 1.1 2008/10/19 02:16:37 leio Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libc
-		 virtual/libiconv
-		 xattr? ( sys-apps/attr )
-		 fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.16
-		>=sys-devel/gettext-0.11
-		doc?	(
-					>=dev-libs/libxslt-1.0
-					>=dev-util/gtk-doc-1.8
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --with-threads=posix || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}
diff --git a/dev-libs/glib/glib-2.18.3.ebuild b/dev-libs/glib/glib-2.18.3.ebuild
deleted file mode 100644
index 404fb7e7eb7d..000000000000
--- a/dev-libs/glib/glib-2.18.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.3.ebuild,v 1.1 2008/11/27 01:51:33 leio Exp $
-
-inherit gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc fam hardened selinux xattr"
-
-RDEPEND="virtual/libc
-		 virtual/libiconv
-		 xattr? ( sys-apps/attr )
-		 fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.16
-		>=sys-devel/gettext-0.11
-		doc?	(
-					>=dev-libs/libxslt-1.0
-					>=dev-util/gtk-doc-1.8
-					~app-text/docbook-xml-dtd-4.1.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use ppc64 && use hardened ; then
-		replace-flags -O[2-3] -O1
-		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
-	fi
-
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# Don't fail gio tests when ran without userpriv, upstream bug 552912
-	# This is only a temporary workaround, remove as soon as possible
-	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	epunt_cxx
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	# always build static libs, see #153807
-	econf ${myconf}                 \
-		  $(use_enable xattr)       \
-		  $(use_enable doc man)     \
-		  $(use_enable doc gtk-doc) \
-		  $(use_enable fam)         \
-		  $(use_enable selinux)     \
-		  --enable-static           \
-		  --with-threads=posix || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${D}/usr/lib/charset.alias"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-}