* [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/, x11-libs/gnome-pty-helper/
@ 2011-02-21 23:38 Nirbheek Chauhan
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan @ 2011-02-21 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 1a05011c67b01d040d5d10738c37c3988566407c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 23:32:23 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 23:37:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a05011c
x11-libs/vte, gnome-pty-helper: bump, split
* Bump to 0.27.90, add gtk+:2 version
* Split gnome-pty-helper out to avoid file-collisions b/w gtk+:2 and gtk+:3 versions
---
.../gnome-pty-helper-0.27.90.ebuild | 24 ++++++++++++
...ets.patch => vte-0.27.90-fix-gdk-targets.patch} | 2 +-
...-0.26.2-r200.ebuild => vte-0.27.90-r200.ebuild} | 40 +++++++++++--------
.../vte/{vte-0.27.5.ebuild => vte-0.27.90.ebuild} | 15 +++----
x11-libs/vte/vte-9999.ebuild | 15 +++----
5 files changed, 62 insertions(+), 34 deletions(-)
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.27.90.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.27.90.ebuild
new file mode 100644
index 0000000..db12b6f
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.27.90.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+VTE_PV="0.26.2" # check for changes in git to bump
+
+inherit gnome.org base
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="http://git.gnome.org/browse/vte/"
+# gnome-pty-helper is inside vte
+SRC_URI="${SRC_URI//${PN}/vte}"
+SRC_URI="${SRC_URI//${PV}/${VTE_PV}}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!!<x11-libs/vte-0.27.90"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/vte-${VTE_PV}/gnome-pty-helper"
diff --git a/x11-libs/vte/files/vte-0.27.4-fix-gdk-targets.patch b/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
similarity index 97%
rename from x11-libs/vte/files/vte-0.27.4-fix-gdk-targets.patch
rename to x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
index 936a596..1590b81 100644
--- a/x11-libs/vte/files/vte-0.27.4-fix-gdk-targets.patch
+++ b/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
@@ -15,7 +15,7 @@ no longer works. So, sort of hack around it for now?
@@ -62,6 +63,7 @@
VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
GTK_API_VERSION=3.0
- GTK_REQUIRED=2.91.6
+ GTK_REQUIRED=3.0.0
+ GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
;;
esac
diff --git a/x11-libs/vte/vte-0.26.2-r200.ebuild b/x11-libs/vte/vte-0.27.90-r200.ebuild
similarity index 65%
rename from x11-libs/vte/vte-0.26.2-r200.ebuild
rename to x11-libs/vte/vte-0.27.90-r200.ebuild
index 02ff6b9..9139b7c 100644
--- a/x11-libs/vte/vte-0.26.2-r200.ebuild
+++ b/x11-libs/vte/vte-0.27.90-r200.ebuild
@@ -4,39 +4,48 @@
EAPI="3"
GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.4"
inherit gnome2 python
-DESCRIPTION="Gnome terminal widget"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="http://git.gnome.org/browse/vte"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="debug doc glade +introspection python"
-
-COMMON_DEPEND=">=dev-libs/glib-2.22:2
- >=x11-libs/gtk+-2.20:2
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+PDEPEND="x11-libs/gnome-pty-helper"
+RDEPEND=">=dev-libs/glib-2.26:2
+ >=x11-libs/gtk+-2.20.0:2
>=x11-libs/pango-1.22.0
+
sys-libs/ncurses
- glade? ( dev-util/glade:3 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- python? ( >=dev-python/pygtk-2.4 )
x11-libs/libX11
- x11-libs/libXft"
-RDEPEND="${COMMON_DEPEND}
- x11-libs/vte:2.90"
-DEPEND="${COMMON_DEPEND}
+ x11-libs/libXft
+
+ glade? ( dev-util/glade:3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+ python? ( >=dev-python/pygtk-2.4 ) "
+DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.13 )
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.9
+ sys-apps/sed
sys-devel/gettext"
pkg_setup() {
G2CONF="${G2CONF}
- --disable-maintainer-mode
+ --disable-gnome-pty-helper
--disable-deprecation
+ --disable-maintainer-mode
--disable-static
$(use_enable debug)
$(use_enable glade glade-catalogue)
@@ -51,7 +60,4 @@ pkg_setup() {
src_install() {
gnome2_src_install
python_clean_installation_image
-
- # Avoid clashing with SLOT=2.90
- rm -vf "${ED}/usr/libexec/gnome-pty-helper" || die
}
diff --git a/x11-libs/vte/vte-0.27.5.ebuild b/x11-libs/vte/vte-0.27.90.ebuild
similarity index 83%
rename from x11-libs/vte/vte-0.27.5.ebuild
rename to x11-libs/vte/vte-0.27.90.ebuild
index ca5975d..cd7db5a 100644
--- a/x11-libs/vte/vte-0.27.5.ebuild
+++ b/x11-libs/vte/vte-0.27.90.ebuild
@@ -9,8 +9,8 @@ GNOME2_LA_PUNT="yes"
inherit autotools eutils gnome2 #python
-DESCRIPTION="Gnome terminal widget"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="http://git.gnome.org/browse/vte"
LICENSE="LGPL-2"
SLOT="2.90"
@@ -23,8 +23,9 @@ else
fi
# No python bindings (yet) with gtk+:3
+PDEPEND="x11-libs/gnome-pty-helper"
RDEPEND=">=dev-libs/glib-2.26:2
- >=x11-libs/gtk+-2.91.6:3
+ >=x11-libs/gtk+-3.0:3
>=x11-libs/pango-1.22.0
sys-libs/ncurses
@@ -32,9 +33,7 @@ RDEPEND=">=dev-libs/glib-2.26:2
x11-libs/libXft
glade? ( dev-util/glade:3 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-
- !!<x11-libs/vte-0.26.2-r200"
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.13 )
>=dev-util/intltool-0.35
@@ -44,9 +43,9 @@ DEPEND="${RDEPEND}
src_prepare() {
G2CONF="${G2CONF}
+ --disable-gnome-pty-helper
--disable-deprecation
--disable-maintainer-mode
- --disable-schemas-compile
--disable-static
$(use_enable debug)
$(use_enable glade glade-catalogue)
@@ -57,7 +56,7 @@ src_prepare() {
DOCS="AUTHORS ChangeLog HACKING NEWS README"
#use python && python_set_active_version 2
- epatch "${FILESDIR}/${PN}-0.27.4-fix-gdk-targets.patch"
+ epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch"
[[ ${PV} != 9999 ]] && eautoreconf
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index ca5975d..cd7db5a 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -9,8 +9,8 @@ GNOME2_LA_PUNT="yes"
inherit autotools eutils gnome2 #python
-DESCRIPTION="Gnome terminal widget"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="http://git.gnome.org/browse/vte"
LICENSE="LGPL-2"
SLOT="2.90"
@@ -23,8 +23,9 @@ else
fi
# No python bindings (yet) with gtk+:3
+PDEPEND="x11-libs/gnome-pty-helper"
RDEPEND=">=dev-libs/glib-2.26:2
- >=x11-libs/gtk+-2.91.6:3
+ >=x11-libs/gtk+-3.0:3
>=x11-libs/pango-1.22.0
sys-libs/ncurses
@@ -32,9 +33,7 @@ RDEPEND=">=dev-libs/glib-2.26:2
x11-libs/libXft
glade? ( dev-util/glade:3 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-
- !!<x11-libs/vte-0.26.2-r200"
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.13 )
>=dev-util/intltool-0.35
@@ -44,9 +43,9 @@ DEPEND="${RDEPEND}
src_prepare() {
G2CONF="${G2CONF}
+ --disable-gnome-pty-helper
--disable-deprecation
--disable-maintainer-mode
- --disable-schemas-compile
--disable-static
$(use_enable debug)
$(use_enable glade glade-catalogue)
@@ -57,7 +56,7 @@ src_prepare() {
DOCS="AUTHORS ChangeLog HACKING NEWS README"
#use python && python_set_active_version 2
- epatch "${FILESDIR}/${PN}-0.27.4-fix-gdk-targets.patch"
+ epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch"
[[ ${PV} != 9999 ]] && eautoreconf
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-21 23:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-21 23:38 [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/, x11-libs/gnome-pty-helper/ Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox