Prune old ebuilds, bug fix for #9470, version bump for #9693

9 files changed, 43 insertions, 243 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 48ed126e3152..f70c274ab0a9 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,9 +1,18 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.12 2002/09/11 15:11:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.13 2002/10/26 19:20:13 vapier Exp $
+
+*wxGTK-2.3.3 (26 Oct 2002)
+
+  26 Oct 2002; Mike Frysinger <vapier@gentoo.org> wxGTK-2.3.3.ebuild :
+  Version bump (#9693) + pkg_setup addition (#9470)
 
 *wxGTK-2.3.2-r2 (29 Aug 2002)
 
+  26 Oct 2002; Mike Frysinger <vapier@gentoo.org> wxGTK-2.3.2-r2.ebuild :
+  Added pkg_setup to handle zlib/zconf header files that prevented compiling.
+  Thanks to Martin Schlemmer for pkg_setup #9470
+
   11 Sep 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.2-r2.ebuild :
   Changed optional gif support to required GIF support as you cannot
   turn off GIF support in wxPython.  Should fix bug #7777.
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.2.9 b/x11-libs/wxGTK/files/digest-wxGTK-2.2.9
deleted file mode 100644
index 176a5207dbac..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9bf738050fca93e33a65081b1c55905 wxGTK-2.2.9.tar.bz2 3829283
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.3.2 b/x11-libs/wxGTK/files/digest-wxGTK-2.3.2
deleted file mode 100644
index f6631916d46b..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 197e08767cde58ebc3996dd4b6fed905 wxGTK-2.3.2.tar.bz2 4710189
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.3.2-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.3.2-r1
deleted file mode 100644
index f6631916d46b..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 197e08767cde58ebc3996dd4b6fed905 wxGTK-2.3.2.tar.bz2 4710189
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.3.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.3.3
new file mode 100644
index 000000000000..e19971899df5
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.3.3
@@ -0,0 +1 @@
+MD5 50f4b5b2618febbbcaac2f2d70e80c65 wxGTK-2.3.3.tar.bz2 5006021
diff --git a/x11-libs/wxGTK/wxGTK-2.2.9.ebuild b/x11-libs/wxGTK/wxGTK-2.2.9.ebuild
deleted file mode 100644
index 77198ead3bfc..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.2.9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.2.9.ebuild,v 1.10 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="gif nls odbc opengl"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
-
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-
-HOMEPAGE="http://www.wxwindows.org/"
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	dev-libs/libunicode
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	media-libs/netpbm
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC  )
-	gif? ( media-libs/giflib )
-	opengl? ( virtual/opengl )"
-	
-#Possible future dependancies
-#	motif? ( x11-libs/openmotif )
-#	ungif? ( media-libs/libungif )
-
-#RDEPEND=""
-
-src_compile() {
-
-	
-	#cp configure.in configure.in.orig
-	#sed '1610i\    /usr/include/freetype2 \\' configure.in.orig > configure.in
-		
-
-	local myconf
-	#--with-gtk enabled by default, if you want to build against motif,
-	#replace --with-gtk with --with-motif and --without-gtk. You will
-	#also need openmotif installed.	Unfortunately, the package build tools
-	#only support installation of one currently.
-	
-	myconf="--with-gtk"
-	
-	#Build static library too, shared library is enabled by default.
-	#Enable useful config options that don't have USE flags
-	myconf="$myconf --enable-static --with-zlib --with-unicode"
-	
-	#Note: png,jpeg,tiff,pnm, and pcx image support enabled by default if found.
-	#Also, all wxWindows gui features are enabled by default. If you
-	#want to build a smaller library you can disable features by adding
-	#the appropriate flags to myconf (see INSTALL.txt).
-
-	#The build tools include a --with-freetype option, however it doesn't
-	#seem to be implemented in the source yet.
-	
-	#confiure options that have corresponding USE variable.
-	
-	use odbc && myconf="$myconf --with-odbc" #disabled by default
-	use gif  || myconf="$myconf --disable-gif" #enabled by default
-	use opengl && myconf="$myconf --with-opengl" #disabled by default
-    
-	./configure --infodir=/usr/share/info \
-				--mandir=/usr/share/man \
-				--prefix=/usr \
-				--host=${CHOST} \
-				${myconf}|| die
-	
-	emake || die
-
-}
-
-src_install () {
-	
-	make infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		prefix=${D}/usr \
-		install || die
-
-	dodoc  CHANGES.txt COPYING.LIB INSTALL.txt \
-		LICENCE.txt README.txt SYMBOLS.txt TODO.txt
-		
-}
-
diff --git a/x11-libs/wxGTK/wxGTK-2.3.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.3.2-r2.ebuild
index 16475c2cd3db..ee689053b0cf 100644
--- a/x11-libs/wxGTK/wxGTK-2.3.2-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.3.2-r2.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/x11-libs/wxGTK/wxGTK-2.3.2-r2.ebuild,v 1.13 2002/10/17 16:22:06 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.3.2-r2.ebuild,v 1.14 2002/10/26 19:20:13 vapier Exp $
 
 IUSE="nls odbc jpeg png opengl"
 
@@ -23,12 +23,15 @@ DEPEND="dev-libs/libunicode
 	odbc? ( dev-db/unixODBC  )
 	opengl? ( virtual/opengl )
 	=x11-libs/gtk+-1.2*"
-
 RDEPEND="nls? ( sys-devel/gettext )"
-	
 
-src_compile() {
+pkg_setup() {
+	# xfree should not install these, remove until the fixed
+	# xfree is in main use.
+	rm -f /usr/X11R6/include/{zconf.h,zlib.h}
+}
 
+src_compile() {
 	local myconf
 
 	# Build static library too, shared library is enabled by default.
@@ -68,12 +71,9 @@ src_compile() {
 	econf ${myconf} || die "configuration failed"
 	
 	make || die "make failed"
-
 }
 
-src_install () {
-	
+src_install() {
 	einstall || die
-
 	dodoc *.txt
 }
diff --git a/x11-libs/wxGTK/wxGTK-2.3.2.ebuild b/x11-libs/wxGTK/wxGTK-2.3.2.ebuild
deleted file mode 100644
index c1dd0e1e5df8..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.3.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.3.2.ebuild,v 1.12 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="gif nls odbc opengl"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
-LICENSE="LGPL-2"
-SLOT="2.3"
-KEYWORDS="x86 ppc sparc sparc64"
-
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-
-HOMEPAGE="http://www.wxwindows.org/"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	dev-libs/libunicode
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	media-libs/netpbm
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC  )
-	gif? ( media-libs/giflib )
-	opengl? ( virtual/opengl )"
-	
-#Possible future dependancies
-#	motif? ( x11-libs/openmotif )
-#	ungif? ( media-libs/libungif )
-
-#RDEPEND=""
-
-src_compile() {
-
-	
-	#cp configure.in configure.in.orig
-	#sed '1610i\    /usr/include/freetype2 \\' configure.in.orig > configure.in
-		
-
-	local myconf
-	#--with-gtk enabled by default, if you want to build against motif,
-	#replace --with-gtk with --with-motif and --without-gtk. You will
-	#also need openmotif installed.	Unfortunately, the package build tools
-	#only support installation of one currently.
-	
-	myconf="--with-gtk"
-	
-	#Build static library too, shared library is enabled by default.
-	#Enable useful config options that don't have USE flags
-	myconf="$myconf --enable-static --with-zlib --with-unicode"
-	
-	#Note: png,jpeg,tiff,pnm, and pcx image support enabled by default if found.
-	#Also, all wxWindows gui features are enabled by default. If you
-	#want to build a smaller library you can disable features by adding
-	#the appropriate flags to myconf (see INSTALL.txt).
-
-	#The build tools include a --with-freetype option, however it doesn't
-	#seem to be implemented in the source yet.
-	
-	#confiure options that have corresponding USE variable.
-	
-	use odbc && myconf="$myconf --with-odbc" #disabled by default
-	use gif  || myconf="$myconf --disable-gif" #enabled by default
-	use opengl && myconf="$myconf --with-opengl" #disabled by default
-    
-	./configure --infodir=/usr/share/info \
-				--mandir=/usr/share/man \
-				--prefix=/usr \
-				--host=${CHOST} \
-				${myconf}|| die
-	
-	emake || die
-
-}
-
-src_install () {
-	
-	make infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		prefix=${D}/usr \
-		install || die
-
-	dodoc CHANGES-GTK.txt CHANGES.txt COPYING.LIB INSTALL.txt \
-		LICENSE.txt README-GTK.txt README.txt SYMBOLS.txt TODO.txt
-}
-
diff --git a/x11-libs/wxGTK/wxGTK-2.3.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.3.3.ebuild
index 2d86052ca0a9..5994be9a66bc 100644
--- a/x11-libs/wxGTK/wxGTK-2.3.2-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.3.3.ebuild
@@ -1,53 +1,44 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.3.2-r1.ebuild,v 1.11 2002/10/17 16:22:06 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.3.3.ebuild,v 1.1 2002/10/26 19:20:14 vapier Exp $
 
-IUSE="gif nls png opengl tiff gtk odbc jpeg"
+IUSE="nls odbc jpeg png opengl"
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
+HOMEPAGE="http://www.wxwindows.org/"
+
 LICENSE="LGPL-2"
 SLOT="2.3"
 KEYWORDS="x86 ppc sparc sparc64"
 
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-
-HOMEPAGE="http://www.wxwindows.org/"
-
 DEPEND="dev-libs/libunicode
 	media-libs/netpbm
-	gif? ( media-libs/giflib )
+	media-libs/giflib
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
-	tiff? ( media-libs/tiff )
+	media-libs/tiff
 	odbc? ( dev-db/unixODBC  )
-	opengl? ( virtual/opengl )"
-
-use gtk \
-	&& DEPEND="${DEPEND} =x11-libs/gtk+-1.2*" \
-	|| DEPEND="${DEPEND} x11-libs/openmotif"
-
+	opengl? ( virtual/opengl )
+	=x11-libs/gtk+-1.2*"
 RDEPEND="nls? ( sys-devel/gettext )"
-	
 
-src_compile() {
+pkg_setup() {
+	# xfree should not install these, remove until the fixed
+	# xfree is in main use.
+	rm -f /usr/X11R6/include/{zconf.h,zlib.h}
+}
 
-	
+src_compile() {
 	local myconf
-	#--with-gtk enabled by default, if you want to build against motif,
-	#replace --with-gtk with --with-motif and --without-gtk. You will
-	#also need openmotif installed.	Unfortunately, the package build tools
-	#only support installation of one currently.
-	
-	use gtk \
-		&& myconf="--with-gtk" \
-		|| myconf="--with-motif --without-gtk"
 
-	
-	#Build static library too, shared library is enabled by default.
-	#Enable useful config options that don't have USE flags
-	myconf="${myconf} --enable-static --with-zlib --with-unicode"
+	# Build static library too, shared library is enabled by default.
+	# Enable useful config options that don't have USE flags
+	# motif is not a supported build environment.  forcing gtk
+	myconf="${myconf} --enable-static --with-zlib --with-unicode \
+		--with-libtiff --with-gtk --enable-gif"
 	
 	#Note: pcx image support enabled by default if found.
 	#Also, all wxWindows gui features are enabled by default. If you
@@ -67,10 +58,6 @@ src_compile() {
 		&& myconf="${myconf} --with-opengl" \
 		|| myconf="${myconf} --without-opengl"
 
-	use gif \
-		&& myconf="${myconf} --enable-gif" \
-		|| myconf="${myconf} --disable-gif"
-
 	use png \
 		&& myconf="${myconf} --with-libpng --enable-pnm" \
 		|| myconf="${myconf} --without-libpng --disable-pnm"
@@ -79,29 +66,12 @@ src_compile() {
 		&& myconf="${myconf} --with-libjpeg" \
 		|| myconf="${myconf} --without-libjpeg"
 
-	use tiff \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-    
-	./configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf}|| die
+	econf ${myconf} || die "configuration failed"
 	
-	emake || die
-
+	make || die "make failed"
 }
 
-src_install () {
-	
-	make \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		prefix=${D}/usr \
-		install || die
-
+src_install() {
+	einstall || die
 	dodoc *.txt
 }
-