version bump. many changes, read changelog. currently p.masked

8 files changed, 118 insertions, 14 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 521f1f15abb1..37b2da3b836b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.33 2003/10/04 14:01:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.34 2003/10/07 23:49:33 liquidx Exp $
+
+*wxGTK-2.4.2 (08 Oct 2003)
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.1-r1.ebuild, wxGTK-2.4.1.ebuild, wxGTK-2.4.2.ebuild,
+  files/wxGTK-2.4.2-contrib_animate.patch:
+  version bump and various fixes including png/jpeg/tiff/zlib deps (#28684) and
+  debug support (#29042) thanks to Vaclav Slavik <vaclav.slavik@matfyz.cz>,
+  unicode option (#28684) thanks to Radek Podgorny <radek@podgorny.cz> and
+  finally correct licensing (#28697) thanks to Vaclav Slavik
+  <vaclav.slavik@matfyz.cz> again.
+  
+  Note that unicode support is by default turned off and must be enabled
+  accompanied by the gtk2 useflag. Take care when enabling unicode because
+  many wxWindows applications do not support unicode.
 
   04 Oct 2003; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.1-r1.ebuild:
   Add ~alpha to KEYWORDS
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b7853f5851b0..10649cab730a 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,11 +1,14 @@
-MD5 0035ed491f32587bb811db5fbda6ab5b ChangeLog 6018
-MD5 6c6dee6bc743f89e1ac66340295156a2 wxGTK-2.4.0.ebuild 2695
+MD5 43809ffc133d4676b162c6905e72c1a6 ChangeLog 6755
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
-MD5 3798e7b17ac804c8c12b6ca2448b82c3 wxGTK-2.4.1.ebuild 2495
-MD5 83ab10cfb8872f01667c747d4366ad51 wxGTK-2.4.1-r1.ebuild 2681
-MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1 65
+MD5 f2c6a482f909a8b55480b1ba1cb662f3 wxGTK-2.4.0.ebuild 2697
+MD5 5930febd267796b3c7bef3c18132ffeb wxGTK-2.4.1-r1.ebuild 2683
+MD5 4d34b0942b01217ef99c488f6c42c79c wxGTK-2.4.1.ebuild 2497
+MD5 88a8ce35ecee60253c0ff415359bad5e wxGTK-2.4.2.ebuild 2281
 MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65
-MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
-MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
+MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1 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 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2
new file mode 100644
index 000000000000..81bb0e836695
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2
@@ -0,0 +1 @@
+MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-contrib_animate.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-contrib_animate.patch
new file mode 100644
index 000000000000..b9a877d5b7f0
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-contrib_animate.patch
@@ -0,0 +1,10 @@
+--- Makefile.in	2003-09-21 12:32:39.000000000 +0100
++++ Makefile.in.new	2003-09-28 13:51:51.006341440 +0100
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.4.2-contrib_animate.patch,v 1.1 2003/10/07 23:49:33 liquidx Exp $
+ 
+-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet
++CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc #animate #applet
+ 
+ all:
+ 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
index 29490bfcce5f..7fe4e6b4f9e6 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 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.12 2003/09/08 06:57:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.13 2003/10/07 23:49:33 liquidx Exp $
 
 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"
+LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE="nls odbc opengl gtk2"
diff --git a/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild
index 0413c4d2c687..d0d3ebba3742 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 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.1-r1.ebuild,v 1.3 2003/10/04 14:01:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.1-r1.ebuild,v 1.4 2003/10/07 23:49:33 liquidx Exp $
 
 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"
+LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE="nls odbc opengl gtk2"
diff --git a/x11-libs/wxGTK/wxGTK-2.4.1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.1.ebuild
index 38ade3af83c9..ec7bcbb5d1ac 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 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.1.ebuild,v 1.4 2003/09/08 06:57:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.1.ebuild,v 1.5 2003/10/07 23:49:33 liquidx Exp $
 
 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"
+LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="nls odbc opengl gtk2"
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
new file mode 100644
index 000000000000..ddd4aca6573c
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2003 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.2.ebuild,v 1.1 2003/10/07 23:49:33 liquidx Exp $
+
+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="wxWinLL-3"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="nls odbc opengl gtk2 unicode debug"
+
+RDEPEND="virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	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 wxWindows
+#         has its own implementation of it
+# Note 2: We disable unicode support because otherwise it breaks with
+#         some poorly implemented wxWindows 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
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_with odbc`"
+	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 wxWindows guidelines
+	# for unicode support.
+	#
+	# http://www.wxwindows.org/manuals/2.4.0/wx458.htm#unicode
+	#
+	# bug #20116 - liquidx@gentoo.org (07 May 2003)
+
+	#use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode"
+	use gtk2 && myconf="${myconf} --enable-gtk2"
+	use gtk2 && use unicode && myconf="${myconf} --enable-unicode"
+
+	econf ${myconf}
+	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"
+}