Clean up old revisions. Restrict gtk+ dependency to slot 2.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

5 files changed, 8 insertions, 201 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 97e2d2d5f08a..e8e1c9ef8849 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.149 2010/10/17 19:39:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.150 2010/10/20 20:26:19 eva Exp $
+
+  20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gucharmap-2.26.3.1.ebuild, -files/gucharmap-2.26.3.1-en_GB.patch,
+  -gucharmap-2.28.2.ebuild, gucharmap-2.32.0.ebuild:
+  Clean up old revisions. Restrict gtk+ dependency to slot 2.
 
 *gucharmap-2.32.0 (17 Oct 2010)
 
diff --git a/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch b/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch
deleted file mode 100644
index e2de0bcb6452..000000000000
--- a/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 0678ea071136813176a0a9f860eb225e436c5951 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip@tecnocode.co.uk>
-Date: Thu, 29 Apr 2010 23:52:40 +0000
-Subject: Fixed British English documentation translation
-
----
-diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
-index 1043376..7613b63 100644
---- a/help/en_GB/en_GB.po
-+++ b/help/en_GB/en_GB.po
-@@ -2,7 +2,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gucharmap\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-03-01 17:31+0000\n"
-+"POT-Creation-Date: 2010-03-27 20:03+0000\n"
- "PO-Revision-Date: 2007-02-17 12:25-0000\n"
- "Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
- "Language-Team: British English <en@li.org>\n"
-@@ -514,8 +514,8 @@ msgid ""
- "guimenu><guimenuitem>Paste</guimenuitem></menuchoice>, or press shortcut key "
- "<keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo>."
- msgstr ""
--"Switch to your application and choose <menuchoice><guimenu>Edit</"
--"guimenu><guimenuitem>Paste</guimenuitem><shortcut><keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></shortcut></menuchoice>."
-+"Switch to your application and choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></shortcut>"
-+"<guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice>."
- 
- #: C/gucharmap.xml:345(para)
- msgid ""
-@@ -549,9 +549,8 @@ msgid ""
- "menuchoice>, or press shortcut key <keycombo><keycap>Ctrl</keycap><keycap>F</"
- "keycap></keycombo>. The <guilabel>Find</guilabel> dialog opens."
- msgstr ""
--"Choose <menuchoice><guimenu>Search</guimenu><guimenuitem>Find</guimenuitem><shortcut>"
--"<keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo></shortcut></"
--"menuchoice>. The <application>Find</application> dialogue opens."
-+"Choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo></shortcut>"
-+"<guimenu>Search</guimenu><guimenuitem>Find</guimenuitem></menuchoice>. The <application>Find</application> dialogue opens."
- 
- #: C/gucharmap.xml:367(para)
- msgid "Enter text to search for in the <guilabel>Search</guilabel> field."
-@@ -593,8 +592,8 @@ msgid ""
- "<keycombo><keycap>Ctrl</keycap><keycap>G</keycap></keycombo>."
- msgstr ""
- "Click <guibutton>Next</guibutton> to find the next matching character. "
--"Alternatively, choose <menuchoice><guimenu>Search</guimenu><guimenuitem>Find "
--"Next</guimenuitem><shortcut><keycombo><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></shortcut></menuchoice>."
-+"Alternatively, choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></shortcut>"
-+"<guimenu>Search</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice>."
- 
- #: C/gucharmap.xml:387(para)
- msgid ""
-@@ -605,9 +604,9 @@ msgid ""
- "keycap></keycombo>."
- msgstr ""
- "Click <guibutton>Previous</guibutton> to find the previous matching "
--"character. Alternatively, choose <menuchoice><guimenu>Search</"
--"guimenu><guimenuitem>Find Previous</guimenuitem><shortcut><keycombo>"
--"<keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></shortcut></menuchoice>."
-+"character. Alternatively, choose <menuchoice><shortcut><keycombo>"
-+"<keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>G</keycap></keycombo></shortcut><guimenu>Search</"
-+"guimenu><guimenuitem>Find Previous</guimenuitem></menuchoice>."
- 
- #: C/gucharmap.xml:397(title)
- msgid "To Browse Through all Characters"
-@@ -852,9 +851,9 @@ msgid ""
- "box, or press shortcut key <keycombo><keycap>Ctrl</keycap><keycap>+</"
- "keycap></keycombo>."
- msgstr ""
--"To increase the font size, choose <menuchoice><guimenu>View</"
--"guimenu><guimenuitem>Zoom In</guimenuitem><shortcut><keycombo><keycap>Ctrl</keycap>"
--"<keycap>+</keycap></keycombo></shortcut></menuchoice>, or use the zoom spin "
-+"To increase the font size, choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap>"
-+"<keycap>+</keycap></keycombo></shortcut><guimenu>View</"
-+"guimenu><guimenuitem>Zoom In</guimenuitem></menuchoice>, or use the zoom spin "
- "box."
- 
- #: C/gucharmap.xml:590(para)
-@@ -864,9 +863,9 @@ msgid ""
- "spin box, or press shortcut key <keycombo><keycap>Ctrl</keycap><keycap>-</"
- "keycap></keycombo>."
- msgstr ""
--"To decrease the font size, choose <menuchoice><guimenu>View</"
--"guimenu><guimenuitem>Zoom Out</guimenuitem><shortcut><keycombo><keycap>Ctrl</keycap>"
--"<keycap>-</keycap></keycombo></shortcut></menuchoice>, or use the zoom "
-+"To decrease the font size, choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap>"
-+"<keycap>-</keycap></keycombo></shortcut><guimenu>View</"
-+"guimenu><guimenuitem>Zoom Out</guimenuitem></menuchoice>, or use the zoom "
- "spin box."
- 
- #: C/gucharmap.xml:596(para)
-@@ -875,8 +874,8 @@ msgid ""
- "guimenu><guimenuitem>Normal Size</guimenuitem></menuchoice>, or press "
- "shortcut key <keycombo><keycap>Ctrl</keycap><keycap>=</keycap></keycombo>."
- msgstr ""
--"To display normal font size, choose <menuchoice><guimenu>View</"
--"guimenu><guimenuitem>Normal Size</guimenuitem><shortcut><keycombo><keycap>Ctrl</keycap><keycap>=</keycap></keycombo></shortcut></menuchoice>."
-+"To display normal font size, choose <menuchoice><shortcut><keycombo><keycap>Ctrl</keycap><keycap>=</keycap></keycombo></shortcut>"
-+"<guimenu>View</guimenu><guimenuitem>Normal Size</guimenuitem></menuchoice>."
- 
- #: C/gucharmap.xml:602(para)
- msgid "To magnify the selected character, hold <keycap>Shift</keycap>."
---
-cgit v0.8.3.1
diff --git a/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild b/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild
deleted file mode 100644
index 5dd17b2018bb..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild,v 1.11 2010/07/20 02:20:33 jer Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk doc gnome python test"
-
-# FIXME: add gobject-introspection support once available
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.13.6
-	gnome? ( gnome-base/gconf )
-	python? ( >=dev-python/pygtk-2.7.1 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)
-		$(use_enable python python-bindings)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix British English documentation translation (bug #289348)
-	epatch "${FILESDIR}/${PN}-2.26.3.1-en_GB.patch"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild b/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild
deleted file mode 100644
index c64415ff9558..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild,v 1.7 2010/08/18 22:16:28 maekke Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk doc gnome python test"
-
-# FIXME: add gobject-introspection support once available
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.13.6
-	gnome? ( gnome-base/gconf )
-	python? ( >=dev-python/pygtk-2.7.1 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)
-		$(use_enable python python-bindings)"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix British English documentation translation (bug #289348)
-	epatch "${FILESDIR}/${PN}-2.26.3.1-en_GB.patch"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild b/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild
index 76eb7462a33c..2c340e3e0979 100644
--- a/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild,v 1.1 2010/10/17 19:39:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.32.0.ebuild,v 1.2 2010/10/20 20:26:19 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE="cjk doc gnome +introspection python test"
 # FIXME: add gobject-introspection support once available
 RDEPEND=">=dev-libs/glib-2.16.3
 	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.14.0
+	>=x11-libs/gtk+-2.14:2
 	gnome? ( gnome-base/gconf )
 	introspection? ( >=dev-libs/gobject-introspection-0.6 )
 	python? ( >=dev-python/pygtk-2.7.1 )"