Modified so apps can use wxwidgets eclass

5 files changed, 152 insertions, 82 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 1bc9cc86caa9..e58ce16eb1aa 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # 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.62 2004/09/02 11:15:24 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.63 2004/09/09 01:34:08 pythonhead Exp $
+
+  08 Sep 2004; Rob Cakebread <pythonhead@gentoo.org> -wxGTK-2.5.1.ebuild:
+  Modified so apps can use wxwidgets eclass
 
 *wxGTK-2.4.2-r3 (02 Sep 2004)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 425862916632..106cd800b92e 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,13 +1,13 @@
-MD5 7b7f34faf11ae768a7616536bd78a358 wxGTK-2.5.1.ebuild 2097
-MD5 42f4a920d62623e23fd772d0a49d5cfb wxGTK-2.4.2-r2.ebuild 4006
-MD5 815751aec6ffcc01d81410c4f5bd631f ChangeLog 10439
+MD5 45731e21966f4b60044462c9183cec0b ChangeLog 10558
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
+MD5 42f4a920d62623e23fd772d0a49d5cfb wxGTK-2.4.2-r2.ebuild 4006
 MD5 d6d6b9099c93c0682502743e673ffb8c wxGTK-2.4.2-r3.ebuild 4159
-MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
-MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
-MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
-MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
+MD5 1e8c4ed2f4d51401d607702eabf7e5ce wxGTK-2.5.1-r1.ebuild 3838
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 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 3abee1465abb2d1d0275ad2b2adfd4ef files/digest-wxGTK-2.5.1 65
+MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
+MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
+MD5 3abee1465abb2d1d0275ad2b2adfd4ef files/digest-wxGTK-2.5.1-r1 65
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.1-r1
index 2c33032ea106..2c33032ea106 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.5.1
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.5.1-r1
diff --git a/x11-libs/wxGTK/wxGTK-2.5.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..e294f0d1c634
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.5.1-r1.ebuild
@@ -0,0 +1,140 @@
+# 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.5.1-r1.ebuild,v 1.1 2004/09/09 01:34:08 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"
+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.
+
+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`"
+	#For apps like net-p2p/amule that use obsolete wxDate/wxTime
+	myconf="${myconf} --enable-timedate"
+
+	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_unicode ] ; then
+		cd ${S}/build_unicode
+		einstall || die "install unicode failed"
+		cd contrib/src
+		einstall || die "install unicode 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
+
+	# twp 20040830 wxGTK forgets to install htmlproc.h; copy it manually
+	insinto /usr/include/wx/html
+	doins ${S}/include/wx/html/htmlproc.h
+
+	cd ${S}
+	dodoc *.txt
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.5.1.ebuild b/x11-libs/wxGTK/wxGTK-2.5.1.ebuild
deleted file mode 100644
index 6b9ac16c3ba5..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.5.1.ebuild
+++ /dev/null
@@ -1,73 +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.5.1.ebuild,v 1.6 2004/07/22 18:04:50 pythonhead Exp $
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-SRC_URI="mirror://sourceforge/wxwidgets/${P}.tar.bz2"
-HOMEPAGE="http://www.wxwindows.org/"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="~x86"
-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_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"
-	if use gtk2 && use unicode; then
-		# only allow unicode if using gtk2
-		myconf="${myconf} --enable-unicode"
-	else
-		# only enable odbc if unicode is not enabled.
-		myconf="${myconf} `use_with odbc`"
-	fi
-
-	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"
-}