diff options
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild | 11 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild | 8 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild | 8 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild | 32 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild | 7 |
6 files changed, 46 insertions, 27 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index cd55d869c965..8ef444454887 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/wxGTK # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.274 2011/11/12 11:13:41 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.275 2011/11/12 13:55:52 jlec Exp $ + + 12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.6.4.0-r6.ebuild, + wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild, + wxGTK-2.9.1.1.ebuild: + Corrected Slotting and versioning, thanks leio spotting that 12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.9.1.1.ebuild: Import prefix changes, all are triggered by USE=aqua diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild index d6f41293d2cc..86d32a18f4ff 100644 --- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.13 2011/11/12 11:09:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.14 2011/11/12 13:55:52 jlec Exp $ EAPI=1 inherit eutils versionator flag-o-matic @@ -24,17 +24,16 @@ RDEPEND=" odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( - >=dev-libs/glib-2.22:2 + dev-libs/glib:2 media-libs/libpng:0 + media-libs/tiff:0 sys-libs/zlib virtual/jpeg - >=x11-libs/gtk+-2.18:2 - media-libs/tiff:0 + x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/pango - gnome? ( gnome-base/libgnomeprintui ) + gnome? ( gnome-base/libgnomeprintui ) opengl? ( virtual/opengl ) )" diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild index d3935b381dae..bc9359b2a2ef 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.12 2011/11/12 11:09:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.13 2011/11/12 13:55:52 jlec Exp $ EAPI="2" @@ -24,16 +24,16 @@ RDEPEND=" odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( - >=dev-libs/glib-2.22:2 + dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg - >=x11-libs/gtk+-2.18:2 + x11-libs/gtk+:2 media-libs/tiff:0 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/pango + x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 diff --git a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild index 3432a11bd35f..dc705437fcbb 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.13 2011/11/12 11:09:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.14 2011/11/12 13:55:52 jlec Exp $ EAPI="2" @@ -24,15 +24,15 @@ RDEPEND=" odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( - >=dev-libs/glib-2.22:2 + dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg - >=x11-libs/gtk+-2.18:2 + x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/pango + x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild index 2d9039f86f5a..0737fe4cc85c 100644 --- a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v 1.3 2011/11/12 11:09:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v 1.4 2011/11/12 13:55:52 jlec Exp $ EAPI="2" @@ -16,23 +16,23 @@ BASE_P="${PN}-${BASE_PV}" # docs, and are released more frequently than wxGTK. SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="X doc debug gnome gstreamer odbc opengl pch sdl tiff" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" RDEPEND=" dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( - >=dev-libs/glib-2.22:2 + dev-libs/glib:2 media-libs/libpng:0 sys-libs/zlib virtual/jpeg - >=x11-libs/gtk+-2.18:2 + x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/pango + x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 @@ -40,6 +40,11 @@ RDEPEND=" >=media-libs/gst-plugins-base-0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) + ) + aqua? ( + >=x11-libs/gtk+-2.4[aqua=] + virtual/jpeg + tiff? ( media-libs/tiff:0 ) )" DEPEND="${RDEPEND} @@ -102,10 +107,21 @@ src_configure() { $(use_with gnome gnomeprint) --without-gnomevfs" + use aqua && \ + myconf="${myconf} + --enable-graphics_ctx + --enable-gui + --with-libpng=sys + --with-libxpm=sys + --with-libjpeg=sys + --with-mac + --with-opengl" + # cocoa toolkit seems to be broken # wxBase options - use X || \ + if use !X && use !aqua ; then myconf="${myconf} --disable-gui" + fi mkdir "${S}"/wxgtk_build cd "${S}"/wxgtk_build @@ -144,7 +160,7 @@ src_install() { fi # We don't want this - rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo + rm "${ED}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo } pkg_postinst() { diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild index d6abe87086af..94f10d6898b6 100644 --- a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.6 2011/11/12 11:13:41 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.7 2011/11/12 13:55:52 jlec Exp $ EAPI="3" @@ -29,7 +29,7 @@ RDEPEND=" x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/pango + x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 @@ -40,7 +40,7 @@ RDEPEND=" ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] - media-libs/jpeg + virtual/jpeg tiff? ( media-libs/tiff:0 ) )" @@ -65,7 +65,6 @@ S="${WORKDIR}/wxPython-src-${PV}" src_prepare() { epatch "${FILESDIR}"/${P}-collision.patch epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch - } src_configure() { |