modified a lot of DEBUG things to DEBUGBUILD and updated the latest version

6 files changed, 73 insertions, 9 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 395a74dcdc02..c334e91376d6 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,12 +1,22 @@
 # 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.31 2003/01/18 13:38:30 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.32 2003/02/04 06:02:09 spider Exp $
 
-  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> glib-2.2.0.ebuild :
-  Add ~alpha to KEYWORDS
+
+*glib-2.2.1 (04 Feb 2003)
+
+  04 Feb 2003; Spider <spider@gentoo.org> glib-2.2.1.ebuild :
+  new version, fix some and clean the old cruft DEBUG variable out
+  
 
 *glib-2.2.0 (22 Dec 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> glib-2.2.0.ebuild :
+  changed DEBUG to DEBUGBUILD
+
+  01 Jan 2003; Aron Griffis <agriffis@gentoo.org> glib-2.2.0.ebuild :
+  Add ~alpha to KEYWORDS
+
   25 Dec 2002; Martin Holzer <mholzer@gentoo.org> glib-2.2.0.ebuild ChangeLog :
   Fixed dep pkg-config. Closes #12678
 
@@ -24,6 +34,9 @@
 
 *glib-2.0.7 (04 Nov 2002)
   
+  04 Feb 2003; Spider <spider@gentoo.org> glib-2.0.7.ebuild :
+  move DEBUG to DEBUGBUILD
+
   11 Nov 2002; Spider <spider@gentoo.org> glib-2.0.7.ebuild :
   marked stable for x86
  
@@ -42,6 +55,9 @@
 
 *glib-2.0.6-r1 (4 aug 2002)
 
+  04 Feb 2003; Spider <spider@gentoo.org> glib-2.0.6-r1.ebuild :
+   move DEBUG to DEBUGBUILD
+
   13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
   Added ppc keyword
 
diff --git a/dev-libs/glib/files/digest-glib-2.2.1 b/dev-libs/glib/files/digest-glib-2.2.1
new file mode 100644
index 000000000000..8db4a1ec065a
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.2.1
@@ -0,0 +1 @@
+MD5 42406a17819080326e105f8333963b97 glib-2.2.1.tar.bz2 1507856
diff --git a/dev-libs/glib/glib-2.0.6-r1.ebuild b/dev-libs/glib/glib-2.0.6-r1.ebuild
index 395a94795ab3..5ce93fd06a81 100644
--- a/dev-libs/glib/glib-2.0.6-r1.ebuild
+++ b/dev-libs/glib/glib-2.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.8 2002/12/15 10:44:12 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.6-r1.ebuild,v 1.9 2003/02/04 06:02:09 spider Exp $
 
 IUSE="doc"
 
@@ -31,7 +31,7 @@ src_compile() {
 	local myconf=""
 	use doc && myconf="${myconf} --enable-gtk-doc"
 	use doc || myconf="${myconf} --disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug=yes"
     fi
 
diff --git a/dev-libs/glib/glib-2.0.7.ebuild b/dev-libs/glib/glib-2.0.7.ebuild
index 329598e7e9d9..674b65804d4f 100644
--- a/dev-libs/glib/glib-2.0.7.ebuild
+++ b/dev-libs/glib/glib-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.8 2002/12/17 22:24:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.7.ebuild,v 1.9 2003/02/04 06:02:09 spider Exp $
 
 IUSE="doc"
 
@@ -33,7 +33,7 @@ src_compile() {
 	local myconf=""
 	use doc && myconf="${myconf} --enable-gtk-doc"
 	use doc || myconf="${myconf} --disable-gtk-doc"
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug=yes"
     fi
 
diff --git a/dev-libs/glib/glib-2.2.0.ebuild b/dev-libs/glib/glib-2.2.0.ebuild
index 10157553c2a7..d5f6589529a2 100644
--- a/dev-libs/glib/glib-2.2.0.ebuild
+++ b/dev-libs/glib/glib-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.5 2003/01/18 12:39:40 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.2.0.ebuild,v 1.6 2003/02/04 06:02:09 spider Exp $
 
 inherit libtool
 
@@ -29,7 +29,7 @@ src_compile() {
 		&& myconf="${myconf} --enable-gtk-doc" \
 		|| myconf="${myconf} --disable-gtk-doc"
 
-	if [ -n "$DEBUG" ]; then
+	if [ -n "$DEBUGBUILD" ]; then
 		myconf="${myconf}  --enable-debug=yes"
     	fi
 
diff --git a/dev-libs/glib/glib-2.2.1.ebuild b/dev-libs/glib/glib-2.2.1.ebuild
new file mode 100644
index 000000000000..0737f12f5cb3
--- /dev/null
+++ b/dev-libs/glib/glib-2.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2002 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.1.ebuild,v 1.1 2003/02/04 06:02:09 spider Exp $
+
+inherit libtool
+
+IUSE="doc"
+S=${WORKDIR}/${P}
+DESCRIPTION="The GLib library of C routines"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+HOMEPAGE="http://www.gtk.org/"
+
+SLOT="2"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND=">=dev-util/pkgconfig-0.14.0
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+
+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" \
+		|| 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
+}