diff options
Diffstat (limited to 'x11-libs/wxGTK')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 394 | ||||
| -rw-r--r-- | x11-libs/wxGTK/Manifest | 40 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 | 1 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.6.2 | 2 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1 | 2 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/intl.cpp.diff | 20 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch | 18 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch | 72 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch | 14 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild | 36 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild | 57 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild | 154 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.5.3.ebuild | 40 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.1.ebuild | 11 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild | 64 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.2.ebuild | 19 |
17 files changed, 177 insertions, 774 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index b6ef53e1ffdf..8c109a497b75 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,396 +1,6 @@ # ChangeLog for x11-libs/wxGTK -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.97 2005/11/26 20:02:59 sekretarz Exp $ - - 26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> - +files/wxGTK-2.4.2-pango_fix.patch, +wxGTK-2.4.2-r4.ebuild: - Fixed linking problems with pango, bug #113410 - - 26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> files/intl.cpp.diff: - Fixed unicode patch not to expand cvs tag - -*wxGTK-2.6.2-r1 (26 Nov 2005) - - 26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> +files/intl.cpp.diff, - wxGTK-2.6.2.ebuild, +wxGTK-2.6.2-r1.ebuild: - Fixed amule and pgadmin3 crash while using broken wxGTK-2.6.2 with unicode - support, bug #109483 and #109218 - - 15 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> - wxGTK-2.6.2.ebuild: - Fixed USE=-X logic. - -*wxGTK-2.6.2 (11 Oct 2005) - - 11 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> +wxGTK-2.6.2.ebuild: - Version bump. Closes #106969 Removed gtk2 flag per #106560 - - 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> wxGTK-2.6.1.ebuild: - Mark 2.6.1 stable on alpha - - 08 Sep 2005; Aron Griffis <agriffis@gentoo.org> wxGTK-2.6.1.ebuild: - Mark 2.6.1 stable on ia64 - - 06 Sep 2005; Karol Wojtaszek <sekretarz@gentoo.org> wxGTK-2.6.1.ebuild: - Stable on amd64 - - 03 Sep 2005; Markus Rothe <corsair@gentoo.org> wxGTK-2.6.1.ebuild: - Stable on ppc64 - - 02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> wxGTK-2.6.1.ebuild: - Stable on ppc. - - 30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> wxGTK-2.6.1.ebuild: - Stable on sparc - - 28 Aug 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.6.1.ebuild: - Marked x86 stable - -*wxGTK-2.6.1 (12 Jul 2005) - - 12 Jul 2005; Rob Cakebread <pythonhead@gentoo.org> +wxGTK-2.6.1.ebuild: - Version bump. - - 17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on ppc. - - 06 Jun 2005; Markus Rothe <corsair@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on ppc64 - - 15 May 2005; Rene Nussbaumer <killerfox@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on hppa - - 15 May 2005; Bryan Østergaard <kloeri@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on alpha. - - 13 May 2005; Bryan Østergaard <kloeri@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on ia64. - - 11 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.6.0-r1.ebuild: - Removed check for -gtk2 unicode combo since wxbase will work with that. - Thanks Herbie Hopkins <herbs@gentoo.org> - - 11 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Removed gtk USE flag. - -*wxGTK-2.6.0-r1 (11 May 2005) - - 11 May 2005; Rob Cakebread <pythonhead@gentoo.org> - -files/wxGTK-2.4.2-gcc4.patch, -files/wxGTK-2.6.0-gcc4.patch, - -wxGTK-2.4.2-r4.ebuild, -wxGTK-2.6.0.ebuild, +wxGTK-2.6.0-r1.ebuild: - Removed gcc4 patch, it breaks apps bug# 91443. wxbase can now be built with - -gtk2 -wxgtk1 also multilib builds instead of monolithic bug# 91574 - - 08 May 2005; Herbie Hopkins <herbs@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on amd64. - - 04 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> wxGTK-2.4.2-r3.ebuild: - Stable on sparc - - 03 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.6.0.ebuild: - Enable xpm by default because wxpython needs it. bug# 91252 - - 02 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild, - wxGTK-2.4.2-r3.ebuild, wxGTK-2.4.2-r4.ebuild: - Fixed odbc support for gtk2ansi. Thanks david somers <dsomers@trevezel.com> - bug# 83417 - -*wxGTK-2.6.0 (02 May 2005) -*wxGTK-2.4.2-r4 (02 May 2005) - - 02 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild, - wxGTK-2.4.2-r3.ebuild, +wxGTK-2.4.2-r4.ebuild, +wxGTK-2.6.0.ebuild: - Version bump. Marked 2.4.2-r3 stable. Added gcc4 patch bug# 89937. Thanks flameeyes for wxlib.eclass and dirtyepic@metawire.org Ryan Hill for gcc4 fix. Changed evil no_wxgtk1 USE flag to wxgtk1 - - 26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> - wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild: - Multilib fixes and use proper toolchain compiler. - - 03 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild: - Added menu.cpp patch - - 03 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild: - Added htmlproc.h for wxruby - - 16 Jan 2005; Mike Frysinger <vapier@gentoo.org> wxGTK-2.4.2-r2.ebuild, - wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild: - Add gnuconfig since ebuild doesnt run econf for some reason. - - 05 Dec 2004; Rob Cakebread <pythonhead@gentoo.org> - +files/wxGTK-2.4.2-menu.cpp.patch, wxGTK-2.4.2-r3.ebuild: - Patch to disable three private GTK+ functions. Closes bug# 46737 - - 13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.5.3.ebuild: - Removed monolithic build, fixed gtk1 detection, bug# 71036 - -*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) - - 06 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: - Added filter-flags -invisibility-inlines-hidden bug# 68500 - - 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) - - 02 Sep 2004; twp +wxGTK-2.4.2-r3.ebuild: - Install htmlproc.h. - - 18 Aug 2004; Tom Gall <tgall@gentoo.org> wxGTK-2.4.2-r2.ebuild: - stable on ppc64, bug #58420 - -*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, - which is required because of some missing patches. - - 22 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r1.ebuild, - wxGTK-2.4.2.ebuild, wxGTK-2.5.1.ebuild: - Changed name from wxWindows to wxWidgets. bug# 45061 - - 22 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.1-r1.ebuild: - Changed name from wxwindows to wxwidgets bug# 45061 - - 22 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.0.ebuild: - Changed all wxwindows to wxwidgets bug# 45061 - - 30 Jun 2004; Guy Martin <gmsoft@gentoo.org> wxGTK-2.4.2-r1.ebuild: - Marked stable on hppa. - - 28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild, - wxGTK-2.4.2-r1.ebuild, wxGTK-2.4.2.ebuild, wxGTK-2.5.1.ebuild: - econf || die, sync IUSE, glibc -> libc - - 23 Jun 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild, - wxGTK-2.4.1-r1.ebuild, wxGTK-2.5.1.ebuild: - QA - fix use invocation - -*wxGTK-2.4.2-r1 (22 Jun 2004) - - 22 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> +wxGTK-2.4.2-r1.ebuild: - Disable unicode for gtk. Closes bug# 52495 - - 22 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2.ebuild: - Marked stable on x86 - -*wxGTK-2.5.1 (22 Jun 2004) - - 22 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> +wxGTK-2.5.1.ebuild: - Version bump but added to package.mask. Bug# 44138. Thanks HopeSeekr - <theodore@xmule.org> - - 26 Apr 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild, - wxGTK-2.4.1-r1.ebuild, wxGTK-2.4.2.ebuild: - Add die following econf for bug 48950 - - 17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wxGTK-2.4.1-r1.ebuild, - wxGTK-2.4.2.ebuild: - Inherit eutils, fixed IUSE flags. - - 24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> wxGTK-2.4.0.ebuild, - wxGTK-2.4.1-r1.ebuild: - don't use deprecated ? : use syntax - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.2.ebuild: - stable on ia64 - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.0.ebuild: - add ~alpha for the sake of dev-python/wxPython-2.4.0.7 - - 17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> : - manifest fix - - 16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> wxGTK-2.4.2.ebuild: - set ppc in keywords - - 09 Jan 2004; Aron Griffis <agriffis@gentoo.org> wxGTK-2.4.2.ebuild: - stable on alpha - - 29 Dec 2003; Guy Martin <gmsoft@gentoo.org> wxGTK-2.4.1-r1.ebuild: - Marked stable on hppa. - - 25 Dec 2003; Jason Wever <weeve@gentoo.org> wxGTK-2.4.1-r1.ebuild: - Marked stable on sparc. - - 14 Nov 2003; Brad House <brad_mssw@gentoo.org> wxGTK-2.4.2.ebuild, - files/wxGTK-2.4.2-cleanup.patch: - patch from augustus@linuxhardware.org for amd64 - - 17 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.2.ebuild: - reset LANG vairable otherwise it breaks for et_EE (#30994) - - 09 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.1.ebuild, - wxGTK-2.4.2.ebuild: - cleanup and fixing conditionals - - 08 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.1-r1.ebuild, - wxGTK-2.4.1.ebuild: - Marked 2.4.1 and 2.4.1-r1 stable - -*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 - -*wxGTK-2.4.1-r1 (09 Sep 2003) - - 09 Sep 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.1-r1.ebuild, - files/wxGTK-2.4.1-contrib.patch: - now builds stuff in contrib/ like ogl and xrc - - 09 Jul 2003; Alastair Tse <liquidx@gentoo.org> - files/wxGTK-2.4.1-wxpython1.patch, files/wxGTK-2.4.1-wxpython2.patch: - RCS/CVS headers spoiled patches. removed all RCS/CVS triggers from patches - -*wxGTK-2.4.1 (09 Jul 2003) - - 09 Jul 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml, - wxGTK-2.4.1.ebuild, files/wxGTK-2.4.1-wxpython1.patch, - files/wxGTK-2.4.1-wxpython2.patch: - new version. this one requires 2 additional patches back ported from wxPython - for wxPython 2.4.1.2 to compile. - - 07 May 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.0.ebuild: - disable unicode support for gtk2 - -*wxGTK-2.4.0 (01 Jan 2003) - - 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxGTK-2.4.0.ebuild: - reorder gtk2 deps to make sure gtk1 and gtk2 deps are mutually exclusive - - 04 Feb 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : - If odbc and gtk2 are both specified, disable odbc and enable gtk2. - They are not compatible. - - 21 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : - Changed to emake. - - 15 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : - Marked stable. SLOT'd back to 0. Fixed dependancy misnomers. - - 07 Jan 2003; Martin Holzer <mholzer@gentoo.org> wxGTK-2.4.0.ebuild, - files/digest-wxGTK-2.4.0 ChangeLog : - Changed to .tar.bz2. Seems to be a new release cause digest does not - match old one. - - 01 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild, - files/digest-wxGTK-2.4.0 : - Version bump. Currently marked unstable. There are problems with - wxGTK-2.3.4 and wxPython-2.3.4.? so I am hoping that wxPython-2.4.0.? - will be here soon. Depending on the timetable I may have to bring - wxGTK-2.3.3 to stable. Moved unicode configure option behind use gtk2. - -*wxGTK-2.3.4 (18 Dec 2002) - - 01 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.4.ebuild : - Moved unicode configure option behind use gtk2. - - 18 Dec 2002; Mike Frysinger <vapier@gentoo.org> : - Version bumpage #12380 + re-enabling support for gtk2. - -*wxGTK-2.3.3 (26 Oct 2002) - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 05 Dec 2002; Mike Frysinger <vapier@gentoo.org> - It would seem optional zlib support isnt optional ;) - - 28 Oct 2002; Mike Frysinger <vapier@gentoo.org> wxGTK-2.3.3.ebuild : - Tweakage of USE variables and fix for #2741 - - 26 Oct 2002; Mike Frysinger <vapier@gentoo.org> wxGTK-2.3.3.ebuild : - Version bump (#9693) + pkg_setup addition (#9470) - -*wxGTK-2.3.2-r2 (29 Aug 2002) - - 26 Oct 2002; Mike Frysinger <vapier@gentoo.org> wxGTK-2.3.2-r2.ebuild : - Added pkg_setup to handle zlib/zconf header files that prevented compiling. - Thanks to Martin Schlemmer for pkg_setup #9470 - - 11 Sep 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.2-r2.ebuild : - Changed optional gif support to required GIF support as you cannot - turn off GIF support in wxPython. Should fix bug #7777. - - 29 Aug 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.2-r2.ebuild, - files/digest-wxGTK-2.3.2-r2.ebuild, files/ledctrl.diff : - OpenGL - -*wxGTK-2.2.9-r1 (09 Aug 2002) - - 30 Dec 2002; Nick Hadaway <raker@gentoo.org> files/wxGTK-2.2.9.diff.gz : - Added missing joystick patch. - - 18 Dec 2002; Seemant Kulleen <seemant@gentoo.org> wxGTK-2.2.9-r1.ebuild - files/digest-wxGTK-2.2.9-r1 : - This version is REQUIRED for audacity. If you are NOT the audacity or - wxGTK maintainer, please do NOT touch these files. - - 22 Aug 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.2.9-r1.ebuild : - Changed to "e" tools for compiling. - Added some compile-time options suggested by Paul Thompson. - - 09 Aug 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.2.9-r1.ebuild, - files/digest-wxGTK-2.2.9-r1, files/wxGTK-2.2.9.diff.gz : - Thanks to Francisco Gimeno for fixing the joystick code compile problem. - -*wxGTK-2.3.2-r2 (13 Jun 2002) - - 29 Aug 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.2-r2.ebuild : - Removed motif comments and forced gtk as motif is no longer a supported - build dependancy. - - 25 Aug 2002; Nick Hadaway <raker@gentoo.org> wxGTK-2.3.2-r2.ebuild : - Changed tiff to be a forced dependancy as wxGTK will not compile without it. - - 13 Aug 2002; Nick Hadaway <raker@gentoo.org> - wxGTK-2.3.2-r2.ebuild : - Changed to econf and verified joystick patch is working. - - 15 Jul 2002; Mark Guertin <gerk@gentoo.org> - Added ppc to keywords - - 13 Jun 2002; Bart Verwilst <verwilst@gentoo.org> wxGTK-2.3.2-r2.ebuild : - Apply a little patch to let GCC-3.1 compile this. ( src/gtk/joystick.cpp ), thanks to Francisco Gimeno <kikov@fco-gimeno.com>. - Closes bug # 3660 - -*wxGTK-2.3.2-r1 (14 Apr 2002) - - 14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> wxGTK-2.3.2-r1.ebuild : - Cleaned up the ebuild a little bit and needs recompiling against newer libpng. - -*wxGTK-2.2.9 (28 Mar 2002) - - 28 Mar 2002; Spider <spider@gentoo.org>; wxGTK-2.2.9.ebuild - Well, backported this thing to a stable branch, since hte other version is verified as working, I added this without masking anything, should be transparent except that it provides the dependency some people want. - +# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $ *wxGTK-2.3.2 (1 Feb 2002) diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 9b23eadddb14..62a02f2d6457 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,36 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 5d75da26acd7360fc26dbe96910b6a19 ChangeLog 15557 -MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65 -MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65 -MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 65 -MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65 -MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143 -MD5 ddd05c3f9a18148cc4359579d4ad8a8a files/digest-wxGTK-2.6.1 143 -MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2 143 -MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2-r1 143 -MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581 -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 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253 -MD5 568639b28866f0c708c091d2e28f982e files/wxGTK-2.4.2-pango_fix.patch 618 -MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 -MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249 -MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733 -MD5 b0a33941a9b264d1378ef9ae9181ecb6 wxGTK-2.4.2-r4.ebuild 4840 -MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812 -MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273 -MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922 -MD5 7a7a6e86253922af888b557dd6c92be9 wxGTK-2.6.2-r1.ebuild 1534 -MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDiM7RZ/iYVBmujdURAkuYAJ0aij+OAm5PfiA1dBBwHyy6gbnaeQCgzO9w -VtZNCTxcnsTlZs4makT+X8g= -=OZeZ ------END PGP SIGNATURE----- +MD5 af4e8ec4249b982a11c0e2986d06cac7 ChangeLog 5231 +MD5 7b6cbaf39f7346190040182c8c0bf5c8 wxGTK-2.4.0.ebuild 2705 +MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65 +MD5 12af4ba0b1a2a2174fc047c2908090ce files/wxGTK-2.2.9.diff.gz 272 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 deleted file mode 100644 index 81bb0e836695..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2 index a78f07f3f618..0e624f5b398e 100644 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2 +++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2 @@ -1,2 +1,2 @@ -MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455 MD5 ee0aa211febd992c8540e6c9df749b51 wxWidgets-2.6.2.tar.bz2 13060077 +MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1 deleted file mode 100644 index a78f07f3f618..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455 -MD5 ee0aa211febd992c8540e6c9df749b51 wxWidgets-2.6.2.tar.bz2 13060077 diff --git a/x11-libs/wxGTK/files/intl.cpp.diff b/x11-libs/wxGTK/files/intl.cpp.diff deleted file mode 100644 index 724cdd43aaca..000000000000 --- a/x11-libs/wxGTK/files/intl.cpp.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -u -r1.166 -r1.166.2.1 ---- src/common/intl.cpp 2005/09/18 23:38:06 1.166 -+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1 -@@ -1260,9 +1260,14 @@ - inputConv = - csConv = new wxCSConv(m_charset); - } -- else // no conversion needed -+ else // no need to convert the encoding - { -+ // we still need the conversion for Unicode build -+#if wxUSE_UNICODE -+ inputConv = wxConvCurrent; -+#else // !wxUSE_UNICODE - inputConv = NULL; -+#endif - } - - // conversion to apply to msgid strings before looking them up: we only - diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch index 273b45bec201..d391754d302c 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch @@ -1,6 +1,15 @@ diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h --- wxGTK-2.4.1/include/wx/chkconf.h 2003-06-08 09:13:10.000000000 +0100 +++ wxGTK-2.4.1/include/wx/chkconf.h 2003-06-16 21:46:45.000000000 +0100 +@@ -4,7 +4,7 @@ + * Author: Vadim Zeitlin + * Modified by: + * Created: 09.08.00 +- * RCS-ID: $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++ * RCS-ID: $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + * Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwindows.org> + * Licence: wxWindows license + */ @@ -772,6 +772,17 @@ # endif #endif /* wxUSE_FILESYSTEM */ @@ -22,6 +31,15 @@ diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h diff -ur wx/menuitem.h ../../wxPythonSrc-2.4.1.2/include/wx/menuitem.h --- wxGTK-2.4.1/include/wx/menuitem.h 2003-06-08 09:13:11.000000000 +0100 +++ wxGTK-2.4.1/include/wx/menuitem.h 2003-06-11 00:48:45.000000000 +0100 +@@ -4,7 +4,7 @@ + // Author: Vadim Zeitlin + // Modified by: + // Created: 25.10.99 +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> + // Licence: wxWindows license + /////////////////////////////////////////////////////////////////////////////// @@ -49,6 +49,7 @@ // the menu we're in diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch index 3f38d913d1bd..1bebae8e3f78 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch @@ -1,6 +1,15 @@ diff -ru ./common/filefn.cpp ../../wxPythonSrc-2.4.1.2/src/common/filefn.cpp --- wxGTK-2.4.1/src/common/filefn.cpp 2003-06-08 09:13:13.000000000 +0100 +++ wxGTK-2.4.1/src/common/filefn.cpp 2003-06-11 21:20:15.000000000 +0100 +@@ -4,7 +4,7 @@ + // Author: Julian Smart + // Modified by: + // Created: 29/01/98 +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1998 Julian Smart + // Licence: wxWindows license + ///////////////////////////////////////////////////////////////////////////// @@ -1595,6 +1595,8 @@ wxChar buf[256]; GetWindowsDirectory(buf, 256); @@ -13,6 +22,15 @@ diff -ru ./common/filefn.cpp ../../wxPythonSrc-2.4.1.2/src/common/filefn.cpp diff -ru ./common/log.cpp ../../wxPythonSrc-2.4.1.2/src/common/log.cpp --- wxGTK-2.4.1/src/common/log.cpp 2003-06-08 09:13:14.000000000 +0100 +++ wxGTK-2.4.1/src/common/log.cpp 2003-06-16 21:46:45.000000000 +0100 +@@ -4,7 +4,7 @@ + // Author: Vadim Zeitlin + // Modified by: + // Created: 29/01/98 +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> + // Licence: wxWindows license + ///////////////////////////////////////////////////////////////////////////// @@ -114,13 +114,24 @@ // macros and not all compilers inline vararg functions. // ---------------------------------------------------------------------------- @@ -56,6 +74,15 @@ diff -ru ./common/log.cpp ../../wxPythonSrc-2.4.1.2/src/common/log.cpp diff -ru ./common/menucmn.cpp ../../wxPythonSrc-2.4.1.2/src/common/menucmn.cpp --- wxGTK-2.4.1/src/common/menucmn.cpp 2003-06-08 09:13:14.000000000 +0100 +++ wxGTK-2.4.1/src/common/menucmn.cpp 2003-06-11 00:48:46.000000000 +0100 +@@ -4,7 +4,7 @@ + // Author: Vadim Zeitlin + // Modified by: + // Created: 26.10.99 +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) wxWindows team + // Licence: wxWindows license + /////////////////////////////////////////////////////////////////////////////// @@ -332,6 +332,7 @@ wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") ); @@ -83,6 +110,15 @@ diff -ru ./common/menucmn.cpp ../../wxPythonSrc-2.4.1.2/src/common/menucmn.cpp diff -ru ./common/regex.cpp ../../wxPythonSrc-2.4.1.2/src/common/regex.cpp --- wxGTK-2.4.1/src/common/regex.cpp 2003-06-08 09:13:14.000000000 +0100 +++ wxGTK-2.4.1/src/common/regex.cpp 2003-06-16 21:46:45.000000000 +0100 +@@ -4,7 +4,7 @@ + // Author: Karsten Ballüder and Vadim Zeitlin + // Modified by: + // Created: 13.07.01 +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 2000 Karsten Ballüder <ballueder@gmx.net> + // 2001 Vadim Zeitlin <vadim@wxwindows.org> + // Licence: wxWindows licence @@ -204,21 +204,24 @@ m_nMatches = 1; @@ -122,6 +158,15 @@ diff -ru ./common/regex.cpp ../../wxPythonSrc-2.4.1.2/src/common/regex.cpp diff -ru ./gtk/timer.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/timer.cpp --- wxGTK-2.4.1/src/gtk/timer.cpp 2003-06-08 09:13:21.000000000 +0100 +++ wxGTK-2.4.1/src/gtk/timer.cpp 2003-06-17 18:23:24.000000000 +0100 +@@ -2,7 +2,7 @@ + // Name: gtk/timer.cpp + // Purpose: wxTimer implementation + // Author: Robert Roebling +-// Id: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// Id: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1998 Robert Roebling + // Licence: wxWindows licence + ///////////////////////////////////////////////////////////////////////////// @@ -41,12 +41,7 @@ gdk_threads_leave(); @@ -138,6 +183,15 @@ diff -ru ./gtk/timer.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/timer.cpp diff -ru ./gtk/window.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/window.cpp --- wxGTK-2.4.1/src/gtk/window.cpp 2003-06-08 09:13:22.000000000 +0100 +++ wxGTK-2.4.1/src/gtk/window.cpp 2003-06-19 20:14:52.000000000 +0100 +@@ -2,7 +2,7 @@ + // Name: gtk/window.cpp + // Purpose: + // Author: Robert Roebling +-// Id: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// Id: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1998 Robert Roebling, Julian Smart + // Licence: wxWindows licence + ///////////////////////////////////////////////////////////////////////////// @@ -3629,12 +3629,10 @@ wxapp_install_idle_handler(); @@ -165,6 +219,15 @@ diff -ru ./gtk/window.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/window.cpp diff -ru ./html/htmlpars.cpp ../../wxPythonSrc-2.4.1.2/src/html/htmlpars.cpp --- wxGTK-2.4.1/src/html/htmlpars.cpp 2003-06-08 09:13:16.000000000 +0100 +++ wxGTK-2.4.1/src/html/htmlpars.cpp 2003-06-11 00:34:25.000000000 +0100 +@@ -2,7 +2,7 @@ + // Name: htmlpars.cpp + // Purpose: wxHtmlParser class (generic parser) + // Author: Vaclav Slavik +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1999 Vaclav Slavik + // Licence: wxWindows Licence + ///////////////////////////////////////////////////////////////////////////// @@ -872,7 +872,7 @@ } @@ -177,6 +240,15 @@ diff -ru ./html/htmlpars.cpp ../../wxPythonSrc-2.4.1.2/src/html/htmlpars.cpp diff -ru ./html/m_layout.cpp ../../wxPythonSrc-2.4.1.2/src/html/m_layout.cpp --- wxGTK-2.4.1/src/html/m_layout.cpp 2003-06-08 09:13:16.000000000 +0100 +++ wxGTK-2.4.1/src/html/m_layout.cpp 2003-06-09 23:25:08.000000000 +0100 +@@ -2,7 +2,7 @@ + // Name: m_layout.cpp + // Purpose: wxHtml module for basic paragraphs/layout handling + // Author: Vaclav Slavik +-// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ ++// RCS-ID: $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $ + // Copyright: (c) 1999 Vaclav Slavik + // Licence: wxWindows Licence + ///////////////////////////////////////////////////////////////////////////// @@ -80,7 +80,7 @@ }; diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch deleted file mode 100644 index 2cec83f7f3a1..000000000000 --- a/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- wx-config.in.orig 2003-09-21 18:31:27.000000000 +0700 -+++ wx-config.in 2005-11-24 04:56:18.313149073 +0600 -@@ -145,9 +145,9 @@ - fi - - if test $static_flag = yes ; then -- echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@" -+ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 " - else -- echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ -+ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 " - fi - - ;; diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild index 8264f8860683..f321f390aff7 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.9 2005/05/02 20:04:10 pythonhead Exp $ +# $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 flag-o-matic eutils gnuconfig +inherit eutils -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +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="2.4" -KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa ppc64" -IUSE="debug wxgtk1 gtk2 odbc opengl unicode" +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 @@ -21,7 +21,7 @@ RDEPEND="virtual/x11 !unicode? ( odbc? ( dev-db/unixODBC ) ) opengl? ( virtual/opengl ) gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) - wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" + !no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" DEPEND="${RDEPEND} gtk2? ( dev-util/pkgconfig )" @@ -32,21 +32,19 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \ - die "Failed to patch menu.cpp" # 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 - gnuconfig_update } pkg_setup() { einfo "New in >=wxGTK-2.4.2-r2:" einfo "------------------------" einfo "You can now have gtk, gtk2 and unicode versions installed" - einfo "simultaneously. Use wxgtk1 if you want a gtk1 lib." + 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:" @@ -55,20 +53,20 @@ pkg_setup() { if use unicode; then ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" fi - if ! use wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or wxgtk1 in your USE" + 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' - filter-flags -fvisibility-inlines-hidden + myconf="${myconf} `use_with opengl`" myconf="${myconf} --with-gtk" myconf="${myconf} `use_enable debug`" - if use wxgtk1 ; then + if ! use no_wxgtk1 ; then mkdir build_gtk einfo "Building gtk version" cd build_gtk @@ -88,7 +86,7 @@ src_compile() { einfo "Building gtk2 version" mkdir build_gtk2 cd build_gtk2 - ../configure ${myconf} `use_with odbc` \ + ../configure ${myconf} \ --host=${CHOST} \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -140,10 +138,6 @@ src_install() { einstall || die "install unicode contrib failed" fi - # twp 20040830 wxGTK-2.4.2 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.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild index df846687b138..a2357dbfbfa9 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.17 2005/07/07 03:41:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.1 2004/09/02 11:15:24 twp Exp $ -inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs +inherit eutils -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +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="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="debug wxgtk1 gtk2 odbc opengl unicode" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64" +IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode" RDEPEND="virtual/x11 sys-libs/zlib @@ -21,7 +21,7 @@ RDEPEND="virtual/x11 !unicode? ( odbc? ( dev-db/unixODBC ) ) opengl? ( virtual/opengl ) gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) - wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" + !no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" DEPEND="${RDEPEND} gtk2? ( dev-util/pkgconfig )" @@ -32,21 +32,19 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \ - die "Failed to patch menu.cpp" # 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 - gnuconfig_update } pkg_setup() { einfo "New in >=wxGTK-2.4.2-r2:" einfo "------------------------" einfo "You can now have gtk, gtk2 and unicode versions installed" - einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib." + 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:" @@ -55,21 +53,20 @@ pkg_setup() { if use unicode; then ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" fi - if ! use wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or wxgtk1 in your USE" + 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' - filter-flags -fvisibility-inlines-hidden + myconf="${myconf} `use_with opengl`" myconf="${myconf} --with-gtk" myconf="${myconf} `use_enable debug`" - myconf="${myconf} --libdir=/usr/$(get_libdir)" - if use wxgtk1 ; then + if ! use no_wxgtk1 ; then mkdir build_gtk einfo "Building gtk version" cd build_gtk @@ -78,9 +75,9 @@ src_compile() { --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" + emake || die "make gtk failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed" + emake || die "make gtk contrib failed" fi cd ${S} @@ -89,14 +86,14 @@ src_compile() { einfo "Building gtk2 version" mkdir build_gtk2 cd build_gtk2 - ../configure ${myconf} `use_with odbc` \ + ../configure ${myconf} \ --host=${CHOST} \ --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" + emake || die "make gtk2 failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed" + emake || die "make gtk2 contrib failed" cd ${S} @@ -111,10 +108,10 @@ src_compile() { --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" + emake || die "make unicode failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" + emake || die "make unicode contrib failed" fi fi } @@ -122,23 +119,23 @@ src_compile() { src_install() { if [ -e ${S}/build_gtk ] ; then cd ${S}/build_gtk - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" + einstall || die "install gtk failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" + einstall || die "install gtk contrib failed" fi if [ -e ${S}/build_gtk2 ] ; then cd ${S}/build_gtk2 - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" + einstall || die "install gtk2 failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" + einstall || die "install gtk2 contrib failed" fi if [ -e ${S}/build_unicode ] ; then cd ${S}/build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" + einstall || die "install unicode failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" + einstall || die "install unicode contrib failed" fi # twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild deleted file mode 100644 index f2a8f8d42c18..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2005 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-r4.ebuild,v 1.4 2005/11/26 20:02:59 sekretarz Exp $ - -inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs - -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="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="debug 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 ) - 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} - epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \ - die "Failed to patch menu.cpp" - # fix xml contrib makefile problems - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch - - # fix pango_x_get_context stuff - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-pango_fix.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 - gnuconfig_update -} - -pkg_setup() { - einfo "New in >=wxGTK-2.4.2-r2:" - einfo "------------------------" - einfo "You can now have gtk, gtk2 and unicode versions installed" - einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib." - 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 wxgtk1 && ! use gtk2; then - die "You must have at least gtk2 or wxgtk1 in your USE" - fi -} - -src_compile() { - local myconf - export LANG='C' - filter-flags -fvisibility-inlines-hidden - myconf="${myconf} `use_with opengl`" - myconf="${myconf} --with-gtk" - myconf="${myconf} `use_enable debug`" - myconf="${myconf} --libdir=/usr/$(get_libdir)" - - if use 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 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || 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} `use_with odbc` \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || 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 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" - - cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" - fi - fi -} - -src_install() { - if [ -e ${S}/build_gtk ] ; then - cd ${S}/build_gtk - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" - fi - - if [ -e ${S}/build_gtk2 ] ; then - cd ${S}/build_gtk2 - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" - fi - - if [ -e ${S}/build_unicode ] ; then - cd ${S}/build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" - cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" - fi - - # twp 20040830 wxGTK-2.4.2 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.3.ebuild b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild index 88681c5ed461..0f67fb46e3e4 100644 --- a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.3.ebuild,v 1.7 2005/05/02 17:57:03 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 eutils gnuconfig multilib toolchain-funcs +inherit eutils -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" +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="2.5" -KEYWORDS="~x86" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64" IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode" RDEPEND="virtual/x11 @@ -51,8 +51,6 @@ pkg_setup() { } src_compile() { - gnuconfig_update - local myconf export LANG='C' sed -i "s/-O2//g" configure || die "sed configure failed" @@ -60,20 +58,20 @@ src_compile() { myconf="${myconf} `use_with opengl`" myconf="${myconf} --with-gtk" myconf="${myconf} `use_enable debug`" - myconf="${myconf} --libdir=/usr/$(get_libdir)" + myconf="${myconf} --enable-monolithic" if ! use no_wxgtk1 ; then mkdir build_gtk einfo "Building gtk version" cd build_gtk - ../configure ${myconf} --disable-gtk2 `use_with odbc`\ + ../configure ${myconf} `use_with odbc`\ --host=${CHOST} \ --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed" + emake || die "make gtk failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed" + emake || die "make gtk contrib failed" fi cd ${S} @@ -87,9 +85,9 @@ src_compile() { --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed" + emake || die "make gtk2 failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed" + emake || die "make gtk2 contrib failed" cd ${S} @@ -104,10 +102,10 @@ src_compile() { --infodir=/usr/share/info \ --mandir=/usr/share/man || die "./configure failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed" + emake || die "make unicode failed" cd contrib/src - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed" + emake || die "make unicode contrib failed" fi fi } @@ -115,23 +113,23 @@ src_compile() { src_install() { if [ -e ${S}/build_gtk ] ; then cd ${S}/build_gtk - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed" + einstall || die "install gtk failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed" + einstall || die "install gtk contrib failed" fi if [ -e ${S}/build_unicode ] ; then cd ${S}/build_unicode - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed" + einstall || die "install unicode failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed" + einstall || die "install unicode contrib failed" fi if [ -e ${S}/build_gtk2 ] ; then cd ${S}/build_gtk2 - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed" + einstall || die "install gtk2 failed" cd contrib/src - einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed" + einstall || die "install gtk2 contrib failed" fi # /usr/bin/wx-config is a symlink to the real wx-config. 2.4 and 2.5 diff --git a/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild index 904ef9af7c00..9b25a1338e2d 100644 --- a/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild,v 1.3 2005/06/09 01:12:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild,v 1.1 2005/05/11 19:35:37 pythonhead Exp $ inherit wxlib gnuconfig @@ -21,7 +21,7 @@ RDEPEND="${RDEPEND} jpeg? ( media-libs/jpeg ) tiff? ( media-libs/tiff ) odbc? ( dev-db/unixODBC ) - !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )" + !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ))))))))" DEPEND="${RDEPEND} ${DEPEND} @@ -30,6 +30,9 @@ S=${WORKDIR}/wxWidgets-${PV} pkg_setup() { einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1" + if use unicode; then + ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" + fi } src_compile() { diff --git a/x11-libs/wxGTK/wxGTK-2.6.1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.1.ebuild index d908cdc66f98..c4856af42db6 100644 --- a/x11-libs/wxGTK/wxGTK-2.6.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.1.ebuild,v 1.12 2005/09/24 04:36:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.1.ebuild,v 1.1 2005/07/12 18:39:03 pythonhead Exp $ inherit wxlib gnuconfig @@ -8,19 +8,20 @@ DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library" SLOT="2.6" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64" IUSE="gnome gtk2 joystick odbc opengl sdl wxgtk1" + RDEPEND="${RDEPEND} opengl? ( virtual/opengl ) gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) - wxgtk1? ( gtk2? ( media-libs/libpng + wxgtk1? ( gtk2? (media-libs/libpng media-libs/jpeg - media-libs/tiff ) ) + media-libs/tiff)) odbc? ( dev-db/unixODBC ) - !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )" + !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ))))))))" DEPEND="${RDEPEND} ${DEPEND} diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild deleted file mode 100644 index 33ae6c96758c..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.1 2005/11/26 17:32:08 sekretarz Exp $ - -inherit wxlib gnuconfig - -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and -wxbase non-gui library" - -SLOT="2.6" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gnome joystick odbc opengl sdl X" -RDEPEND="${RDEPEND} - opengl? ( virtual/opengl ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - media-libs/tiff - odbc? ( dev-db/unixODBC ) - !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )" - -DEPEND="${RDEPEND} - ${DEPEND} - dev-util/pkgconfig" -S=${WORKDIR}/wxWidgets-${PV} - -pkg_setup() { - einfo "To install only wxbase (non-gui libs) use USE=-X" -} - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/intl.cpp.diff -} - -src_compile() { - gnuconfig_update - myconf="${myconf} - --with-png - --with-jpeg - --with-tiff - $(use_enable opengl) - $(use_with opengl) - $(use_with gnome gnomeprint) - $(use_with sdl) - $(use_enable joystick)" - - use X && configure_build gtk2 unicode "${myconf} --with-gtk=2" - use X || configure_build base unicode "--disable-gui" -} - -src_install() { - use X && install_build gtk2 - use X || install_build base - - wxlib_src_install -} - -pkg_postinst() { - einfo "dev-libs/wxbase has been removed from portage and can be" - einfo "installed with wxGTK by specifying the USE flags" - einfo "-X" -} diff --git a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2.ebuild index 83d02a758ff2..1579c35e9d63 100644 --- a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2.ebuild,v 1.3 2005/11/26 17:32:08 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2.ebuild,v 1.1 2005/10/11 19:09:06 pythonhead Exp $ inherit wxlib gnuconfig @@ -27,13 +27,6 @@ pkg_setup() { einfo "To install only wxbase (non-gui libs) use USE=-X" } -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/intl.cpp.diff -} - src_compile() { gnuconfig_update myconf="${myconf} @@ -46,13 +39,17 @@ src_compile() { $(use_with sdl) $(use_enable joystick)" - use X && configure_build gtk2 unicode "${myconf} --with-gtk=2" - use X || configure_build base unicode "--disable-gui" + + use X && \ + configure_build gtk2 unicode "${myconf} --with-gtk=2" + + ! use X \ + configure_build base unicode "--disable-gui" } src_install() { use X && install_build gtk2 - use X || install_build base + ! use X install_build base wxlib_src_install } |