New version, removed older versions

8 files changed, 45 insertions, 91 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 741b97ea796e..7eeb243633e0 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.31 2004/08/07 23:09:00 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.32 2004/11/25 06:06:03 obz Exp $
+
+*gucharmap-1.4.2 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -gucharmap-1.0.0.ebuild,
+  -gucharmap-1.2.0.ebuild, +gucharmap-1.4.2.ebuild:
+  New version, removed older versions
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> gucharmap-1.0.0.ebuild,
   gucharmap-1.2.0.ebuild, gucharmap-1.4.1.ebuild:
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index b253f1373ab9..300c3b2e4730 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,9 +1,12 @@
-MD5 8e3e1c6f6c3242a6af6365dc9eba3e4c ChangeLog 4033
-MD5 36cf5c9b2efee21b2f1de963ab6d312c gucharmap-1.0.0.ebuild 1000
 MD5 04754e116911c71bc6566522d5b3776b gucharmap-1.2.0.ebuild 1117
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a7b32d316a5688976814d251208cc4e5 gucharmap-1.4.1.ebuild 831
+MD5 ae963f7dda782eed9bfa6883f9722d05 .gucharmap-1.4.2.ebuild.swp 12288
+MD5 36cf5c9b2efee21b2f1de963ab6d312c gucharmap-1.0.0.ebuild 1000
+MD5 8e3e1c6f6c3242a6af6365dc9eba3e4c ChangeLog 4033
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4c4089940325b77c6138c14fc15bc4eb gucharmap-1.4.2.ebuild 725
+MD5 2d194fe17e6be8b8c4c7c23ffd02f87b files/gucharmap-1.2.0-gcc2_fix.patch 516
 MD5 36fb8d54a4e85ae8f4ca7506325e73d6 files/digest-gucharmap-1.0.0 69
 MD5 83a76bca1a1ecdfd6fe04aa8ef5536d6 files/digest-gucharmap-1.2.0 69
-MD5 2d194fe17e6be8b8c4c7c23ffd02f87b files/gucharmap-1.2.0-gcc2_fix.patch 516
 MD5 a0bdcf85c74456f55df0f5b0c721d961 files/digest-gucharmap-1.4.1 69
+MD5 fa917fe7ffcae7952bd8bf5a0f756d13 files/digest-gucharmap-1.4.2 69
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0 b/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0
deleted file mode 100644
index b6c320bad94a..000000000000
--- a/gnome-extra/gucharmap/files/digest-gucharmap-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1142d48c2fe4a2ece6625c4c1ee4f4b3 gucharmap-1.0.0.tar.bz2 1120869
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-1.2.0 b/gnome-extra/gucharmap/files/digest-gucharmap-1.2.0
deleted file mode 100644
index 572a3c4a1874..000000000000
--- a/gnome-extra/gucharmap/files/digest-gucharmap-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70c94bdfb13f7f47b108653237177756 gucharmap-1.2.0.tar.bz2 1176137
diff --git a/gnome-extra/gucharmap/files/digest-gucharmap-1.4.2 b/gnome-extra/gucharmap/files/digest-gucharmap-1.4.2
new file mode 100644
index 000000000000..0f47501c727d
--- /dev/null
+++ b/gnome-extra/gucharmap/files/digest-gucharmap-1.4.2
@@ -0,0 +1 @@
+MD5 73847836c1adeadf166fd4fe909687c9 gucharmap-1.4.2.tar.bz2 1518110
diff --git a/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild
deleted file mode 100644
index 1ac0485e7268..000000000000
--- a/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.0.0.ebuild,v 1.14 2004/08/07 23:09:00 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc amd64 ia64"
-
-IUSE="gnome cjk"
-
-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"
-
-pkg_postinst() {
-	einfo "Registering GTK+ input modules..."
-	${ROOT}/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-	einfo "Registering GTK+ input modules..."
-	${ROOT}/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
diff --git a/gnome-extra/gucharmap/gucharmap-1.2.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.2.0.ebuild
deleted file mode 100644
index 09ac38d368f5..000000000000
--- a/gnome-extra/gucharmap/gucharmap-1.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.2.0.ebuild,v 1.12 2004/08/07 23:09:00 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-IUSE="gnome cjk"
-
-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
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.22"
-
-G2CONF="${G2CONF} $(use_enable gnome) $(use_enable cjk unihan) --disable-gtk-immodules"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gcc2_fix.patch
-}
-
-pkg_postinst() {
-
-	einfo "Registering GTK+ input modules..."
-	${ROOT}/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-
-}
-
-pkg_postrm() {
-
-	einfo "Registering GTK+ input modules..."
-	${ROOT}/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-
-}
diff --git a/gnome-extra/gucharmap/gucharmap-1.4.2.ebuild b/gnome-extra/gucharmap/gucharmap-1.4.2.ebuild
new file mode 100644
index 000000000000..8bd90bfd8507
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-1.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.4.2.ebuild,v 1.1 2004/11/25 06:06:03 obz 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 ~mips ~ppc ~sparc ~x86"
+IUSE="gnome cjk"
+
+RDEPEND=">=dev-libs/glib-2.3
+	>=x11-libs/pango-1.2.1
+	>=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
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29"
+
+G2CONF="${G2CONF} $(use_enable gnome) $(use_enable cjk unihan)"
+
+DOCS="ChangeLog README TODO"