New version for GNOME 2.24. API breaks. Clean up old revisions.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 59 insertions, 95 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 75e6dd8ab841..a05a3c31d5b7 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.107 2008/11/13 19:16:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.108 2008/12/14 16:00:16 eva Exp $
+
+*gucharmap-2.24.2 (14 Dec 2008)
+
+  14 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gucharmap-2.24.2-nogconf.patch, -gucharmap-1.10.0.ebuild,
+  -gucharmap-2.22.0.ebuild, -gucharmap-2.22.1.ebuild,
+  +gucharmap-2.24.2.ebuild:
+  New version for GNOME 2.24. API breaks. Clean up old revisions.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gucharmap-2.22.3.ebuild:
   Marking gucharmap-2.22.3 ppc64 stable for bug 236971
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 354db27b524c..b49f88969f60 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,12 +1,19 @@
-DIST gucharmap-1.10.0.tar.bz2 2506883 RMD160 6caf6b49d27fd76991db384ef894c2dd7de38dce SHA1 99957a7ef4be025db4e11bdf1eb7367438e1265d SHA256 67efc04e6c70db7a342315a291a49869aff4c262b83233e3e4d1dd654a2d753b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gucharmap-2.24.2-nogconf.patch 387 RMD160 57fe6d65044eb678c960e508261ac64a4fefe00c SHA1 2b767793d0c0506b90dbbcb1539972cc9d8cf404 SHA256 9aaa125af9a8245b3cfd285f484c865a89e364b470f1297714ef970a779919f4
 DIST gucharmap-1.10.2.tar.bz2 2514969 RMD160 de189901ea4f2e9eabfbd475cea402e2125f57db SHA1 b9f1f1eddfce148e733f6a2b43f3108e8edbb26b SHA256 586d55f1c61b5daa2237159aa8e7c80a397dcd3c4b7f4fdab4cd6356af808dc6
-DIST gucharmap-2.22.0.tar.bz2 2624670 RMD160 dad27a4bf2cf6d1188e227733cafc4599a6b7042 SHA1 0827264f38a984fb20523b6cc019500614a11e22 SHA256 d2e0d4e027f67ef310d3bee3d36ad22d99337723e6e7df862b0e1bd254302008
-DIST gucharmap-2.22.1.tar.bz2 2632367 RMD160 bcd60893e611d61022b18870b4ed19220680780a SHA1 4663b36b725eed7c8e2f7025768993202def465c SHA256 363ceae0799340797d61d3c88fbfbe1bc17243dde97530a95e90d756a44fc3a0
 DIST gucharmap-2.22.3.tar.bz2 2634874 RMD160 a9abf6ef64125edbf079d83113dd6ae99b2fcf70 SHA1 b4d46d813596e2c77612c374267a63a3a45ca040 SHA256 5d8a15ce45551e073bbaa7ef7b55b3ee259c19ebec14990f4305dfd765106c62
-EBUILD gucharmap-1.10.0.ebuild 1065 RMD160 a827b826a78922a9fe7066567a3722daa0405a3e SHA1 8521a9c884296249948661107d4951c01f4438e3 SHA256 e34e13d9db4788aaf79480a1d7b0d1121a35ad585846372569be4fc9168dc4d0
+DIST gucharmap-2.24.2.tar.bz2 2922955 RMD160 8707a190f31e814b38d2e4cd65d9a6407797a2d6 SHA1 c5184c4cc8bf086548521c7653aa508883c2bdba SHA256 1774b37cf529c5320e93de5e327fd7c716d84a99b959fa1ef2e8dcf72c5ee23c
 EBUILD gucharmap-1.10.2.ebuild 1063 RMD160 ca7c6124bd7c9860b2c004d3066715e45f35a473 SHA1 566826cce3bb1c5c3f4380fe8a01a03b65d74853 SHA256 bc5d5e92906c9c579526c84b27e2e082d200cc36f1c22783f0508396fd16d2ff
-EBUILD gucharmap-2.22.0.ebuild 1156 RMD160 82c2539d1d2ebca28866a9ab8089e237d43b3d4a SHA1 d097d4397446cbb87d62aeecd1fee63fcf2ae4d2 SHA256 25940137e74a071357068c1913ffb968680b5bb74dfd46ee486b65f63ccdc34d
-EBUILD gucharmap-2.22.1.ebuild 1156 RMD160 b4877b57e5c02addc1711d0d0ec24234865f0b78 SHA1 851a857bcd5f4232ea2d69647107b3637ff86977 SHA256 ee1f9f4f47fe3529b24a810a36da512b0cfaa995d8aecd15a83e408c25f1e8f1
 EBUILD gucharmap-2.22.3.ebuild 1150 RMD160 f67ed7807648a685b048b330af6582eb2fa7ed02 SHA1 c8c7745ae78278f04f6fbac35ab39ca74dd2864f SHA256 f18f99b87a2a6ed5d280a5507ee2387e541ea224c8d96afbd2cda96d423e6691
-MISC ChangeLog 12911 RMD160 26ef0aa634672024d9e114de0644e6394e245168 SHA1 f3afe758539ff0c1ff504c9fee44f61b7ccc250a SHA256 0a1a502a57557568aa38c6ee2543af001987337f0fdebacdaebe958351f48636
+EBUILD gucharmap-2.24.2.ebuild 1417 RMD160 4c40c192959174d6b89dc79cf8c3a794520cdac9 SHA1 9f5f1b7c0829c314ca36faed79576c542ca1ba35 SHA256 b582eb651511a955809138a7728a3aa302ebf534f8464e837e2b4f041b38b542
+MISC ChangeLog 13211 RMD160 8b81d1c967e5e17b01feb3b14060c4111a65250e SHA1 1d0346e9d3125269387fd1b23bcdec3394cb8e7d SHA256 c74560f8b30b5addc5e766eb474897fc7bf944bd47b5b985afe5e080a6dbeff2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklFLZYACgkQ1fmVwcYIWAah6gCeOax9hfC2pyrw2ahbHFVcazps
+oAIAn1evGR5yQxluvRl2Fa/8rHmQEf/A
+=iKQv
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch b/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch
new file mode 100644
index 000000000000..b7eb50881e7a
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch
@@ -0,0 +1,17 @@
+--- a/gucharmap/gucharmap-settings.c	2008-12-02 00:55:20.000000000 +0100
++++ b/gucharmap/gucharmap-settings.c	2008-12-02 00:57:50.000000000 +0100
+@@ -238,13 +238,7 @@
+   return FALSE;
+ }
+ 
+-void
+-gucharmap_settings_set_chapter (gchar *chapter)
+-{
+-  return;
+-}
+-
+-ChaptersMode
++GucharmapChaptersMode
+ gucharmap_settings_get_chapters_mode (void)
+ {
+   return get_default_chapters_mode();
diff --git a/gnome-extra/gucharmap/gucharmap-1.10.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.10.0.ebuild
deleted file mode 100644
index d0e5829ccec0..000000000000
--- a/gnome-extra/gucharmap/gucharmap-1.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.10.0.ebuild,v 1.10 2007/09/22 07:53:09 tgall 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 hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-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.1.ebuild b/gnome-extra/gucharmap/gucharmap-2.22.1.ebuild
deleted file mode 100644
index 4e233650a3aa..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.22.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.22.1.ebuild,v 1.1 2008/04/07 20:55:26 leio 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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk gnome"
-
-# gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
-# would probably prefer non-working help button over a libgnome dependency, while
-# GNOME will have libgnome pulled in by other stuff still either way. Reconsider
-# once libgnome can truely die (gnome 2.24 material)
-RDEPEND=">=dev-libs/glib-2.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.12
-	gnome? ( gnome-base/gconf )"
-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 gconf)
-		$(use_enable cjk unihan)"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.22.0.ebuild b/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild
index 73ee1f00b28c..15aed93b4fdc 100644
--- a/gnome-extra/gucharmap/gucharmap-2.22.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.22.0.ebuild,v 1.1 2008/03/18 00:46:33 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild,v 1.1 2008/12/14 16:00:16 eva Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2 python
 
 DESCRIPTION="Unicode character map viewer"
 HOMEPAGE="http://gucharmap.sourceforge.net/"
@@ -10,21 +10,23 @@ 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 gnome"
+IUSE="cjk doc gnome python"
 
 # gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
 # would probably prefer non-working help button over a libgnome dependency, while
 # GNOME will have libgnome pulled in by other stuff still either way. Reconsider
 # once libgnome can truely die (gnome 2.24 material)
-RDEPEND=">=dev-libs/glib-2.3
+RDEPEND=">=dev-libs/glib-2.16.3
 	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.12
-	gnome? ( gnome-base/gconf )"
+	>=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.35
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=dev-util/intltool-0.40
+	>=app-text/gnome-doc-utils-0.9.0
+	doc? ( >=dev-util/gtk-doc-1.0 )"
 
 DOCS="ChangeLog NEWS README TODO"
 
@@ -32,5 +34,13 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)"
+		$(use_enable cjk unihan)
+		$(use_enable python python-bindings)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix compilation with USE="-gnome", bug #248289
+	epatch "${FILESDIR}/${P}-nogconf.patch"
 }