New version for GNOME 2.26. Clean up old revisions.

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

4 files changed, 49 insertions, 47 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index d3c01b49957b..7a50ea27766f 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gucharmap
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.118 2009/04/28 11:31:11 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.119 2009/05/11 22:57:04 eva Exp $
+
+*gucharmap-2.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gucharmap-1.10.2.ebuild, gucharmap-2.22.3.ebuild,
+  +gucharmap-2.26.1.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gucharmap-2.24.3.ebuild:
   sh stable
diff --git a/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild b/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild
deleted file mode 100644
index b068b1042335..000000000000
--- a/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild,v 1.9 2009/02/25 23:35:05 eva Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="cjk gnome"
-
-RDEPEND=">=dev-libs/glib-2.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.6
-	gnome? (
-		>=gnome-base/libgnome-2.13.7
-		>=gnome-base/libgnomeui-2.13.2
-	)
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		$(use_enable gnome)
-		$(use_enable cjk unihan)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix gtk-update-icon-cache generation
-	sed -i -e 's:gtk-update-icon-cache:true:' ./pixmaps/Makefile.in
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild b/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild
index 4128f6a6ca64..0a92eb789c23 100644
--- a/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild,v 1.8 2009/02/25 23:35:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild,v 1.9 2009/05/11 22:57:04 eva Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gucharmap.sourceforge.net/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="hppa"
 IUSE="cjk gnome test"
 
 # gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
diff --git a/gnome-extra/gucharmap/gucharmap-2.26.1.ebuild b/gnome-extra/gucharmap/gucharmap-2.26.1.ebuild
new file mode 100644
index 000000000000..266a012bb559
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-2.26.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.26.1.ebuild,v 1.1 2009/05/11 22:57:04 eva Exp $
+
+inherit gnome2
+
+DESCRIPTION="Unicode character map viewer"
+HOMEPAGE="http://gucharmap.sourceforge.net/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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)"
+}