Cleanup ebuild and fix nls issues #99762.

(Portage version: 2.0.53_rc5)

2 files changed, 28 insertions, 30 deletions

diff --git a/media-gfx/ee/ChangeLog b/media-gfx/ee/ChangeLog
index a63e6da5cf08..4d14e14d0c14 100644
--- a/media-gfx/ee/ChangeLog
+++ b/media-gfx/ee/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/ee
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ChangeLog,v 1.11 2005/08/11 01:52:59 halcy0n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ChangeLog,v 1.12 2005/10/18 04:22:27 vapier Exp $
+
+  18 Oct 2005; Mike Frysinger <vapier@gentoo.org> ee-0.3.12-r3.ebuild:
+  Cleanup ebuild and fix nls issues #99762.
 
   11 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
   ee-0.3.12-r2.ebuild, ee-0.3.12-r3.ebuild:
diff --git a/media-gfx/ee/ee-0.3.12-r3.ebuild b/media-gfx/ee/ee-0.3.12-r3.ebuild
index 1ca55dadeda8..03ff115e1d70 100644
--- a/media-gfx/ee/ee-0.3.12-r3.ebuild
+++ b/media-gfx/ee/ee-0.3.12-r3.ebuild
@@ -1,56 +1,51 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ee-0.3.12-r3.ebuild,v 1.3 2005/08/11 01:52:59 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ee/ee-0.3.12-r3.ebuild,v 1.4 2005/10/18 04:22:27 vapier Exp $
 
 inherit gnuconfig eutils
 
-IUSE="nls"
-
 DESCRIPTION="Electric Eyes image viewer"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
 
 DEPEND="=sys-libs/db-1*
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-RDEPEND="nls? ( sys-devel/gettext )"
+	>=gnome-base/gnome-libs-1.4.1.2-r1
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-mo.diff || die "epatch failed!"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-mo.diff
+	strip-linguas -i po
 }
 
 src_compile() {
-	gnuconfig_update
-
-	local myconf
-	use nls && myconf="--enable-nls" || myconf="--disable-nls"
-
-	econf ${myconf} || die "configure failure"
+	econf \
+		--program-suffix=yes \
+		$(use_enable nls) \
+		|| die "configure failure"
 	emake || die "make failure"
 }
 
 src_install() {
-	make DESTDIR=${D} \
-	     prefix=/usr \
-	     install || die "make install failure"
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	make DESTDIR="${D}" install || die "make install failure"
+	dodoc AUTHORS ChangeLog NEWS README
 
 	# ee -> eeyes (bug #73179)
 	# based on official Debian package's control file 
-	mv ${D}/usr/bin/{ee,eeyes}
-	mv ${D}/usr/bin/{ee,eeyes}
-	mv ${D}/usr/share/gnome/help/{ee,eeyes}
+	mv "${D}"/usr/share/gnome/help/{ee,eeyes}
 
-	sed 's:\(=ee\):\1yes:' ${D}/usr/share/mime-info/ee.keys \
-		> ${D}/usr/share/mime-info/eeyes.keys
-	rm ${D}/usr/share/mime-info/ee.keys
+	sed 's:\(=ee\):\1yes:' "${D}"/usr/share/mime-info/ee.keys \
+		> "${D}"/usr/share/mime-info/eeyes.keys
+	rm "${D}"/usr/share/mime-info/ee.keys
 
-	sed 's:\(Exec=ee\):\1yes:' ${D}/usr/share/gnome/apps/Graphics/ee.desktop \
-		> ${D}/usr/share/gnome/apps/Graphics/eeyes.desktop
-	rm ${D}/usr/share/gnome/apps/Graphics/ee.desktop
+	dodir /usr/share/applications
+	sed 's:\(Exec=ee\):\1yes:' "${D}"/usr/share/gnome/apps/Graphics/ee.desktop \
+		> "${D}"/usr/share/applications/eeyes.desktop
+	rm -r "${D}"/usr/share/gnome/apps
 }