Cleanup ebuild and fix nls issues #99762.

Package-Manager: portage-2.0.53_rc5

diff --git a/media-gfx/ee/ChangeLog b/media-gfx/ee/ChangeLog
index a63e6da5cf08c4fc167e05e00872b25c5268e8f4..4d14e14d0c141c6751e02e410299fcc64cece835 100644 (file)
--- 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/Manifest b/media-gfx/ee/Manifest
index ecbd7f339c6294f24f4aec5d60c1e01795687554..2ecf125b005805d130209e51bde8c459d7c9d86e 100644 (file)
--- a/media-gfx/ee/Manifest
+++ b/media-gfx/ee/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 aed452930c31d29d227abbb68cb7b4e1 ChangeLog 1951
 MD5 b613f22d8c4048df84acc9592ee34f27 ee-0.3.12-r2.ebuild 985
-MD5 20fe1d1677a326b95ffc478c207e104e ee-0.3.12-r3.ebuild 1489
-MD5 a75926a88f492f00986f0f53b2330127 ChangeLog 1836
+MD5 f68040d1aef8436f41b3c79d6aee2e40 ee-0.3.12-r3.ebuild 1357
 MD5 bd6a1a727ab6ef5c722ecf4f77cf719e files/digest-ee-0.3.12-r2 61
 MD5 bd6a1a727ab6ef5c722ecf4f77cf719e files/digest-ee-0.3.12-r3 61
 MD5 3a9923f87aa62b5de53e8fe037fc0dae files/ee-mo.diff 502
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC+q+MCRZPokWLroQRAl1WAKCqfhv2YDdPAB+nRMAilSVVzk+bBQCdGrZJ
-QmNv4djct4hHnEXATJjWVoo=
-=ydu5
+iD8DBQFDVHkWgIKl8Uu19MoRAtGVAJ9pkznHWf+IQppM6WPpzUvQbiyV8QCfYI7g
+bWuTWqKxvw22VyCS+0Ngow0=
+=0qGz
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/ee/ee-0.3.12-r3.ebuild b/media-gfx/ee/ee-0.3.12-r3.ebuild
index 1ca55dadeda8595f183f890f240d3c5f88f1783d..03ff115e1d7011ca522b209b5a0865117c26f781 100644 (file)
--- 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
 }