$DEBUGBUILD -> use debug

5 files changed, 50 insertions, 78 deletions

diff --git a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
index 91368e40fd6e..31e001c6a55b 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
@@ -1,14 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.9 2003/07/19 23:36:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.10 2003/08/03 04:49:21 vapier Exp $
 
-inherit eutils
+inherit eutils libtool
 
-inherit libtool
-
-IUSE="nls"
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="The GIMP Toolkit"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
@@ -16,15 +11,16 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
 	http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz
 	http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
 
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE="nls debug"
+
 DEPEND="virtual/x11
 	=dev-libs/glib-1.2*
 	nls? ( sys-devel/gettext
 	dev-util/intltool )"
 
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-
 src_unpack() {
 	unpack ${P}.tar.gz
 	
@@ -43,7 +39,7 @@ src_compile() {
 	local myconf=
 	use nls || myconf="${myconf} --disable-nls"
 
-	if [ "${DEBUGBUILD}" ]
+	if [ `use debug` ]
 	then
 		myconf="${myconf} --enable-debug=yes"
 	else
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
index e716f58adc35..cc30518b614d 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild,v 1.9 2003/03/16 13:14:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r9.ebuild,v 1.10 2003/08/03 04:49:21 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP Toolkit"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
@@ -12,32 +9,29 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
 	http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz
 	http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
 
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="x86 ppc sparc alpha hppa"
+IUSE="nls debug"
+
 DEPEND="virtual/x11
 	=dev-libs/glib-1.2*
 	nls? ( sys-devel/gettext
 	dev-util/intltool )"
 
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
 src_unpack() {
-
 	unpack ${P}.tar.gz
-	
 	cd ${S}/..
-	bzcat ${DISTDIR}/gtk+-1.2.10-r8-gentoo.diff.bz2 | patch -p0
-	
+	epatch ${DISTDIR}/gtk+-1.2.10-r8-gentoo.diff.bz2
 }
 
 src_compile() {
-
 	libtoolize --copy --force
 
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 
-	if [ "${DEBUGBUILD}" ]
+	if [ `use debug` ]
 	then
 		myconf="${myconf} --enable-debug=yes"
 	else
diff --git a/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild
index 66e8362bf3dc..867688f303f9 100644
--- a/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild,v 1.3 2003/07/19 23:36:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild,v 1.4 2003/08/03 04:49:21 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-IUSE="tiff doc jpeg"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+
 LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+IUSE="tiff doc jpeg debug"
 
 RDEPEND="virtual/x11
 	>=dev-libs/glib-2.2.0
@@ -21,7 +20,6 @@ RDEPEND="virtual/x11
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	doc? ( >=dev-util/gtk-doc-0.9 )"
@@ -58,9 +56,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
+	use debug && myconf="${myconf}  --enable-debug"
 		
 	econf --with-gdktarget=x11 ${myconf} || die
 
diff --git a/x11-libs/gtk+/gtk+-2.2.1.ebuild b/x11-libs/gtk+/gtk+-2.2.1.ebuild
index f5c2d3f5a80b..682219f2dc2a 100644
--- a/x11-libs/gtk+/gtk+-2.2.1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.15 2003/07/19 23:36:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.16 2003/08/03 04:49:21 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-IUSE="tiff doc jpeg"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+
 LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="x86 ppc alpha sparc hppa amd64"
+IUSE="tiff doc jpeg debug"
 
 RDEPEND="virtual/x11
 	>=dev-libs/glib-2.2.0
@@ -21,7 +20,6 @@ RDEPEND="virtual/x11
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	doc? ( >=dev-util/gtk-doc-0.9 )"
@@ -54,9 +52,7 @@ src_compile() {
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
 	use jpeg ||  myconf="${myconf} --without-libjpeg"
 	use tiff ||  myconf="${myconf} --without-libtiff"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
+	use debug && myconf="${myconf}  --enable-debug"
 		
 	econf --with-gdktarget=x11 ${myconf} || die
 
diff --git a/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild
index 9d9c977907b5..5eee8610749f 100644
--- a/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild,v 1.6 2003/07/25 11:19:59 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.2-r1.ebuild,v 1.7 2003/08/03 04:49:21 vapier Exp $
 
 inherit eutils libtool flag-o-matic
 
-IUSE="tiff doc jpeg debug"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-
-DESCRIPTION="Gimp ToolKit + "
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+
 LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+IUSE="tiff doc jpeg debug"
 
 # virtual/x11
 # Need this specific xfree version to get bugfree xinput support (#20407)
@@ -23,7 +23,6 @@ RDEPEND=">=x11-base/xfree-4.3.0-r3
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	doc? ( >=dev-util/gtk-doc-0.9 )"
@@ -51,26 +50,17 @@ src_compile() {
 	replace-flags "-O3" "-O2"
 
 	elibtoolize
-	
-	local myconf=""
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-	use png \
-		&& myconf="${myconf} --with-libpng" \
-		||  myconf="${myconf} --without-libpng"
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		||  myconf="${myconf} --without-libjpeg"
-	use tiff \
-		&& myconf="${myconf} --with-libtiff" \
-		||  myconf="${myconf} --without-libtiff"
-	use debug \
-		&& myconf="${myconf}  --enable-debug" \
-		|| myconf="${myconf}  --disable-debug"
-		
-	econf --with-gdktarget=x11 --with-xinput=xfree ${myconf} || die
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		`use_enable debug` \
+		--with-gdktarget=x11 \
+		--with-xinput=xfree \
+		${myconf} \
+		|| die
 
 	# gtk+ isn't multithread friendly due to some obscure code generation bug
 	make || die