From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PrfKu-0002wg-1P for garchives@archives.gentoo.org; Mon, 21 Feb 2011 23:38:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA208E054D; Mon, 21 Feb 2011 23:38:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 571CCE054D for ; Mon, 21 Feb 2011 23:38:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A75F1B4007 for ; Mon, 21 Feb 2011 23:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 053568006A for ; Mon, 21 Feb 2011 23:38:26 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1a05011c67b01d040d5d10738c37c3988566407c.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/, x11-libs/gnome-pty-helper/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gnome-pty-helper/gnome-pty-helper-0.27.90.ebuild x11-libs/vte/files/vte-0.27.4-fix-gdk-targets.patch x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch x11-libs/vte/vte-0.26.2-r200.ebuild x11-libs/vte/vte-0.27.5.ebuild x11-libs/vte/vte-0.27.90-r200.ebuild x11-libs/vte/vte-0.27.90.ebuild x11-libs/vte/vte-9999.ebuild X-VCS-Directories: x11-libs/vte/ x11-libs/vte/files/ x11-libs/gnome-pty-helper/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 1a05011c67b01d040d5d10738c37c3988566407c Date: Mon, 21 Feb 2011 23:38:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c225e99741f6731cde84f8562e5e1a8d commit: 1a05011c67b01d040d5d10738c37c3988566407c Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 21 23:32:23 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 21 23:37:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1a05011c 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 =3D> vte-0.27.90-fix-gdk-targets.patch} | 2 +- ...-0.26.2-r200.ebuild =3D> vte-0.27.90-r200.ebuild} | 40 +++++++++++-= ------- .../vte/{vte-0.27.5.ebuild =3D> 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=3D"3" +VTE_PV=3D"0.26.2" # check for changes in git to bump + +inherit gnome.org base + +DESCRIPTION=3D"GNOME Setuid helper for opening ptys" +HOMEPAGE=3D"http://git.gnome.org/browse/vte/" +# gnome-pty-helper is inside vte +SRC_URI=3D"${SRC_URI//${PN}/vte}" +SRC_URI=3D"${SRC_URI//${PV}/${VTE_PV}}" + +LICENSE=3D"LGPL-2" +SLOT=3D"0" +IUSE=3D"" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~= x86-fbsd" + +# gnome-pty-helper was spit out with 0.27.90 +RDEPEND=3D"!!=3Ddev-libs/glib-2.22:2 - >=3Dx11-libs/gtk+-2.20:2 +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live + KEYWORDS=3D"" +else + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd" +fi + +PDEPEND=3D"x11-libs/gnome-pty-helper" +RDEPEND=3D">=3Ddev-libs/glib-2.26:2 + >=3Dx11-libs/gtk+-2.20.0:2 >=3Dx11-libs/pango-1.22.0 + sys-libs/ncurses - glade? ( dev-util/glade:3 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) - python? ( >=3Ddev-python/pygtk-2.4 ) x11-libs/libX11 - x11-libs/libXft" -RDEPEND=3D"${COMMON_DEPEND} - x11-libs/vte:2.90" -DEPEND=3D"${COMMON_DEPEND} + x11-libs/libXft + + glade? ( dev-util/glade:3 ) + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.0 ) + python? ( >=3Ddev-python/pygtk-2.4 ) " +DEPEND=3D"${RDEPEND} doc? ( >=3Ddev-util/gtk-doc-1.13 ) >=3Ddev-util/intltool-0.35 >=3Ddev-util/pkgconfig-0.9 + sys-apps/sed sys-devel/gettext" =20 pkg_setup() { G2CONF=3D"${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=3D2.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.eb= uild 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=3D"yes" =20 inherit autotools eutils gnome2 #python =20 -DESCRIPTION=3D"Gnome terminal widget" -HOMEPAGE=3D"http://www.gnome.org/" +DESCRIPTION=3D"GNOME terminal widget" +HOMEPAGE=3D"http://git.gnome.org/browse/vte" =20 LICENSE=3D"LGPL-2" SLOT=3D"2.90" @@ -23,8 +23,9 @@ else fi =20 # No python bindings (yet) with gtk+:3 +PDEPEND=3D"x11-libs/gnome-pty-helper" RDEPEND=3D">=3Ddev-libs/glib-2.26:2 - >=3Dx11-libs/gtk+-2.91.6:3 + >=3Dx11-libs/gtk+-3.0:3 >=3Dx11-libs/pango-1.22.0 =20 sys-libs/ncurses @@ -32,9 +33,7 @@ RDEPEND=3D">=3Ddev-libs/glib-2.26:2 x11-libs/libXft =20 glade? ( dev-util/glade:3 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.0 ) - - !!=3Ddev-libs/gobject-introspection-0.9.0 )" DEPEND=3D"${RDEPEND} doc? ( >=3Ddev-util/gtk-doc-1.13 ) >=3Ddev-util/intltool-0.35 @@ -44,9 +43,9 @@ DEPEND=3D"${RDEPEND} =20 src_prepare() { G2CONF=3D"${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=3D"AUTHORS ChangeLog HACKING NEWS README" #use python && python_set_active_version 2 =20 - epatch "${FILESDIR}/${PN}-0.27.4-fix-gdk-targets.patch" + epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch" =20 [[ ${PV} !=3D 9999 ]] && eautoreconf =20 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=3D"yes" =20 inherit autotools eutils gnome2 #python =20 -DESCRIPTION=3D"Gnome terminal widget" -HOMEPAGE=3D"http://www.gnome.org/" +DESCRIPTION=3D"GNOME terminal widget" +HOMEPAGE=3D"http://git.gnome.org/browse/vte" =20 LICENSE=3D"LGPL-2" SLOT=3D"2.90" @@ -23,8 +23,9 @@ else fi =20 # No python bindings (yet) with gtk+:3 +PDEPEND=3D"x11-libs/gnome-pty-helper" RDEPEND=3D">=3Ddev-libs/glib-2.26:2 - >=3Dx11-libs/gtk+-2.91.6:3 + >=3Dx11-libs/gtk+-3.0:3 >=3Dx11-libs/pango-1.22.0 =20 sys-libs/ncurses @@ -32,9 +33,7 @@ RDEPEND=3D">=3Ddev-libs/glib-2.26:2 x11-libs/libXft =20 glade? ( dev-util/glade:3 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.0 ) - - !!=3Ddev-libs/gobject-introspection-0.9.0 )" DEPEND=3D"${RDEPEND} doc? ( >=3Ddev-util/gtk-doc-1.13 ) >=3Ddev-util/intltool-0.35 @@ -44,9 +43,9 @@ DEPEND=3D"${RDEPEND} =20 src_prepare() { G2CONF=3D"${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=3D"AUTHORS ChangeLog HACKING NEWS README" #use python && python_set_active_version 2 =20 - epatch "${FILESDIR}/${PN}-0.27.4-fix-gdk-targets.patch" + epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch" =20 [[ ${PV} !=3D 9999 ]] && eautoreconf =20