x11-misc/gxneur: Cleanup, install the icon.

svn path=/sunrise/; revision=10936

diff --git a/x11-misc/gxneur/ChangeLog b/x11-misc/gxneur/ChangeLog
index bc10774e229dd3b580f69fd4d33f7ded4dcd9800..cef95c2470d2ce2dbc2d2a008960ac48a5e0f576 100644 (file)
--- a/x11-misc/gxneur/ChangeLog
+++ b/x11-misc/gxneur/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  gxneur-0.9.9.ebuild:
+  Cleanup, install the icon.
+
   01 Jun 2010; Peter Volkov <pva@gentoo.org> -gxneur-0.9.7.ebuild,
   +gxneur-0.9.9.ebuild:
   Version bump, thank Alex Rodionov for report in bug #169494.

diff --git a/x11-misc/gxneur/Manifest b/x11-misc/gxneur/Manifest
index e656656134b0d59d94ac49d2d8f82934db1c8321..56b6d66a72a80104e510bc887e81e99386c0a601 100644 (file)
--- a/x11-misc/gxneur/Manifest
+++ b/x11-misc/gxneur/Manifest
@@ -1,4 +1,4 @@
 DIST gxneur-0.9.9.tar.bz2 380171 RMD160 c1061d0ac0e95715e03567246169dc42a6ac0bd3 SHA1 eb1586e5b5b75a4c16af42240b45e784b96c477f SHA256 f0c28ef32c979a87e6bc418865cd92b3ca4c960491dd39711cec1dccefdd0685
-EBUILD gxneur-0.9.9.ebuild 955 RMD160 3bf5e7d59222681e0664b1e92c868a5344fafe67 SHA1 efc8c88668afb4324eaaaf1a996c7717fc66be34 SHA256 cd84dbaccb8784d1ba4e8722e6597d513e84e496536a7681598e11c4c073639c
-MISC ChangeLog 996 RMD160 dc5cda907774a960416549e1a277c8e2f7d06e02 SHA1 4981f71c2f998b6e0052f509e733b4a3bd6ebc69 SHA256 aea0b7da7ef14214c18017f943ba6e701b20289585a0c7dbd5432b2a61d1421d
+EBUILD gxneur-0.9.9.ebuild 991 RMD160 d1d30923385a9f21e22d2c178f877669946791e3 SHA1 8eb125f7111880660fcab97f6699fe31f1c2aae8 SHA256 1eb65a3a01ad739d7aaa7177a920b612a9c61bfebbb4724db7313a060c632ae2
+MISC ChangeLog 1118 RMD160 367909c322d5fda763ae57c9904c317ac5a1d830 SHA1 3b0c732dab7c212fb567ba1622b1f611879e02a8 SHA256 ab341f3537994d2be36d59a26166b89365e768f0ff3c554a9097ecc06daac460
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/x11-misc/gxneur/gxneur-0.9.9.ebuild b/x11-misc/gxneur/gxneur-0.9.9.ebuild
index cf8b9bbc6ab26c1781501e96fba2cc7be65dd865..7fee2a032a3497c83e601cf86efa6fccf73a675e 100644 (file)
--- a/x11-misc/gxneur/gxneur-0.9.9.ebuild
+++ b/x11-misc/gxneur/gxneur-0.9.9.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=2
 
-inherit eutils autotools versionator
+inherit autotools eutils versionator
 
-DESCRIPTION="GTK based GUI for xneur"
+DESCRIPTION="GTK+ based GUI for xneur"
 HOMEPAGE="http://www.xneur.ru/"
 SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
 
@@ -15,15 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=x11-misc/xneur-$(get_version_component_range 1-2)
-        >=x11-libs/gtk+-2.18:2
-        >=sys-devel/gettext-0.16.1
-        >=gnome-base/libglade-2.6.0"
-DEPEND="${RDEPEND}
+COMMON_DEPEND=">=gnome-base/libglade-2.6.0
+       >=sys-devel/gettext-0.16.1
+       >=x11-libs/gtk+-2.18:2
+       >=x11-misc/xneur-$(get_version_component_range 1-2)"
+RDEPEND="${COMMON_DEPEND}
+       nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+       nls? ( sys-devel/gettext )
        >=dev-util/pkgconfig-0.20"
 
 src_prepare() {
-       rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4
+       rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
+               ltmain.sh aclocal.m4 || die
        sed -i "s/-Werror -g0//" configure.in || die
        eautoreconf
 }
@@ -33,8 +37,7 @@ src_configure() {
 }
 
 src_install() {
-       emake install DESTDIR="${ED}" || die
+       emake DESTDIR="${D}" install || die
        dodoc AUTHORS ChangeLog NEWS || die
-#      doicon pixmaps/gxneur.png
-#      make_desktop_entry "${PN}" "${PN}" ${PN} "GTK;Gnome;Utility;TrayIcon"
+       doicon pixmaps/gxneur.png || die
 }