ebuild cleanup.

3 files changed, 44 insertions, 22 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 70b692d11e8f..18688ef98fa1 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.1 2003/08/20 15:19:36 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.2 2003/08/30 08:26:20 liquidx Exp $
+
+  30 Aug 2003; Alastair Tse <liquidx@gentoo.org> gucharmap-0.8.0.ebuild:
+  massive cleanup for gucharmap. this probably shouldn't be in portage until
+  gnome2.4
 
 *gucharmap-0.8.0 (20 Aug 2003)
 
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 72f755deb3d6..8e6478eb58aa 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,3 +1,3 @@
-MD5 62936c0faecbbfb96eab7e709247877d gucharmap-0.8.0.ebuild 884
-MD5 074bcfded695d9290e78640c8cdb9987 ChangeLog 704
+MD5 956bfb1266734aa31f7e90afac0aa64d ChangeLog 870
+MD5 ffee824ca5c4ce8eecd10b459347252c gucharmap-0.8.0.ebuild 1493
 MD5 051f2f68aa11199c28c9d317e956d673 files/digest-gucharmap-0.8.0 68
diff --git a/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild b/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild
index 66c594676a6c..a16e9131223e 100644
--- a/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild
@@ -1,38 +1,56 @@
 # 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.1 2003/08/20 15:19:36 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-0.8.0.ebuild,v 1.2 2003/08/30 08:26:20 liquidx Exp $
 
 inherit gnome2
 
-IUSE=""
-DESCRIPTION="A featureful Unicode character map."
-HOMEPAGE="http://www.gnome.org/"
+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 LGPL-2.1"
+LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE=""
 
-RDEPEND=">=gnome-base/libgnomeui-2"
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
 
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
+G2CONF="${G2CONF} `use_enable gnome` `use_enable cjk unihan`"
 
-src_install() {
-	sed -i -e '/\$(GTK_QUERY_IMMODULES)/d' gucharmap/Makefile
+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
+}
 
-	make DESTDIR=${D} \
-		install || die
- 
-	dodoc COPYING COPYING.LIB ChangeLog INSTALL README TODO
+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
 }
- 
-# DOCS="COPYING COPYING.LIB ChangeLog INSTALL README TODO"
 
 pkg_postinst() {
-    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	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() {
-    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	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		
 }