New version

6 files changed, 6 insertions, 66 deletions

diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 2527ffdc9237..7671ec39094b 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,7 +1,3 @@
-MD5 8776758bcd57c5c91a4dd72b3d89e070 gucharmap-0.8.0.ebuild 1489
-MD5 5a04941dc0c3c43a5372813d65720e4b gucharmap-1.0.0.ebuild 960
-MD5 8d44ac6b93828aa8cce1d02106716ef6 ChangeLog 983
-MD5 5a04941dc0c3c43a5372813d65720e4b gucharmap-0.9.0.ebuild 960
-MD5 051f2f68aa11199c28c9d317e956d673 files/digest-gucharmap-0.8.0 68
-MD5 1a5e58aa329e823eb180d134748d1593 files/digest-gucharmap-0.9.0 69
+MD5 01ab688fae20765a9b17b053048a086e gucharmap-1.0.0.ebuild 982
+MD5 a95bbce089067a76eb51045c35e4bd07 ChangeLog 1112
 MD5 36fb8d54a4e85ae8f4ca7506325e73d6 files/digest-gucharmap-1.0.0 69
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-0.8.0 b/gnome-extra/gucharmap/files/digest-gucharmap-0.8.0
deleted file mode 100644
index 8f93ca18a27f..000000000000
--- a/gnome-extra/gucharmap/files/digest-gucharmap-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bef018936d47019990fe84ce7e8e23bc gucharmap-0.8.0.tar.bz2 972992
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-0.9.0 b/gnome-extra/gucharmap/files/digest-gucharmap-0.9.0
deleted file mode 100644
index 0ca22486fa20..000000000000
--- a/gnome-extra/gucharmap/files/digest-gucharmap-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df894a9f5ba2ee512f68a9215a5b1e07 gucharmap-0.9.0.tar.bz2 1107979
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0 b/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0
new file mode 100644
index 000000000000..b6c320bad94a
--- /dev/null
+++ b/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0
@@ -0,0 +1 @@
+MD5 1142d48c2fe4a2ece6625c4c1ee4f4b3 gucharmap-1.0.0.tar.bz2 1120869
diff --git a/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild b/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild
deleted file mode 100644
index 68f2c1c8b7e2..000000000000
--- a/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild,v 1.3 2003/09/06 23:52:57 msterret Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME2 Unicode Character Map Display"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-RDEPEND=">=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	gnome? ( >=gnome-base/libgnome-2
-			>=gnome-base/libgnomeui-2 )
-	!gnome? ( >=dev-libs/popt-1.5 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	>=dev-util/pkgconfig-0.9"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-G2CONF="${G2CONF} `use_enable gnome` `use_enable cjk unihan`"
-
-src_unpack() {
-	unpack ${A}
-	# do not re-generate gtk.immmodules during make install
-	cd ${S}/gucharmap
-	sed -i -e "s/\@BUILD_GTK_IMMODULES_TRUE\@.*LD_LIBRARY_PATH.*//" Makefile.in
-}
-
-src_install() {
-	gnome2_src_install
-	# disable installing symlinks otherwise it will conflict with gnome-utils-2.2*
-	rm -f ${D}/usr/bin/gnome-character-map
-}
-
-pkg_postinst() {
-	if [ -x "/usr/bin/gtk-query-immodules-2.0" ]; then
-		einfo "Updating gtk.immodules configuration"
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	fi
-}
-
-pkg_postrm() {
-	if [ -x "/usr/bin/gtk-query-immodules-2.0" ]; then
-		einfo "Updating gtk.immodules configuration"
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	fi
-}
diff --git a/gnome-extra/gucharmap/gucharmap-0.9.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild
index 64057968796b..5df5485ae3f7 100644
--- a/gnome-extra/gucharmap/gucharmap-0.9.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-0.9.0.ebuild,v 1.1 2003/09/07 22:07:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild,v 1.1 2003/09/09 22:25:45 foser Exp $
 
 inherit gnome2 eutils
 
@@ -13,13 +13,14 @@ KEYWORDS="~x86"
 
 IUSE="gnome cjk"
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2.2
 	dev-libs/popt
 	gnome? ( >=gnome-base/libgnome-2.2
 		 >=gnome-base/libgnomeui-2.2 )
 	!<gnome-extra/gnome-utils-2.3"
 
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	>=dev-util/intltool-0.22"
 
 G2CONF="${G2CONF} $(use_enable gnome) $(use_enable cjk unihan) --disable-gtk-immodules"