10 files changed, 17 insertions, 167 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4cbd3eb8f41b..df323b47aeaf 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,17 +1,9 @@
-MD5 acf79944d9936209ab729dd19fd11bef glib-2.2.2.ebuild 1285
-MD5 85c78f7588b2917c16ca143c5492c85a glib-2.0.4-r1.ebuild 1144
+MD5 3e2e367366a2e77e817728a71c9db3b6 glib-2.2.2.ebuild 1282
 MD5 16368ae632bfdd96446f00837202375f glib-2.2.1-r1.ebuild 1282
 MD5 14a7bed0ad380069f51c196524f5be6e glib-2.2.1.ebuild 1084
-MD5 be2591fa272af168e428742ad2413d62 glib-2.0.7.ebuild 1201
-MD5 9ac86f8a50313f8d6236ac95ee7be94c glib-2.0.6-r1.ebuild 1116
-MD5 5157359019fd4d2dd70a212a395dd117 ChangeLog 6418
-MD5 2e8fadc1f8d67966d7bdb49a2339dbe5 glib-2.2.0.ebuild 1071
+MD5 304b6b73c086485209cb2a5f4121d750 ChangeLog 6518
 MD5 6580187dc3c3cfe8af6f3dbe5a7bef78 glib-1.2.10-r5.ebuild 919
-MD5 bf2f7d93578b1c60592d10ea224d3a91 files/digest-glib-2.0.7 64
-MD5 cf1119c76b12f5a98f43c545c2764971 files/digest-glib-2.2.0 64
 MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1 64
 MD5 8edb351cbbf69e68f599f517e2152ca4 files/digest-glib-2.2.2 64
-MD5 2973c0e0c3d34ed347d5eec6414c9e23 files/digest-glib-2.0.4-r1 64
-MD5 e0f93192d689fc1202c5fbe37b9d29de files/digest-glib-2.0.6-r1 64
 MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1-r1 64
 MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
diff --git a/dev-libs/glib/files/digest-glib-2.0.4-r1 b/dev-libs/glib/files/digest-glib-2.0.4-r1
deleted file mode 100644
index b1a2f8a20d38..000000000000
--- a/dev-libs/glib/files/digest-glib-2.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4101c1f3fc1306eeb8f048f08e3f4b1 glib-2.0.4.tar.bz2 1463890
diff --git a/dev-libs/glib/files/digest-glib-2.0.6-r1 b/dev-libs/glib/files/digest-glib-2.0.6-r1
deleted file mode 100644
index c9112089bbed..000000000000
--- a/dev-libs/glib/files/digest-glib-2.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79e9dc83219e6ad4f95f3ffce5635203 glib-2.0.6.tar.bz2 1482363
diff --git a/dev-libs/glib/files/digest-glib-2.0.7 b/dev-libs/glib/files/digest-glib-2.0.7
deleted file mode 100644
index 6e007cb01b91..000000000000
--- a/dev-libs/glib/files/digest-glib-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5882b1e729f57cb18af653a2f504197b glib-2.0.7.tar.bz2 1510735
diff --git a/dev-libs/glib/files/digest-glib-2.2.0 b/dev-libs/glib/files/digest-glib-2.2.0
deleted file mode 100644
index fd7267c0c90a..000000000000
--- a/dev-libs/glib/files/digest-glib-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86da240d4d9b18d12b0b2097448d4373 glib-2.2.0.tar.bz2 1494036
diff --git a/dev-libs/glib/files/digest-glib-2.2.2 b/dev-libs/glib/files/digest-glib-2.2.2
new file mode 100644
index 000000000000..1259c29f0c28
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.2.2
@@ -0,0 +1 @@
+MD5 3e9a9512943c81a78cafa0536dcc8b41 glib-2.2.2.tar.bz2 1603828
diff --git a/dev-libs/glib/glib-2.0.4-r1.ebuild b/dev-libs/glib/glib-2.0.4-r1.ebuild
deleted file mode 100644
index 4995706c4f91..000000000000
--- a/dev-libs/glib/glib-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.4-r1.ebuild,v 1.9 2003/02/13 10:38:44 vapier Exp $
-
-IUSE="doc"
-
-inherit debug
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gtk.org/"
-
-SLOT="2"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-# libiconv breaks other stuff
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	# Seems libtool have another wierd bug, try to fix it
-	# with a fix for nautilus, bug #4190
-	elibtoolize --reverse-deps
-	
-	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc"
-	use doc || myconf="${myconf} --disable-gtk-doc"
-
-	econf \
-		--with-threads=posix \
-		--enable-debug=yes \
-		${myconf} || die
-
-	# you cannot disable debug or this will fail building.
-	# odd but true :/
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO.xml
-}
diff --git a/dev-libs/glib/glib-2.0.6-r1.ebuild b/dev-libs/glib/glib-2.0.6-r1.ebuild
deleted file mode 100644
index d7e484b0b2fb..000000000000
--- a/dev-libs/glib/glib-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.6-r1.ebuild,v 1.10 2003/02/13 10:38:50 vapier Exp $
-
-IUSE="doc"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gtk.org/"
-
-SLOT="2"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-# libiconv breaks other stuff
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	# Seems libtool have another wierd bug, try to fix it
-	# with a fix for nautilus, bug #4190
-	elibtoolize --reverse-deps
-	
-	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc"
-	use doc || myconf="${myconf} --disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug=yes"
-    fi
-
-	econf \
-		--with-threads=posix \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO.xml
-}
diff --git a/dev-libs/glib/glib-2.0.7.ebuild b/dev-libs/glib/glib-2.0.7.ebuild
deleted file mode 100644
index 6182325c487c..000000000000
--- a/dev-libs/glib/glib-2.0.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.7.ebuild,v 1.10 2003/02/13 10:38:56 vapier Exp $
-
-IUSE="doc"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gtk.org/"
-
-SLOT="2"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc"
-# 2.0.7 is broken on alpha, so please don't add ~alpha until it
-# becomes patched with a fix.
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-# libiconv breaks other stuff
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	# Seems libtool have another wierd bug, try to fix it
-	# with a fix for nautilus, bug #4190
-	elibtoolize --reverse-deps
-	
-	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc"
-	use doc || myconf="${myconf} --disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug=yes"
-    fi
-
-	econf \
-		--with-threads=posix \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO.xml
-}
diff --git a/dev-libs/glib/glib-2.2.0.ebuild b/dev-libs/glib/glib-2.2.2.ebuild
index a3ca8e46882b..5336f57fc787 100644
--- a/dev-libs/glib/glib-2.2.0.ebuild
+++ b/dev-libs/glib/glib-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.0.ebuild,v 1.8 2003/03/04 21:30:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.2.ebuild,v 1.1 2003/06/10 13:30:40 foser Exp $
 
 inherit libtool
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 SLOT="2"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
 
 DEPEND=">=dev-util/pkgconfig-0.14.0
 	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
@@ -42,6 +42,18 @@ src_compile() {
 
 src_install() {
 	einstall || die
+
+	# Consider invalid UTF-8 filenames as locale-specific.
+	dodir /etc/env.d
+	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
     
 	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3
 }
+
+pkg_postinst() {
+	env-update
+}
+
+pkg_postrm() {
+	env-update
+}