Version bumped, removed 2.5.1, retrofitted with SLOT's, bug# 67254

7 files changed, 51 insertions, 26 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 04c89fb7b57c..2f0d5cb5bb34 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # 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.64 2004/11/06 17:30:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.65 2004/11/13 03:32:58 pythonhead Exp $
+
+*wxGTK-2.5.3 (12 Nov 2004)
+
+  12 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, -wxGTK-2.5.1-r1.ebuild, +wxGTK-2.5.3.ebuild:
+  Version bumped, removed 2.5.1, retrofitted with SLOT's, bug# 67254
 
 *wxGTK-2.5.1-r1 (06 Nov 2004)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 53006032a5b8..70a9c49854e2 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,13 +1,23 @@
-MD5 e4886946692f9e9f468e132421bb4614 ChangeLog 10782
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9de6e0588078c9c1626e8979c50042ae ChangeLog 11026
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
-MD5 2446ed5d1e5af50f34fce6d2990c7407 wxGTK-2.4.2-r2.ebuild 4065
-MD5 5cecf6db79f89a2ac64d762bddf86e1b wxGTK-2.4.2-r3.ebuild 4220
-MD5 65afbb947e86307299f467587368b11c wxGTK-2.5.1-r1.ebuild 3928
+MD5 20dbe86c98fa98129cd2fc97ae7ee344 wxGTK-2.4.2-r2.ebuild 4067
+MD5 3d7d25247c0a11481d974d146776a074 wxGTK-2.4.2-r3.ebuild 4222
+MD5 b7ea64af5481c9ae3fa424c37fdf7f35 wxGTK-2.5.3.ebuild 4381
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
+MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 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 3abee1465abb2d1d0275ad2b2adfd4ef files/digest-wxGTK-2.5.1-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBlYBMz2gxt1z4IGYRAnWHAKCrgfyy18e4m/peor2oMSvz8FlgpwCfSB/0
+vDX8abP8nJhB4qf194f2hUY=
+=EJfh
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.1-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.1-r1
deleted file mode 100644
index 2c33032ea106..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3819fa2c753d423fa0f6b99024d17cd4 wxGTK-2.5.1.tar.bz2 6285946
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
new file mode 100644
index 000000000000..c3befefec80c
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
@@ -0,0 +1 @@
+MD5 eccd8fee99f7031b380b7ce026ea78be wxGTK-2.5.3.tar.bz2 6783651
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
index 2aa4ff0d70c6..50635d18a922 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2004/11/06 17:30:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild,v 1.4 2004/11/13 03:32:58 pythonhead Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.wxwidgets.org/"
 SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 
 LICENSE="wxWinLL-3"
-SLOT="0"
+SLOT="2.4"
 KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa ppc64"
 IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
 
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
index 3fa8fafb4187..58a1a1672152 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.2 2004/11/06 17:30:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.3 2004/11/13 03:32:58 pythonhead Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.wxwidgets.org/"
 SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 
 LICENSE="wxWinLL-3"
-SLOT="0"
+SLOT="2.4"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
 IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
 
diff --git a/x11-libs/wxGTK/wxGTK-2.5.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
index b89472e00ec1..0f67fb46e3e4 100644
--- a/x11-libs/wxGTK/wxGTK-2.5.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
@@ -1,16 +1,16 @@
 # 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.2 2004/11/06 17:30:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.3.ebuild,v 1.1 2004/11/13 03:32:58 pythonhead Exp $
 
-inherit flag-o-matic eutils
+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"
+SLOT="2.5"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
 IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
@@ -23,7 +23,8 @@ RDEPEND="virtual/x11
 	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 )"
+	gtk2? ( dev-util/pkgconfig )
+	sys-apps/sed"
 
 # Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
 #         has its own implementation of it
@@ -33,11 +34,11 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	einfo "New in >=wxGTK-2.4.2-r2:"
 	einfo "------------------------"
-	einfo "You can now have gtk, gtk2 and unicode versions installed"
+	einfo "You can now have gtk, gtk2(ansi) and gtk2(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 "additional versions if desired."
 	einfo "NOTE:"
 	einfo "You can also get debug versions of any of those, but not debug"
 	einfo "and normal installed at the same time."
@@ -52,12 +53,12 @@ pkg_setup() {
 src_compile() {
 	local myconf
 	export LANG='C'
-	filter-flags -fvisibility-inlines-hidden
+	sed -i "s/-O2//g" configure || die "sed configure failed"
+
 	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"
+	myconf="${myconf} --enable-monolithic"
 
 	if ! use no_wxgtk1 ; then
 		mkdir build_gtk
@@ -131,10 +132,18 @@ src_install() {
 		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
+	# /usr/bin/wx-config is a symlink to the real wx-config. 2.4 and 2.5 
+	# don't have compatible versions. (See wxwidgets.eclass)
+	# Since 2.5.3 is un-tested and breaks most apps, we'll remove wx-config
+	# and force people to use the wxwidgets eclass and export WX_GTK_VER=2.5 
+	# to find it:
+	rm ${D}/usr/bin/wx-config
 
-	cd ${S}
-	dodoc *.txt
+	dodoc ${S}/*.txt
+
+	# twp 20040830 wxGTK forgets to install htmlproc.h; copy it manually
+	# Not sure if this will be necessary for 2.5, verify: pythonhead 10 Nov 2004
+	# This was for wxRuby
+	#insinto /usr/include/wx/html
+	#doins ${S}/include/wx/html/htmlproc.h
 }