* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild ChangeLog metadata.xml wxGTK-2.8.10.1-r5.ebuild wxGTK-2.9.1.1.ebuild wxGTK-2.8.11.0.ebuild
@ 2011-11-12 11:09 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-11-12 11:09 UTC (permalink / raw
To: gentoo-commits
jlec 11/11/12 11:09:11
Modified: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild
ChangeLog metadata.xml wxGTK-2.8.10.1-r5.ebuild
wxGTK-2.9.1.1.ebuild wxGTK-2.8.11.0.ebuild
Log:
Corrected slotting for png and tiff, resorted ebuild to fit common sense order, removed unnessesary die
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Revision Changes Path
1.3 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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild?r1=1.2&r2=1.3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wxGTK-2.8.12.0.ebuild 9 Oct 2011 10:27:42 -0000 1.2
+++ wxGTK-2.8.12.0.ebuild 12 Nov 2011 11:09:11 -0000 1.3
@@ -1,12 +1,12 @@
# 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.2 2011/10/09 10:27:42 ssuominen Exp $
+# $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 $
EAPI="2"
inherit eutils versionator flag-o-matic
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
BASE_PV="$(get_version_component_range 1-3)"
@@ -24,19 +24,22 @@
odbc? ( dev-db/unixODBC )
sdl? ( media-libs/libsdl )
X? (
- >=x11-libs/gtk+-2.4:2
- >=dev-libs/glib-2.4:2
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0
+ sys-libs/zlib
virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
+ x11-libs/pango
gnome? ( gnome-base/libgnomeprintui:2.2 )
gstreamer? (
gnome-base/gconf:2
>=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10 )
opengl? ( virtual/opengl )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
)"
DEPEND="${RDEPEND}
@@ -107,7 +110,7 @@
mkdir "${S}"/wxgtk_build
cd "${S}"/wxgtk_build
- ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+ ECONF_SOURCE="${S}" econf ${myconf}
}
src_compile() {
1.13 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.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.13&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.12&r2=1.13
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wxGTK-2.6.4.0-r6.ebuild 15 Sep 2011 19:24:43 -0000 1.12
+++ wxGTK-2.6.4.0-r6.ebuild 12 Nov 2011 11:09:11 -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.6.4.0-r6.ebuild,v 1.12 2011/09/15 19:24:43 ssuominen Exp $
+# $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 $
EAPI=1
inherit eutils versionator flag-o-matic
@@ -24,14 +24,17 @@
odbc? ( dev-db/unixODBC )
sdl? ( media-libs/libsdl )
X? (
- x11-libs/gtk+:2
- dev-libs/glib:2
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0
+ sys-libs/zlib
virtual/jpeg
- media-libs/tiff
+ >=x11-libs/gtk+-2.18:2
+ media-libs/tiff:0
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
- gnome? ( gnome-base/libgnomeprintui )
+ x11-libs/pango
+ gnome? ( gnome-base/libgnomeprintui )
opengl? ( virtual/opengl )
)"
@@ -201,8 +204,7 @@
ECONF_SOURCE="${S}" econf \
${myconf} \
- ${build_wx_conf} \
- || die "Failed to configure $1."
+ ${build_wx_conf}
emake || die "Failed to make $1."
1.273 x11-libs/wxGTK/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.273&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.273&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.272&r2=1.273
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- ChangeLog 25 Oct 2011 04:06:33 -0000 1.272
+++ ChangeLog 12 Nov 2011 11:09:11 -0000 1.273
@@ -1,6 +1,12 @@
# 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.272 2011/10/25 04:06:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.273 2011/11/12 11:09:11 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, metadata.xml:
+ Corrected slotting for png and tiff, resorted ebuild to fit common sense
+ order, removed unnessesary die
25 Oct 2011; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.1.1.ebuild:
Apply libpng-1.5 patch to 2.9 as well.
1.5 x11-libs/wxGTK/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 9 Mar 2010 23:51:58 -0000 1.4
+++ metadata.xml 12 Nov 2011 11:09:11 -0000 1.5
@@ -7,14 +7,14 @@
<description>All modifications to this package must be approved by the wxwidgets herd.</description>
</maintainer>
<use>
- <flag name='gstreamer'>
+ <flag name="gstreamer">
Enable the wxMediaCtrl class for playing audio and video through
gstreamer.
</flag>
- <flag name='gnome'>
+ <flag name="gnome">
Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks.
</flag>
- <flag name='sdl'>
+ <flag name="sdl">
Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
audio.
</flag>
1.12 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.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.12&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.11&r2=1.12
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wxGTK-2.8.10.1-r5.ebuild 27 Feb 2011 14:32:40 -0000 1.11
+++ wxGTK-2.8.10.1-r5.ebuild 12 Nov 2011 11:09:11 -0000 1.12
@@ -1,12 +1,12 @@
# 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.11 2011/02/27 14:32:40 dirtyepic Exp $
+# $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 $
EAPI="2"
inherit eutils versionator flag-o-matic
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
BASE_PV="$(get_version_component_range 1-3)"
@@ -24,13 +24,16 @@
odbc? ( dev-db/unixODBC )
sdl? ( media-libs/libsdl )
X? (
- >=x11-libs/gtk+-2.4:2
- >=dev-libs/glib-2.4:2
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0
+ sys-libs/zlib
virtual/jpeg
- media-libs/tiff
+ >=x11-libs/gtk+-2.18:2
+ media-libs/tiff:0
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
+ x11-libs/pango
gnome? ( gnome-base/libgnomeprintui:2.2 )
gstreamer? (
gnome-base/gconf:2
@@ -116,7 +119,7 @@
mkdir "${S}"/wxgtk_build
cd "${S}"/wxgtk_build
- ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+ ECONF_SOURCE="${S}" econf ${myconf}
}
src_compile() {
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild?r1=1.4&r2=1.5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxGTK-2.9.1.1.ebuild 25 Oct 2011 04:06:33 -0000 1.4
+++ wxGTK-2.9.1.1.ebuild 12 Nov 2011 11:09:11 -0000 1.5
@@ -1,12 +1,12 @@
# 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.4 2011/10/25 04:06:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.5 2011/11/12 11:09:11 jlec Exp $
EAPI="3"
inherit eutils flag-o-matic
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
# we use the wxPython tarballs because they include the full wxGTK sources and
@@ -21,19 +21,22 @@
dev-libs/expat
sdl? ( media-libs/libsdl )
X? (
- >=x11-libs/gtk+-2.18:2
>=dev-libs/glib-2.22:2
+ media-libs/libpng:0
+ sys-libs/zlib
virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
+ x11-libs/pango
gnome? ( gnome-base/libgnomeprintui:2.2 )
gstreamer? (
gnome-base/gconf:2
>=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10 )
opengl? ( virtual/opengl )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
)"
DEPEND="${RDEPEND}
@@ -109,7 +112,7 @@
mkdir "${S}"/wxgtk_build
cd "${S}"/wxgtk_build
- ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+ ECONF_SOURCE="${S}" econf ${myconf}
}
src_compile() {
1.13 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.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild?r1=1.12&r2=1.13
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wxGTK-2.8.11.0.ebuild 16 Jul 2011 09:32:34 -0000 1.12
+++ wxGTK-2.8.11.0.ebuild 12 Nov 2011 11:09:11 -0000 1.13
@@ -1,12 +1,12 @@
# 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.12 2011/07/16 09:32:34 xarthisius Exp $
+# $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 $
EAPI="2"
inherit eutils versionator flag-o-matic
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
BASE_PV="$(get_version_component_range 1-3)"
@@ -24,18 +24,21 @@
odbc? ( dev-db/unixODBC )
sdl? ( media-libs/libsdl )
X? (
- >=x11-libs/gtk+-2.4:2
- >=dev-libs/glib-2.4:2
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0
+ sys-libs/zlib
virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
+ x11-libs/pango
gnome? ( gnome-base/libgnomeprintui:2.2 )
gstreamer? (
gnome-base/gconf:2
>=media-libs/gstreamer-0.10 )
opengl? ( virtual/opengl )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
)"
DEPEND="${RDEPEND}
@@ -107,7 +110,7 @@
mkdir "${S}"/wxgtk_build
cd "${S}"/wxgtk_build
- ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+ ECONF_SOURCE="${S}" econf ${myconf}
}
src_compile() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-12 11:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-12 11:09 [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: wxGTK-2.8.12.0.ebuild wxGTK-2.6.4.0-r6.ebuild ChangeLog metadata.xml 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