Removed obsolete versions and changed 2.4.2-r2 so apps can use new wxwidgets eclass with multiple versions (gtk,gtk2,unicode,debug) of wxGTK installed. See bug #39931

11 files changed, 156 insertions, 379 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 30b2eb249279..b1421d9cae18 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.59 2004/08/02 14:37:44 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.60 2004/08/07 04:02:58 pythonhead Exp $
+
+*wxGTK-2.4.2-r2 (06 Aug 2004)
+
+  06 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> -wxGTK-2.4.0.ebuild,
+  -wxGTK-2.4.1-r1.ebuild, -wxGTK-2.4.2-r1.ebuild, +wxGTK-2.4.2-r2.ebuild,
+  -wxGTK-2.4.2.ebuild:
+  Removed obsolete versions and changed 2.4.2-r2 so apps can use new wxwidgets
+  eclass with multiple versions (gtk,gtk2,unicode,debug) of wxGTK installed. See
+  bug #39931
 
   02 Aug 2004; Ferris McCormick <fmccor@gentoo.org> wxGTK-2.4.2-r1.ebuild:
   Stable for sparc.  Runs on sparc and is required for wxpython-2.4.2.4,
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 7714e84a175b..bbe0d1ef6331 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,17 +1,11 @@
-MD5 098ba98f8452180c3413de37f2d4333f ChangeLog 9872
+MD5 e834b1977cff5abbeac52dce5ca2138e ChangeLog 10252
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
-MD5 1a1ed8b07f48fc326a6dbacb0577c328 wxGTK-2.4.0.ebuild 2713
-MD5 909d0702d52d51e5e7dc9d9838a48d11 wxGTK-2.4.1-r1.ebuild 2705
-MD5 0d4ead5a7d2f96553bc6d5a08eed1ecc wxGTK-2.4.2.ebuild 2490
-MD5 87436d2d3fb486d780edc9b62ad5950b wxGTK-2.4.2-r1.ebuild 2654
+MD5 c41fa0d8de3f0d6c38edb121dc78b7b7 wxGTK-2.4.2-r2.ebuild 4005
 MD5 7b7f34faf11ae768a7616536bd78a358 wxGTK-2.5.1.ebuild 2097
-MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65
-MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1-r1 65
-MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2 65
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
 MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
 MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
 MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
-MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r1 65
 MD5 3abee1465abb2d1d0275ad2b2adfd4ef files/digest-wxGTK-2.5.1 65
+MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.0
deleted file mode 100644
index 5b73a480f750..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b51cbef5b29ede3f56121e3d142dbc76 wxGTK-2.4.0.tar.bz2 5299762
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.1-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.1-r1
deleted file mode 100644
index 742d7c0028e9..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 937c299de177990908770989206b7d8c wxGTK-2.4.1.tar.bz2 5348194
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1
deleted file mode 100644
index 81bb0e836695..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2
index 81bb0e836695..81bb0e836695 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r2
diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
deleted file mode 100644
index 7ecf0421c1f8..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.20 2004/07/22 17:57:05 pythonhead Exp $
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-HOMEPAGE="http://www.wxwidgets.org/"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="gtk2 nls odbc opengl static"
-
-DEPEND="virtual/libc
-	virtual/x11
-	media-libs/netpbm
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	odbc? ( dev-db/unixODBC  )
-	opengl? ( virtual/opengl )
-	gtk2? (
-		>=x11-libs/gtk+-2.0*
-		dev-libs/libunicode
-	)
-	!gtk2? ( =x11-libs/gtk+-1.2* )"
-
-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
-	myconf="--enable-gif --with-libtiff --with-zlib --with-libpng \
-		--enable-png --with-libjpeg"
-
-	#Note: pcx image support enabled by default if found.
-	#Also, all wxWidgets 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"
-
-	# Note: ODBC support does not work with --enable-unicode
-	#       We only use --enable-unicode (if at all) when we use
-	#       gtk2.
-
-	if use odbc && ! use gtk2; then
-		myconf="${myconf} --with-odbc"
-	elif use odbc && use gtk2; then
-		ewarn ""
-		einfo "you cannot specify both odbc and gtk2"
-		einfo "Choosing gtk2 over odbc"
-		einfo "re-run with USE=\"-gtk2\" to enable odbc"
-		ewarn ""
-		sleep 5
-		myconf="${myconf} --without-odbc"
-	else
-		myconf="${myconf} --without-odbc"
-	fi
-
-	use opengl \
-		&& myconf="${myconf} --with-opengl" \
-		|| myconf="${myconf} --without-opengl"
-
-	myconf="${myconf} --with-x --with-gtk"
-
-	# here we disable unicode support even thought gtk2 supports it
-	# because too many apps just don't follow the wxWidgets guidelines
-	# for unicode support.
-	#
-	# http://www.wxwidgets.org/manuals/2.4.0/wx458.htm#unicode
-	#
-	# ref #20116 - liquidx@gentoo.org (07 May 2003)
-
-	#use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode"
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall
-	dodoc *.txt
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild
deleted file mode 100644
index bfeb76bb764b..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild,v 1.13 2004/07/22 18:00:18 pythonhead Exp $
-
-inherit eutils
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-HOMEPAGE="http://www.wxwidgets.org/"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa"
-IUSE="nls odbc opengl gtk2"
-
-DEPEND="virtual/x11
-	media-libs/netpbm
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	odbc? ( dev-db/unixODBC  )
-	opengl? ( virtual/opengl )
-	gtk2? (
-		>=x11-libs/gtk+-2.0*
-		dev-libs/libunicode
-	)
-	!gtk2? ( =x11-libs/gtk+-1.2* )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-wxpython1.patch
-	epatch ${FILESDIR}/${P}-wxpython2.patch
-	epatch ${FILESDIR}/${P}-contrib.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="--enable-gif --with-libtiff --with-zlib --with-libpng \
-		--enable-png --with-libjpeg"
-
-	#Note: pcx image support enabled by default if found.
-	#Also, all wxWidgets 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.
-
-	# Note: ODBC support does not work with --enable-unicode
-	#       We only use --enable-unicode (if at all) when we use
-	#       gtk2.
-
-
-	if use odbc && ! use gtk2; then
-		myconf="${myconf} --with-odbc"
-	elif use odbc && use gtk2; then
-		ewarn ""
-		einfo "you cannot specify both odbc and gtk2"
-		einfo "Choosing gtk2 over odbc"
-		einfo "re-run with USE=\"-gtk2\" to enable odbc"
-		ewarn ""
-		sleep 5
-		myconf="${myconf} --without-odbc"
-	else
-		myconf="${myconf} --without-odbc"
-	fi
-
-	use opengl \
-		&& myconf="${myconf} --with-opengl" \
-		|| myconf="${myconf} --without-opengl"
-
-	myconf="${myconf} --with-gtk"
-
-	# here we disable unicode support even thought gtk2 supports it
-	# because too many apps just don't follow the wxWidgets guidelines
-	# for unicode support.
-	#
-	# http://www.wxwigets.org/manuals/2.4.0/wx458.htm#unicode
-	#
-	# ref #20116 - liquidx@gentoo.org (07 May 2003)
-
-	#use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode"
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-
-	cd ${S}/contrib/src
-	emake || die "make contrib failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc *.txt
-
-	cd ${S}/contrib/src
-	einstall || die "install contrib failed"
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild
deleted file mode 100644
index 224535353525..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild,v 1.7 2004/08/02 14:37:44 fmccor Exp $
-
-inherit eutils
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-HOMEPAGE="http://www.wxwidgets.org/"
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa"
-IUSE="debug gtk2 odbc opengl unicode"
-
-RDEPEND="virtual/x11
-	sys-libs/zlib
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	!unicode? ( odbc? ( dev-db/unixODBC ) )
-	opengl? ( virtual/opengl )
-	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
-DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )"
-
-# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
-#         has its own implementation of it
-# Note 2: We disable unicode support because otherwise it breaks with
-#         some poorly implemented wxWidgets apps like xmule and lmule.
-# Note 3: PCX support is enabled if the correct libraries are detected.
-#         There is no USE flag for this.
-
-src_unpack() {
-	unpack ${A}
-	# fix xml contrib makefile problems
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
-	# disable contrib/src/animate
-	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
-	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
-}
-
-src_compile() {
-	local myconf
-
-	export LANG='C'
-
-	myconf="${myconf} `use_with opengl`"
-	myconf="${myconf} --with-gtk"
-	myconf="${myconf} `use_enable debug`"
-
-	# here we disable unicode support even thought gtk2 supports it
-	# because too many apps just don't follow the wxWidgets guidelines
-	# for unicode support.
-	#
-	# http://www.wxwidgets.org/manuals/2.4.0/wx458.htm#unicode
-	#
-	# bug #20116 - liquidx@gentoo.org (07 May 2003)
-
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-	# only allow unicode if using gtk2
-	if ! use gtk2 && use unicode; then
-		ewarn "gtk does not support unicode"
-		ewarn "If you need unicode support use gtk2"
-		die "Only gtk2 supports unicode."
-	fi
-	use gtk2 && use unicode && myconf="${myconf} --enable-unicode"
-	# only enable odbc if unicode is not enabled.
-	! use gtk2 && ! use unicode && myconf="${myconf} `use_with odbc`"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-
-	cd ${S}/contrib/src
-	emake || die "make contrib failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc *.txt
-
-	cd ${S}/contrib/src
-	einstall || die "install contrib failed"
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
new file mode 100644
index 000000000000..f321f390aff7
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild,v 1.1 2004/08/07 04:02:58 pythonhead Exp $
+
+inherit eutils
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://www.wxwidgets.org/"
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa"
+IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
+
+RDEPEND="virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	!unicode? ( odbc? ( dev-db/unixODBC ) )
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
+	!no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+
+# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
+#         has its own implementation of it
+# Note 2: PCX support is enabled if the correct libraries are detected.
+#         There is no USE flag for this.
+
+src_unpack() {
+	unpack ${A}
+	# fix xml contrib makefile problems
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
+	# disable contrib/src/animate
+	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
+	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
+}
+
+pkg_setup() {
+	einfo "New in >=wxGTK-2.4.2-r2:"
+	einfo "------------------------"
+	einfo "You can now have gtk, gtk2 and unicode versions installed"
+	einfo "simultaneously. gtk is installed by default because it is"
+	einfo "more stable than gtk2. Use no_wxgtk1 if you don't want it."
+	einfo "Put gtk2 and unicode in your USE flags to get those"
+	einfo "additional versions."
+	einfo "NOTE:"
+	einfo "You can also get debug versions of any of those, but not debug"
+	einfo "and normal installed at the same time."
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+	if use no_wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or -no_wxgtk1 in your USE"
+	fi
+}
+
+src_compile() {
+	local myconf
+	export LANG='C'
+
+	myconf="${myconf} `use_with opengl`"
+	myconf="${myconf} --with-gtk"
+	myconf="${myconf} `use_enable debug`"
+
+	if ! use no_wxgtk1 ; then
+		mkdir build_gtk
+		einfo "Building gtk version"
+		cd build_gtk
+		../configure ${myconf} `use_with odbc`\
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake || die "make gtk failed"
+		cd contrib/src
+		emake || die "make gtk contrib failed"
+	fi
+	cd ${S}
+
+	if use gtk2 ; then
+		myconf="${myconf} --enable-gtk2"
+		einfo "Building gtk2 version"
+		mkdir build_gtk2
+		cd build_gtk2
+		../configure ${myconf} \
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake || die "make gtk2 failed"
+		cd contrib/src
+		emake || die "make gtk2 contrib failed"
+
+		cd ${S}
+
+		if use unicode ; then
+			myconf="${myconf} --enable-unicode"
+			einfo "Building unicode version"
+			mkdir build_unicode
+			cd build_unicode
+			../configure ${myconf} \
+				--host=${CHOST} \
+				--prefix=/usr \
+				--infodir=/usr/share/info \
+				--mandir=/usr/share/man || die "./configure failed"
+
+			emake || die "make unicode failed"
+
+			cd contrib/src
+			emake || die "make unicode contrib failed"
+		fi
+	fi
+}
+
+src_install() {
+	if [ -e ${S}/build_gtk ] ; then
+		cd ${S}/build_gtk
+		einstall || die "install gtk failed"
+		cd contrib/src
+		einstall || die "install gtk contrib failed"
+	fi
+
+	if [ -e ${S}/build_gtk2 ] ; then
+		cd ${S}/build_gtk2
+		einstall || die "install gtk2 failed"
+		cd contrib/src
+		einstall || die "install gtk2 contrib failed"
+	fi
+
+	if [ -e ${S}/build_unicode ] ; then
+		cd ${S}/build_unicode
+		einstall || die "install unicode failed"
+		cd contrib/src
+		einstall || die "install unicode contrib failed"
+	fi
+
+	cd ${S}
+	dodoc *.txt
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
deleted file mode 100644
index fc3a60991fb9..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.17 2004/07/22 18:04:50 pythonhead Exp $
-
-inherit eutils
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-HOMEPAGE="http://www.wxwidgets.org/"
-SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha arm amd64 ia64"
-IUSE="debug gtk2 odbc opengl unicode"
-
-RDEPEND="virtual/x11
-	sys-libs/zlib
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	!unicode? ( odbc? ( dev-db/unixODBC ) )
-	opengl? ( virtual/opengl )
-	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
-DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )"
-
-# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
-#         has its own implementation of it
-# Note 2: We disable unicode support because otherwise it breaks with
-#         some poorly implemented wxWidgets apps like xmule and lmule.
-# Note 3: PCX support is enabled if the correct libraries are detected.
-#         There is no USE flag for this.
-
-src_unpack() {
-	unpack ${A}
-	# fix xml contrib makefile problems
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
-	# disable contrib/src/animate
-	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
-	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
-}
-
-src_compile() {
-	local myconf
-
-	export LANG='C'
-
-	myconf="${myconf} `use_with opengl`"
-	myconf="${myconf} --with-gtk"
-	myconf="${myconf} `use_enable debug`"
-
-	# here we disable unicode support even thought gtk2 supports it
-	# because too many apps just don't follow the wxWidgets guidelines
-	# for unicode support.
-	#
-	# http://www.wxwidgets.org/manuals/2.4.0/wx458.htm#unicode
-	#
-	# bug #20116 - liquidx@gentoo.org (07 May 2003)
-
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-	# only allow unicode if using gtk2
-	use gtk2 && use unicode && myconf="${myconf} --enable-unicode"
-	# only enable odbc if unicode is not enabled.
-	! use gtk2 && ! use unicode && myconf="${myconf} `use_with odbc`"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-
-	cd ${S}/contrib/src
-	emake || die "make contrib failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc *.txt
-
-	cd ${S}/contrib/src
-	einstall || die "install contrib failed"
-}