version bump, fixes many gtk2 problems. also in p.mask

6 files changed, 130 insertions, 53 deletions

diff --git a/dev-python/wxPython/ChangeLog b/dev-python/wxPython/ChangeLog
index 38f94ff5553d..aaa7eb5c8a6d 100644
--- a/dev-python/wxPython/ChangeLog
+++ b/dev-python/wxPython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/wxPython
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.29 2003/07/10 23:30:15 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.30 2003/10/07 23:53:58 liquidx Exp $
+
+*wxPython-2.4.2.4 (08 Oct 2003)
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.7.ebuild,
+  wxPython-2.4.1.2.ebuild, wxPython-2.4.2.4.ebuild:
+  version bump. incorporating license changes thank to Vaclav Slavik
+  <vaclav.slavik@matfyz.cz> (#28697)
 
   10 Jul 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.1.2.ebuild,
   files/controls2.py.patch:
diff --git a/dev-python/wxPython/Manifest b/dev-python/wxPython/Manifest
index f44148388ec6..92b4b135811d 100644
--- a/dev-python/wxPython/Manifest
+++ b/dev-python/wxPython/Manifest
@@ -1,8 +1,8 @@
-MD5 ffc06f85fcfdb67083643e38f35e33de ChangeLog 4575
+MD5 793068aaa7315570faf3dc51f670bf7c ChangeLog 4843
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 8e8045742b4284efc3f7359200be60f3 wxPython-2.4.0.7.ebuild 2994
-MD5 a25dcae6ad464e45a3807ca0ddd92c1c wxPython-2.4.1.2.ebuild 2371
-MD5 b04f2db9a10a017db3caeaa5eb5ae07a wxPython-2.4.2.4.ebuild 2371
+MD5 9a7de975602ab6d3fd83add64d895925 wxPython-2.4.0.7.ebuild 2996
+MD5 7d67bd1fe19160165d8fe39044febb23 wxPython-2.4.1.2.ebuild 2373
+MD5 fdbc8e31137a6a2ed029800aaa16e1bb wxPython-2.4.2.4.ebuild 2303
 MD5 99504d777b11bc0266e7487ee59496dd files/controls2.py.patch 2202
 MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxPython-2.4.0.7 73
 MD5 ce3003c042f7c8fe4700193e357ad2ad files/digest-wxPython-2.4.1.2 73
diff --git a/dev-python/wxPython/files/digest-wxPython-2.4.2.4 b/dev-python/wxPython/files/digest-wxPython-2.4.2.4
new file mode 100644
index 000000000000..a2e3b4a3aac2
--- /dev/null
+++ b/dev-python/wxPython/files/digest-wxPython-2.4.2.4
@@ -0,0 +1 @@
+MD5 ea4eb68e10a0c2a9be643b35dcb78e41 wxPythonSrc-2.4.2.4.tar.gz 13130195
diff --git a/dev-python/wxPython/wxPython-2.4.0.7.ebuild b/dev-python/wxPython/wxPython-2.4.0.7.ebuild
index 269fbc2947cd..39f7e48b8c68 100644
--- a/dev-python/wxPython/wxPython-2.4.0.7.ebuild
+++ b/dev-python/wxPython/wxPython-2.4.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.0.7.ebuild,v 1.7 2003/09/10 22:29:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.0.7.ebuild,v 1.8 2003/10/07 23:53:58 liquidx Exp $
 
 IUSE="opengl gtk2"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 HOMEPAGE="http://www.wxpython.org/"
 
 SLOT="0"
-LICENSE="LGPL-2"
+LICENSE="wxWinLL-3"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=">=dev-lang/python-2.1
diff --git a/dev-python/wxPython/wxPython-2.4.1.2.ebuild b/dev-python/wxPython/wxPython-2.4.1.2.ebuild
index f3de8ab9207f..355d37f00f0e 100644
--- a/dev-python/wxPython/wxPython-2.4.1.2.ebuild
+++ b/dev-python/wxPython/wxPython-2.4.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.1.2.ebuild,v 1.4 2003/09/10 22:29:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.1.2.ebuild,v 1.5 2003/10/07 23:53:58 liquidx Exp $
 
 inherit eutils
 
-IUSE="opengl gtk2"
+IUSE="opengl tiff jpeg png gtk2"
 
 MY_P="${P/-/Src-}"
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -13,15 +13,25 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 HOMEPAGE="http://www.wxpython.org/"
 
 SLOT="0"
-LICENSE="LGPL-2"
+LICENSE="wxWinLL-3"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-DEPEND=">=dev-lang/python-2.1
+RDEPEND=">=dev-lang/python-2.1
 	=x11-libs/wxGTK-2.4.1*
-	gtk2? ( >=x11-libs/gtk+-2.0 ) : ( =x11-libs/gtk+-1.2* )
-	gtk2? ( >=dev-libs/glib-2.0 ) : ( =dev-libs/glib-1.2* )
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=x11-libs/pango-1.2
+		>=dev-libs/glib-2.0 ) 
+	!gtk2? ( =x11-libs/gtk+-1.2* 
+		=dev-libs/glib-1.2* )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/libtiff )
+	>=sys-libs/zlib-1.1.4
 	opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )"
 
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+
 pkg_setup() {
 	# make sure if you want gtk2, you have wxGTK with gtk2, and vice versa
 	if [ -n "`use gtk2`" ]; then
@@ -43,54 +53,33 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 	epatch ${FILESDIR}/controls2.py.patch
 }
 
 src_compile() {
-	# create links so the build doesnt fail
-	#for d in ogl stc xrc gizmos ; do
-	#	ln -s ${S}/../contrib/ ${S}/contrib/${d}/contrib
-	#done
-
-	#Other possible configuration variables are BUILD_OGL and BUILD_STC.
-	#BUILD_OGL builds the Object Graphics Library extension module.
-	#BUILD_STC builds the wxStyledTextCtrl (the Scintilla wrapper) extension module.
-	#Both these variable are enabled by default.  To disable them set equal to zero
-	#and add to myconf.
-	local myconf=""
-	if [ `use opengl` ]; then
-		myconf="${myconf} BUILD_GLCANVAS=1"
-	else
-		myconf="${myconf} BUILD_GLCANVAS=0"
-	fi
+	local mypyconf
+	
+	use opengl \
+		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
 
-	if [ `use gtk2` ]; then
-		myconf="${myconf} WXPORT=gtk2"
-	else
-		myconf="${myconf} WXPORT=gtk"
-	fi
+	use gtk2 \
+		&&	mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
 
-	python setup.py ${myconf} build || die "build failed"
+	python setup.py ${mypyconf} build || die "build failed"
 }
 
 src_install() {
-	#Other possible configuration variables are BUILD_OGL and BUILD_STC.
-	#BUILD_OGL builds the Object Graphics Library extension module.
-	#BUILD_STC builds the wxStyledTextCtrl (the Scintilla wrapper) extension module.
-	#Both these variable are enabled by default.  To disable them set equal to zero
-	#and add to myconf.
-	local myconf=""
-	if [ `use opengl` ]; then
-		myconf="${myconf} BUILD_GLCANVAS=1"
-	else
-		myconf="${myconf} BUILD_GLCANVAS=0"
-	fi
-	if [ `use gtk2` ]; then
-		myconf="${myconf} WXPORT=gtk2"
-	else
-		myconf="${myconf} WXPORT=gtk"
-	fi
+	local mypyconf
+
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	use gtk2 \
+		&& mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
 
-	python setup.py ${myconf} install --prefix=/usr --root=${D} || die
+	python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die
 }
diff --git a/dev-python/wxPython/wxPython-2.4.2.4.ebuild b/dev-python/wxPython/wxPython-2.4.2.4.ebuild
new file mode 100644
index 000000000000..737d2aff9b06
--- /dev/null
+++ b/dev-python/wxPython/wxPython-2.4.2.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.2.4.ebuild,v 1.1 2003/10/07 23:53:58 liquidx Exp $
+
+inherit eutils
+
+IUSE="opengl tiff jpeg png gtk2"
+
+MY_P="${P/-/Src-}"
+S="${WORKDIR}/${MY_P}/${PN}"
+DESCRIPTION="A blending of the wxWindows C++ class library with Python."
+SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
+HOMEPAGE="http://www.wxpython.org/"
+
+SLOT="0"
+LICENSE="wxWinLL-3"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+RDEPEND=">=dev-lang/python-2.1
+	>=x11-libs/wxGTK-2.4.2
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=x11-libs/pango-1.2
+		>=dev-libs/glib-2.0 ) 
+	!gtk2? ( =x11-libs/gtk+-1.2* 
+		=dev-libs/glib-1.2* )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/libtiff )
+	>=sys-libs/zlib-1.1.4
+	opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )"
+
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+
+pkg_setup() {
+	# make sure if you want gtk2, you have wxGTK with gtk2, and vice versa
+	if [ -n "`use gtk2`" ]; then
+		if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" ]; then
+			eerror "You need x11-libs/wxGTK compiled with GTK+2 support."
+			eerror "Either emerge wxGTK with 'gtk2' in your USE flags or"
+			eerror "emerge wxPython without 'gtk2' in your USE flags."
+			die "wxGTK needs to be compiled with gtk2"
+		fi
+	else
+		if [ ! -f "/usr/bin/wxgtk-2.4-config" ]; then
+			eerror "You need x11-libs/wxGTK compiled with GTK+1."
+			eerror "Either emerge wxGTK without 'gtk2' in your USE flags or"
+			eerror "emerge wxPython with 'gtk2' in your USE flags."
+			die "wxGTK needs to be compiled without gtk2"
+		fi
+	fi
+}
+
+src_compile() {
+	local mypyconf
+	
+	use opengl \
+		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	use gtk2 \
+		&&	mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
+
+	python setup.py ${mypyconf} build || die "build failed"
+}
+
+src_install() {
+	local mypyconf
+
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	use gtk2 \
+		&& mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
+
+	python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die
+}