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 1PreLv-0001Qk-J0 for garchives@archives.gentoo.org; Mon, 21 Feb 2011 22:35:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A323E0552; Mon, 21 Feb 2011 22:35:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BEC40E0552 for ; Mon, 21 Feb 2011 22:35:13 +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 EECBE1B4120 for ; Mon, 21 Feb 2011 22:35:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 613FE8006E for ; Mon, 21 Feb 2011 22:35:12 +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: Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild x11-terms/gnome-terminal/gnome-terminal-9999.ebuild X-VCS-Directories: x11-terms/gnome-terminal/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: b81310f6dd27152c9e0cf11ea3eb6b700b162892 Date: Mon, 21 Feb 2011 22:35:12 +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: c960f7813067e1ef9c65022be056d73d commit: b81310f6dd27152c9e0cf11ea3eb6b700b162892 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 21 22:11:52 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 21 22:11:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Db81310f6 x11-terms/gnome-terminal: 2.33.5 -> 2.33.90 --- ...2.33.5.ebuild =3D> gnome-terminal-2.33.90.ebuild} | 10 ++-------- .../gnome-terminal/gnome-terminal-9999.ebuild | 17 ++++++--------= --- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild b/x11-= terms/gnome-terminal/gnome-terminal-2.33.90.ebuild similarity index 79% rename from x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild rename to x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild index 8608dd7..56f8a97 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-2.33.90.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" =20 -inherit autotools eutils gnome2 +inherit eutils gnome2 =20 DESCRIPTION=3D"The Gnome Terminal" HOMEPAGE=3D"http://www.gnome.org/" @@ -20,9 +20,8 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" fi =20 -# libgnome needed for some monospace font schema, bug #274638 RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 - >=3Dx11-libs/gtk+-2.99.3:3 + >=3Dx11-libs/gtk+-3.0:3 >=3Dx11-libs/vte-0.27.3:2.90 >=3Dgnome-base/gconf-2.31.3 >=3Dgnome-base/gsettings-desktop-schemas-0.1.0 @@ -45,10 +44,5 @@ src_prepare() { # Use login shell by default (#12900) epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch =20 - # Remove libgnome dep, taken from upstream, not needed for next release - epatch "${FILESDIR}"/${P}-remove-libgnome-dep.patch - - [[ ${PV} !=3D 9999 ]] && eautoreconf - gnome2_src_prepare } diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-te= rms/gnome-terminal/gnome-terminal-9999.ebuild index a14ed06..56f8a97 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" =20 -inherit autotools eutils gnome2 +inherit eutils gnome2 =20 DESCRIPTION=3D"The Gnome Terminal" HOMEPAGE=3D"http://www.gnome.org/" @@ -20,14 +20,13 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" fi =20 -# libgnome needed for some monospace font schema, bug #274638 -RDEPEND=3D">=3Ddev-libs/glib-2.25.12:2 - >=3Dx11-libs/gtk+-2.91.6:3 - >=3Dgnome-base/gconf-2.31.3 +RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 + >=3Dx11-libs/gtk+-3.0:3 >=3Dx11-libs/vte-0.27.3:2.90 + >=3Dgnome-base/gconf-2.31.3 + >=3Dgnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM - x11-libs/libX11 - gnome-base/libgnome" + x11-libs/libICE" DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 >=3Ddev-util/pkgconfig-0.9 @@ -45,9 +44,5 @@ src_prepare() { # Use login shell by default (#12900) epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch =20 - epatch "${FILESDIR}"/${PN}-2.33.4-fix-gdk-targets.patch - - [[ ${PV} !=3D 9999 ]] && eautoreconf - gnome2_src_prepare }