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 1PrUsK-0007GZ-Dy for garchives@archives.gentoo.org; Mon, 21 Feb 2011 12:28:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C602E073A; Mon, 21 Feb 2011 12:28:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 54B97E073C for ; Mon, 21 Feb 2011 12:28:06 +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 BD99B1B4053 for ; Mon, 21 Feb 2011 12:28:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AD34A80075 for ; Mon, 21 Feb 2011 12:28:04 +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: <19dca1a8c23078a2d98df4d4f406fc5ee2ced032.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild X-VCS-Directories: gnome-extra/gtkhtml/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 19dca1a8c23078a2d98df4d4f406fc5ee2ced032 Date: Mon, 21 Feb 2011 12:28:04 +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: 4fdf42ae6f8323e17a705a34a992d6c8 commit: 19dca1a8c23078a2d98df4d4f406fc5ee2ced032 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 21 12:18:29 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 21 12:18:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D19dca1a8 gnome-extra/gtkhtml: 3.91.6 -> 3.91.90, rename gtkhtml-editor-test * Instead of removing it from SLOT=3D3.14, just rename it for SLOT=3D4.0 = . This reduces one blocker for the user to resolve --- gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild | 41 --------------= ------ ...l-3.32.2-r200.ebuild =3D> gtkhtml-3.91.90.ebuild} | 15 +++---- 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild b/gnome-extra/gtkh= tml/gtkhtml-3.91.6.ebuild deleted file mode 100644 index b88b189..0000000 --- a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.1.eb= uild,v 1.1 2010/11/28 14:43:21 pacho Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 eutils - -DESCRIPTION=3D"Lightweight HTML Rendering/Printing/Editing Engine" -HOMEPAGE=3D"http://www.gnome.org/" - -LICENSE=3D"GPL-2 LGPL-2" -SLOT=3D"4.0" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE=3D"" - -RDEPEND=3D">=3Dx11-libs/gtk+-2.99.2:3 - >=3Dx11-libs/cairo-1.10 - >=3Dx11-themes/gnome-icon-theme-2.22.0 - >=3Dgnome-base/orbit-2 - >=3Dapp-text/enchant-1.1.7 - gnome-base/gconf:2 - >=3Dapp-text/iso-codes-0.49 - >=3Dnet-libs/libsoup-2.26.0:2.4 - - !!=3Ddev-util/intltool-0.40.0 - >=3Ddev-util/pkgconfig-0.9" - -pkg_setup() { - ELTCONF=3D"--reverse-deps" - G2CONF=3D"${G2CONF} - --disable-static - --disable-deprecated-warning-flags" - DOCS=3D"AUTHORS BUGS ChangeLog NEWS README TODO" -} diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild b/gnome-extra= /gtkhtml/gtkhtml-3.91.90.ebuild similarity index 79% rename from gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild rename to gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild index b82b3fc..aca0d2f 100644 --- a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild @@ -12,21 +12,19 @@ DESCRIPTION=3D"Lightweight HTML Rendering/Printing/Ed= iting Engine" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2" -SLOT=3D"3.14" +SLOT=3D"4.0" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE=3D"" =20 -COMMON_DEPEND=3D">=3Dx11-libs/gtk+-2.20:2 +RDEPEND=3D">=3Dx11-libs/gtk+-3.0:3 + >=3Dx11-libs/cairo-1.10 >=3Dx11-themes/gnome-icon-theme-2.22.0 >=3Dgnome-base/orbit-2 >=3Dapp-text/enchant-1.1.7 gnome-base/gconf:2 >=3Dapp-text/iso-codes-0.49 >=3Dnet-libs/libsoup-2.26.0:2.4" -# Depend on the 4.0 slot for the files removed below -RDEPEND=3D"${COMMON_DEPEND} - gnome-extra/gtkhtml:4.0" -DEPEND=3D"${COMMON_DEPEND} +DEPEND=3D"${RDEPEND} x11-proto/xproto sys-devel/gettext >=3Ddev-util/intltool-0.40.0 @@ -43,6 +41,7 @@ pkg_setup() { src_install() { gnome2_src_install =20 - # Don't clash with gtkhtml:4.0 - rm -vf "${ED}/usr/bin/gtkhtml-editor-test" || die + elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test= -${SLOT}" + # Don't collide with 3.14 slot + mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die }