possible fix for random failures on initial builds

8 files changed, 36 insertions, 122 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index e5854e05ea8e..e0c5fe6e60cc 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,14 +1,19 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.15 2002/06/16 02:08:58 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.16 2002/06/30 00:40:57 azarah Exp $
 
+*glib-2.0.4-r1 (30 Jun 2002)
+  30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> glib-2.0.4.ebuild-r1 :
+  Try to fix bug #4190 with a fix for nautilus. Seems we have
+  another libtool bug to recon with.
+
+  http://bugzilla.gnome.org/show_bug.cgi?id=75635
 
 *glib-2.0.4 (15 Jun 2002)
   15 Jun 2002; Spider <spider@gentoo.org> glib-2.0.4.ebuild :
   libtool fix with elibtoolize
   move deubg ot debug.eclass
 
-
 *glib-2.0.2 (28 May 2002)
   28 May 2002; Spider <spider@gentoo.org> glib-2.0.2.ebuild: 
   new version
@@ -21,7 +26,6 @@
 
   Removed glib-2.0.1-r5.ebuild files/digest-glib-2.0.1-r5
 
-
 *glib-2.0.0-r5 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org> glib-2.0.1-r5.ebuild:
   return debug info into this for the upcoming gnome2 testing
@@ -31,12 +35,12 @@
 *glib-2.0.0-r4 (1 May 2002)
   1 May 2002 ; Spider <spider@gentoo.org> glib-2.0.1-r4.ebuild:
   remove libiconv again, this seems to have been a mistake as some other
-things break because of it. hope I didn't mess too much up
-
-in case of problems:
-	remove libiconv, emerge glibc, log out and in again (needed for ld.so.conf/preload ) and you can emerge glib again. Sorry for the inconvenience.
-
-
+  things break because of it. hope I didn't mess too much up in case
+  of problems:
+  
+	remove libiconv, emerge glibc, log out and in again (needed for
+	ld.so.conf/preload ) and you can emerge glib again. Sorry for the
+	inconvenience.
 
 *glib-2.0.0-r3 (1 MayApr 2002)
   1 May 2002 ; Spider <spider@gentoo.org> glib-2.0.1-r3.ebuild:
@@ -48,7 +52,8 @@ in case of problems:
 
 *glib-2.0.0-r1 (11 Apr 2002)
   11 Apr 2002 ; Spider <spider@gentoo.org> glib-2.0.1-r1.ebuild:
-  This is a release of the glib 2.0, new API makes it incompatible with glib 1.2 and thus you need both versions installed.
+  This is a release of the glib 2.0, new API makes it incompatible
+  with glib 1.2 and thus you need both versions installed.
 
 *glib-1.2.10-r4 (21 Mar 2002)
 
diff --git a/dev-libs/glib/files/digest-glib-1.2.10-r3 b/dev-libs/glib/files/digest-glib-1.2.10-r3
deleted file mode 100644
index af2d880d96fe..000000000000
--- a/dev-libs/glib/files/digest-glib-1.2.10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz 421480
diff --git a/dev-libs/glib/files/digest-glib-2.0.1-r3 b/dev-libs/glib/files/digest-glib-2.0.1-r3
deleted file mode 100644
index 7cceb72b2250..000000000000
--- a/dev-libs/glib/files/digest-glib-2.0.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d81814a57f3861c3077e55870faabede glib-2.0.1.tar.bz2 1409749
diff --git a/dev-libs/glib/files/digest-glib-2.0.1-r4 b/dev-libs/glib/files/digest-glib-2.0.1-r4
deleted file mode 100644
index 7cceb72b2250..000000000000
--- a/dev-libs/glib/files/digest-glib-2.0.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d81814a57f3861c3077e55870faabede glib-2.0.1.tar.bz2 1409749
diff --git a/dev-libs/glib/files/digest-glib-2.0.4-r1 b/dev-libs/glib/files/digest-glib-2.0.4-r1
new file mode 100644
index 000000000000..b1a2f8a20d38
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.0.4-r1
@@ -0,0 +1 @@
+MD5 a4101c1f3fc1306eeb8f048f08e3f4b1 glib-2.0.4.tar.bz2 1463890
diff --git a/dev-libs/glib/glib-1.2.10-r3.ebuild b/dev-libs/glib/glib-1.2.10-r3.ebuild
deleted file mode 100644
index d8604bf189d0..000000000000
--- a/dev-libs/glib/glib-1.2.10-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r3.ebuild,v 1.1 2002/03/05 04:13:56 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
-	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${P}.tar.gz"
-HOMEPAGE="http://www.gtk.org/"
-
-DEPEND="virtual/glibc"
-SLOT="1"
-
-src_compile() {
-	local myconf
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --with-threads=posix \
-		    --enable-debug=yes || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
-	     install || die
-    
-	( cd ${D}/usr/lib ; chmod 755 libgmodule-1.2.so.* )
-
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-
-	cd docs
-	docinto html
-	dodoc glib.html glib_toc.html
-}
diff --git a/dev-libs/glib/glib-2.0.1-r3.ebuild b/dev-libs/glib/glib-2.0.1-r3.ebuild
deleted file mode 100644
index 86f3d64228a3..000000000000
--- a/dev-libs/glib/glib-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Spider <spider@gentoo.org>
-# Maintainer: Spider <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.1-r3.ebuild,v 1.1 2002/05/01 14:42:06 spider Exp $
-
-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/"
-LICENSE="LGPL-2.1"
-SLOT="2"
-
-DEPEND="virtual/glibc
-		>=dev-libs/libiconv-1.7
-		>=dev-util/pkgconfig-0.12.0
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-RDEPEND="virtual/glibc
-		>=dev-libs/libiconv-1.7"
-
-src_compile() {
-	libtoolize --copy --force
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --with-threads=posix \
-			--with-libiconv=gnu \
-			${myconf} \
-		    --enable-debug=yes || die
-# you cannot disable debug or this will fail building.
-# odd but true :/
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
-	     install || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO.xml
-}
-
-
-
-
-
diff --git a/dev-libs/glib/glib-2.0.1-r4.ebuild b/dev-libs/glib/glib-2.0.4-r1.ebuild
index dd7bfec6e454..c152ee58760f 100644
--- a/dev-libs/glib/glib-2.0.1-r4.ebuild
+++ b/dev-libs/glib/glib-2.0.4-r1.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Spider <spider@gentoo.org>
 # Maintainer: Spider <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.1-r4.ebuild,v 1.4 2002/05/06 20:40:24 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.4-r1.ebuild,v 1.1 2002/06/30 00:40:57 azarah Exp $
+
+inherit debug
+inherit libtool
+
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GLib library of C routines"
@@ -12,8 +16,8 @@ LICENSE="LGPL-2.1"
 SLOT="2"
 
 DEPEND="virtual/glibc
-		>=dev-util/pkgconfig-0.12.0
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
 
 
 # libiconv breaks other stuff
@@ -21,21 +25,21 @@ DEPEND="virtual/glibc
 RDEPEND="virtual/glibc"
 
 src_compile() {
-	libtoolize --copy --force
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
+	# 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"
 	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --with-threads=posix \
-			${myconf} \
-		    --enable-debug=yes || die
-
-# This had to be removed since it broke other stuff. darn. 2002-05-03
-#	--with-libiconv=gnu \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--with-threads=posix \
+		${myconf} \
+		--enable-debug=yes || die
 
- 
 # you cannot disable debug or this will fail building.
 # odd but true :/