* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild ChangeLog wxGTK-2.8.10.1-r5.ebuild wxGTK-2.9.1.1.ebuild wxGTK-2.8.11.0.ebuild
@ 2011-11-12 13:55 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-11-12 13:55 UTC (permalink / raw
To: gentoo-commits
jlec 11/11/12 13:55:52
Modified: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild
ChangeLog wxGTK-2.8.10.1-r5.ebuild
wxGTK-2.9.1.1.ebuild wxGTK-2.8.11.0.ebuild
Log:
Corrected Slotting and versioning, thanks leio spotting that
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Revision Changes Path
1.4 x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild?r1=1.3&r2=1.4
Index: wxGTK-2.8.12.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxGTK-2.8.12.0.ebuild 12 Nov 2011 11:09:11 -0000 1.3
+++ wxGTK-2.8.12.0.ebuild 12 Nov 2011 13:55:52 -0000 1.4
@@ -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 @@
# 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 @@
>=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 @@
$(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 @@
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() {
1.14 x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?r1=1.13&r2=1.14
Index: wxGTK-2.6.4.0-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wxGTK-2.6.4.0-r6.ebuild 12 Nov 2011 11:09:11 -0000 1.13
+++ wxGTK-2.6.4.0-r6.ebuild 12 Nov 2011 13:55:52 -0000 1.14
@@ -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 @@
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 )
)"
1.275 x11-libs/wxGTK/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.275&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.275&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.274&r2=1.275
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- ChangeLog 12 Nov 2011 11:13:41 -0000 1.274
+++ ChangeLog 12 Nov 2011 13:55:52 -0000 1.275
@@ -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
1.13 x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?r1=1.12&r2=1.13
Index: wxGTK-2.8.10.1-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wxGTK-2.8.10.1-r5.ebuild 12 Nov 2011 11:09:11 -0000 1.12
+++ wxGTK-2.8.10.1-r5.ebuild 12 Nov 2011 13:55:52 -0000 1.13
@@ -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 @@
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
1.7 x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild?r1=1.6&r2=1.7
Index: wxGTK-2.9.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wxGTK-2.9.1.1.ebuild 12 Nov 2011 11:13:41 -0000 1.6
+++ wxGTK-2.9.1.1.ebuild 12 Nov 2011 13:55:52 -0000 1.7
@@ -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 @@
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 @@
)
aqua? (
>=x11-libs/gtk+-2.4[aqua=]
- media-libs/jpeg
+ virtual/jpeg
tiff? ( media-libs/tiff:0 )
)"
@@ -65,7 +65,6 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-collision.patch
epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch
-
}
src_configure() {
1.14 x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild?r1=1.13&r2=1.14
Index: wxGTK-2.8.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wxGTK-2.8.11.0.ebuild 12 Nov 2011 11:09:11 -0000 1.13
+++ wxGTK-2.8.11.0.ebuild 12 Nov 2011 13:55:52 -0000 1.14
@@ -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 @@
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-12 13:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-12 13:55 [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild ChangeLog wxGTK-2.8.10.1-r5.ebuild wxGTK-2.9.1.1.ebuild wxGTK-2.8.11.0.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox