diff options
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/wxGTK/Manifest | 8 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/digest-wxGTK-2.4.1 | 1 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.1.ebuild | 90 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.2.ebuild | 10 |
5 files changed, 13 insertions, 102 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 801703327b62..86f8339b6334 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,10 @@ # 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.35 2003/10/09 05:55:37 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.36 2003/10/09 08:05:40 liquidx Exp $ + + 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: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 2b6425b6a613..5bdbfcaa890a 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,14 +1,12 @@ -MD5 e407cc7c47133950aa5044b09fe88704 ChangeLog 6892 +MD5 c8ba1fe5634aa36e007e2bb7403c66ca ChangeLog 7015 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 MD5 f2c6a482f909a8b55480b1ba1cb662f3 wxGTK-2.4.0.ebuild 2697 MD5 07829c372ad47e1094d9e07032bedcb9 wxGTK-2.4.1-r1.ebuild 2685 -MD5 4569efc18c0bd66837f33d2118d6a547 wxGTK-2.4.1.ebuild 2499 -MD5 6a86c28c4c0b14b50365f12c3d994f6a wxGTK-2.4.2.ebuild 2327 +MD5 6fbf4c14cd3ef814423e9a80c8e6eb96 wxGTK-2.4.2.ebuild 2384 MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65 -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 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2 65 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.1 deleted file mode 100644 index 742d7c0028e9..000000000000 --- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 937c299de177990908770989206b7d8c wxGTK-2.4.1.tar.bz2 5348194 diff --git a/x11-libs/wxGTK/wxGTK-2.4.1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.1.ebuild deleted file mode 100644 index 38b679b76f56..000000000000 --- a/x11-libs/wxGTK/wxGTK-2.4.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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.6 2003/10/09 05:55:37 pythonhead 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" - -DEPEND="virtual/x11 - media-libs/netpbm - media-libs/giflib - media-libs/libpng - media-libs/jpeg - media-libs/tiff - sys-libs/zlib - odbc? ( dev-db/unixODBC ) - opengl? ( virtual/opengl ) - gtk2? ( >=x11-libs/gtk+-2.0* dev-libs/libunicode ) : ( =x11-libs/gtk+-1.2* )" - -RDEPEND="nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-wxpython1.patch - epatch ${FILESDIR}/${P}-wxpython2.patch -} - -src_compile() { - local myconf - myconf="--enable-gif --with-libtiff --with-zlib --with-libpng \ - --enable-png --with-libjpeg" - - #Note: pcx image support enabled by default if found. - #Also, all wxWindows gui features are enabled by default. If you - #want to build a smaller library you can disable features by adding - #the appropriate flags to myconf (see INSTALL.txt). - - #The build tools include a --with-freetype option, however it doesn't - #seem to be implemented in the source yet. - - # Note: ODBC support does not work with --enable-unicode - # We only use --enable-unicode (if at all) when we use - # gtk2. - - - if [ `use odbc` ] && [ ! `use gtk2` ]; then - myconf="${myconf} --with-odbc" - elif [ `use odbc` ] && [ `use gtk2` ]; then - ewarn "" - einfo "you cannot specify both odbc and gtk2" - einfo "Choosing gtk2 over odbc" - einfo "re-run with USE=\"-gtk2\" to enable odbc" - ewarn "" - sleep 5 - myconf="${myconf} --without-odbc" - else - myconf="${myconf} --without-odbc" - fi - - use opengl \ - && myconf="${myconf} --with-opengl" \ - || myconf="${myconf} --without-opengl" - - myconf="${myconf} --with-gtk" - - # 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 - # - # ref #20116 - liquidx@gentoo.org (07 May 2003) - - #use gtk2 && myconf="${myconf} --enable-gtk2 --enable-unicode" - use gtk2 && myconf="${myconf} --enable-gtk2" - - econf ${myconf} - emake || die "make failed" -} - -src_install() { - einstall - dodoc *.txt -} diff --git a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2.ebuild index 02e404e8fa80..94acfcb68f6a 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.2.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.2.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/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.3 2003/10/08 00:09:38 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2.ebuild,v 1.4 2003/10/09 08:05:40 liquidx Exp $ DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit." SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" @@ -8,7 +8,7 @@ HOMEPAGE="http://www.wxwindows.org/" LICENSE="wxWinLL-3" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" +KEYWORDS="~x86 ~ppc ~sparc ~alpha" IUSE="nls odbc opengl gtk2 unicode debug" RDEPEND="virtual/x11 @@ -16,7 +16,7 @@ RDEPEND="virtual/x11 media-libs/libpng media-libs/jpeg media-libs/tiff - odbc? ( dev-db/unixODBC ) + !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* )" @@ -56,9 +56,9 @@ src_compile() { use gtk2 && myconf="${myconf} --enable-gtk2" # only allow unicode if using gtk2 - use gtk2 && use unicode && myconf="${myconf} --enable-unicode" + [ -n "`use gtk2`" -a -n "`use unicode`" ] && myconf="${myconf} --enable-unicode" # only enable odbc if unicode is not enabled. - ( use gtk2 && use unicode ) || myconf="${myconf} --with-odbc" + [ -n "`use gtk2`" -a -n "`use unicode`" ] || myconf="${myconf} `use_with odbc`" econf ${myconf} emake || die "make failed" |