Version bump and moved unicode configure option behind use gtk2

4 files changed, 117 insertions, 7 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 2c247a0e21f4..30c2f81163e0 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,9 +1,21 @@
 # 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.20 2002/12/30 17:21:56 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.21 2003/01/02 03:09:15 raker Exp $
+
+*wxGTK-2.4.0 (01 Jan 2003)
+
+  01 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild,
+  files/digest-wxGTK-2.4.0 :
+  Version bump.  Currently marked unstable.  There are problems with
+  wxGTK-2.3.4 and wxPython-2.3.4.? so I am hoping that wxPython-2.4.0.?
+  will be here soon.  Depending on the timetable I may have to bring
+  wxGTK-2.3.3 to stable.  Moved unicode configure option behind use gtk2.
 
 *wxGTK-2.3.4 (18 Dec 2002)
 
+  01 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.4.ebuild :
+  Moved unicode configure option behind use gtk2.
+
   18 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
   Version bumpage #12380 + re-enabling support for gtk2.
 
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.0
new file mode 100644
index 000000000000..a4eda0be57ee
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.0
@@ -0,0 +1 @@
+MD5 7b67f33e84bcf70d490d05559d02ff8f wxGTK-2.4.0.tar.gz 6716438
diff --git a/x11-libs/wxGTK/wxGTK-2.3.4.ebuild b/x11-libs/wxGTK/wxGTK-2.3.4.ebuild
index d18c58af63d9..560aae560e26 100644
--- a/x11-libs/wxGTK/wxGTK-2.3.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.3.4.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.4.ebuild,v 1.2 2002/12/18 20:06:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.3.4.ebuild,v 1.3 2003/01/02 03:09:15 raker Exp $
 
 DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
 SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
@@ -49,10 +49,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-static" \
 		|| myconf="${myconf} --disable-static"
 
-	use nls \
-		&& myconf="${myconf} --with-unicode" \
-		|| myconf="${myconf} --without-unicode"
-
 	use gif \
 		&& myconf="${myconf} --enable-gif" \
 		|| myconf="${myconf} --disable-gif"
@@ -97,7 +93,7 @@ src_compile() {
 #		eerror "You must have either gtk, X, or motif in your USE variable"
 #		die "could not specify toolkit"
 #	fi
-	use gtk2 && myconf="${myconf} --enable-gtk2"
+	use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode"
 
 	econf ${myconf}
 	make || die "make failed"
diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
new file mode 100644
index 000000000000..5b89623b9552
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
@@ -0,0 +1,101 @@
+# 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.4.0.ebuild,v 1.1 2003/01/02 03:09:15 raker Exp $
+
+DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit."
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.gz"
+HOMEPAGE="http://www.wxwindows.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="nls odbc jpeg png opengl motif gif tiff gtk gtk2 X"
+
+DEPEND="dev-libs/libunicode
+	media-libs/netpbm
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/tiff )
+	sys-libs/zlib
+	odbc? ( dev-db/unixODBC  )
+	opengl? ( virtual/opengl )
+	motif? ( x11-libs/openmotif )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( >=x11-libs/gtk+-2.0* )
+	X? ( virtual/x11 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+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
+
+	#Note: 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 static \
+		&& myconf="${myconf} --enable-static" \
+		|| myconf="${myconf} --disable-static"
+
+	use gif \
+		&& myconf="${myconf} --enable-gif" \
+		|| myconf="${myconf} --disable-gif"
+
+	use tiff \
+		&& myconf="${myconf} --with-libtiff" \
+		|| myconf="${myconf} --without-libtiff"
+
+	myconf="${myconf} --with-zlib"
+
+	use odbc \
+		&& myconf="${myconf} --with-odbc" \
+		|| myconf="${myconf} --without-odbc"
+
+	use opengl \
+		&& myconf="${myconf} --with-opengl" \
+		|| myconf="${myconf} --without-opengl"
+
+	use png \
+		&& myconf="${myconf} --with-libpng --enable-png" \
+		|| myconf="${myconf} --without-libpng --disable-png"
+	
+	use jpeg \
+		&& myconf="${myconf} --with-libjpeg" \
+		|| myconf="${myconf} --without-libjpeg"
+
+	use X && myconf="${myconf} --with-x"
+
+	# here we specify our own preference of which toolkit to build ...
+	# but only gtk seems to work atm ...
+#	if [ `use gtk` ] ; then
+		myconf="${myconf} --with-gtk"
+#	elif [ `use X` ] ; then
+#		myconf="${myconf} --with-x11"
+#	elif [ `use motif` ] ; then
+#		myconf="${myconf} --with-motif"
+#	else
+#		eerror "You must have either gtk, X, or motif in your USE variable"
+#		die "could not specify toolkit"
+#	fi
+	use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode"
+
+	econf ${myconf}
+	make || die "make failed"
+}
+
+src_install() {
+	einstall
+	dodoc *.txt
+}