libtool, debug, single task make and some other stuff. and remove the old things

5 files changed, 40 insertions, 78 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 373e33bcd4f3..63f94631abf9 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.10 2002/04/24 13:57:59 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.11 2002/05/22 19:51:12 spider Exp $
+
+*gtk+-2.0.2-r4 (22 May 2002)                                                    
+  22 May 2002; Spider <spider@gentoo.org> gtk+-2.0.2-r4.ebuild:
+  lintool check
+  debug info back inside
+  remove libtoolize since it breaks things
+  singlethread make since this uses cludgy code 
 
-  14 Apr 2002; M.Schlemmer <azarah@gentoo.org>; gtk+-1.2.10-r7.ebuild :
 
+gtk+-1.2.10-r7 (14 Apr 2002)
+  14 Apr 2002; M.Schlemmer <azarah@gentoo.org>; gtk+-1.2.10-r7.ebuild :
   Libtoolize.
 
 *gtk+-2.0.2-r2 (24 Apr 2002) 
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.2-r2 b/x11-libs/gtk+/files/digest-gtk+-2.0.2-r2
deleted file mode 100644
index 665e7da38da8..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8df4c513323b9efc9a157703f25a07f gtk+-2.0.2.tar.bz2 5683089
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.2-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.2-r4
index 665e7da38da8..665e7da38da8 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.0.2-r1
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.2-r4
diff --git a/x11-libs/gtk+/gtk+-2.0.2-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.2-r1.ebuild
deleted file mode 100644
index 6b16c2ac9faa..000000000000
--- a/x11-libs/gtk+/gtk+-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,56 +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>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.2-r1.ebuild,v 1.3 2002/05/21 18:14:11 danarmak Exp $
-
-# ACONFVER=2.52f
-# AMAKEVER=1.5b
-# inherit autotools 
-
-SLOT="2"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gtk.org/"
-
-DEPEND="virtual/x11
-		>=dev-util/pkgconfig-0.12.0
-		>=dev-libs/glib-2.0.1
-		>=dev-libs/atk-1.0.1
-		>=x11-libs/pango-1.0.1
-		>=media-libs/libpng-1.2.1
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/tiff-3.5.7
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-gdktarget=x11 \
-		${myconf} \
-		--enable-debug || die
-# enable debug since glib fails if we disable it
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-		prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		install || die
-	dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO
-}
-
-
-
-
-
diff --git a/x11-libs/gtk+/gtk+-2.0.2-r2.ebuild b/x11-libs/gtk+/gtk+-2.0.2-r4.ebuild
index 0421c6a04665..b924efbe5d8b 100644
--- a/x11-libs/gtk+/gtk+-2.0.2-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.0.2-r4.ebuild
@@ -1,31 +1,38 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Spider  <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.2-r2.ebuild,v 1.4 2002/05/21 18:14:11 danarmak Exp $
-
-# ACONFVER=2.52f
-# AMAKEVER=1.5b
-# inherit autotools 
+# Author: Spider  <spider@gentoo.org>
+# Maintainer: Spider <spider@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.2-r4.ebuild,v 1.1 2002/05/22 19:51:12 spider Exp $
 
 SLOT="2"
 
+# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+# force debug information
+CFLAGS="${CFLAGS} -g"
+CXXFLAGS="${CXXFLAGS} -g"
+
+
 S=${WORKDIR}/${P}
 DESCRIPTION="Gimp ToolKit + "
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
 HOMEPAGE="http://www.gtk.org/"
+LICENSE="LGPL-2.1"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.0.1
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.0.1
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
 
-DEPEND="virtual/x11
-		>=dev-util/pkgconfig-0.12.0
-		>=dev-libs/glib-2.0.1
-		>=dev-libs/atk-1.0.1
-		>=x11-libs/pango-1.0.1
-		png? ( >=media-libs/libpng-1.2.1 )
-		jpeg? ( >=media-libs/jpeg-6b-r2 )
-		tiff? ( >=media-libs/tiff-3.5.7 )
-		doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	 doc? ( >=dev-util/gtk-doc-0.9 )"
 
 src_compile() {
-	libtoolize --copy --force
 	local myconf
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use png ||  myconf="${myconf} --without-libpng"
@@ -41,10 +48,13 @@ src_compile() {
 		${myconf} \
 		--enable-debug || die
 # enable debug since glib fails if we disable it
-	emake || die
+
+# gtk+ isn't multithread friendly due to some obscure code generation bug
+	make || die
 }
 
 src_install() {
+	dodir /etc/gtk-2.0
 	make DESTDIR=${D} \
 		prefix=/usr \
 		sysconfdir=/etc \
@@ -55,6 +65,7 @@ src_install() {
 }
 
 
-
-
+pkg_postinst() {
+	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
+}