Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt actually do anything).

3 files changed, 29 insertions, 35 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index b1663f77a8bf..0f6d819d22cb 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.108 2004/12/16 10:15:13 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.109 2004/12/17 06:57:17 vapier Exp $
+
+  17 Dec 2004; Mike Frysinger <vapier@gentoo.org> glib-1.2.10-r5.ebuild:
+  Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt
+  actually do anything).
 
   16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> glib-2.4.7.ebuild:
   Stable on amd64.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 54d0bad5361e..f4fc1222f2a2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,19 +1,29 @@
-MD5 9a1c2146e36d67c60fc62b719cd18108 ChangeLog 13178
-MD5 5aae64734de3bfb4df4a2d569837e85e glib-1.2.10-r5.ebuild 2193
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b5ba05997da3b1ff3017809fd31600c9 ChangeLog 13354
+MD5 2ccc3719f58423601d7575de128d59ad glib-1.2.10-r5.ebuild 1388
 MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997
 MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046
+MD5 beb86384f4ed20c39b2205fabbb7300c glib-2.4.6.ebuild 1365
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ed2973a7556bf32bd2b4509b3eb3ee5b glib-2.4.4.ebuild 1384
 MD5 7b065119358561f4d6ea80b7713b8683 glib-2.4.5.ebuild 1366
-MD5 beb86384f4ed20c39b2205fabbb7300c glib-2.4.6.ebuild 1365
 MD5 1df5b9ffd5897a0d710bed320cacff5d glib-2.4.7.ebuild 1374
 MD5 8d4de4a4378d413925925a02d48e3d84 glib-2.4.8.ebuild 1374
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
 MD5 9409a054bd000d556e84987a855b10f0 files/digest-glib-2.4.1 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64
-MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64
 MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
+MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
+MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64
 MD5 c2049695996219f5b8c81ad1b89f40f0 files/digest-glib-2.4.7 64
 MD5 394ed1e8214a881afbed68f0fa2546c9 files/digest-glib-2.4.8 64
-MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBwoNaroRuSHgZdywRAqPIAJ9AO/r/mUInsVS8M+ybnsBbKesM6gCeOeH5
+DBvAVgPOeZqPLxHYh9bMDmY=
+=/h0H
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index 77f15a8ecd4d..839739b63e44 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.35 2004/11/12 21:18:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.36 2004/12/17 06:57:17 vapier Exp $
 
-inherit libtool gnuconfig flag-o-matic eutils
+inherit libtool flag-o-matic eutils
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -19,33 +19,13 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 
-	# Allow glib to build with gcc-3.4.x
-	# Closes Bug #47047
+	# Allow glib to build with gcc-3.4.x #47047
 	epatch ${FILESDIR}/${P}-gcc34-fix.patch
+
+	uclibctoolize
 }
 
 src_compile() {
-	elibtoolize
-
-	# elibtoolize breaks (see brad's comments below, left here for
-	# historical purposes) but libtoolize won't work either because
-	# there is no libtoolize in the stage1 and it brings in nasty
-	# deps if you try to install it during bootstrap.
-	# elibtoolize seems to be working decently on x86. As a temporary
-	# fix for amd64 users to be able to bootstrap, we run gnuconfig.
-	# The glib .a's will be broken, but it's a start.
-	# See bug 47950 for more information.
-	# -- avenj@gentoo.org  19 Apr 04
-
-	gnuconfig_update
-
-
-	# For some reason, elibtoolize stopped doing its job in the last couple
-	# of days on this ebuild, and amd64 won't compile it anymore, need to
-	# manually run libtoolize, I need to inspect the libtool.eclass I guess.
-	# Brad House <brad_mssw@gentoo.org> 1/2/2004
-#	libtoolize -c -f
-
 	# Bug 48839: pam fails to build on ia64
 	# The problem is that it attempts to link a shared object against
 	# libglib.a; this library needs to be built with -fPIC.  Since
@@ -55,13 +35,13 @@ src_compile() {
 
 	econf \
 		--with-threads=posix \
-		--enable-debug=yes || die
-
+		--enable-debug=yes \
+		|| die
 	emake || die
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
 
 	dodoc AUTHORS ChangeLog README* INSTALL NEWS
 	dohtml -r docs