x11-misc/xneur: Decrease EAPI requirement, cleanup. Correct dependencies.

svn path=/sunrise/; revision=10935

diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog
index f77c382625229ec8c4e6c85115002fddb9b5b27c..4377faf28da9ad701042cbd1fe44d9ba8d38803e 100644 (file)
--- a/x11-misc/xneur/ChangeLog
+++ b/x11-misc/xneur/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>
+  xneur-0.9.9.ebuild:
+  Decrease EAPI requirement, cleanup. Correct dependencies.
+
   01 Jun 2010; Peter Volkov <pva@gentoo.org> -xneur-0.9.7.ebuild,
   +xneur-0.9.9.ebuild:
   Version bump, thank Alex Rodionov for report in bug #169494.

diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
index a13720a3cfb7e826db4f1b7343e63d479f41009b..203643f8a4564a1d42c980fddd3bc5be226aeae8 100644 (file)
--- a/x11-misc/xneur/Manifest
+++ b/x11-misc/xneur/Manifest
@@ -1,4 +1,4 @@
 DIST xneur-0.9.9.tar.bz2 1116880 RMD160 bfff0bb4515c504aafd208a29e75d6a228807baa SHA1 2768dcfe15ac72dd0fede05e475f7de0239e9aab SHA256 e413831900af01e5071e74558211a82cf94d080900237f9d8104b1674f65391e
-EBUILD xneur-0.9.9.ebuild 2320 RMD160 c53536ab2b55105ea3b11e28943eb971f217edd5 SHA1 552829361bd9c976cbd519047b1ed073cb4f4989 SHA256 1fcc541d83a7b324e0da481c14a015a8ace409ed5bdee5c36a4f64ae6b95ddc6
-MISC ChangeLog 1463 RMD160 0275d9fdc934931329c406597cf8a815e3c91f51 SHA1 4e3a13289b19e33da6a98c1cdd4cc297f0bd78fc SHA256 658c044befffb0e6d7292ed974111e60e33d93403721f9b3cd2728a487eb3891
+EBUILD xneur-0.9.9.ebuild 2308 RMD160 6895cb8a2c816e48faaaa9450ad956084f15e732 SHA1 43a75e84dee9601ff7d2c9346d13d5fc403a995e SHA256 bb7cc36df16303b01f323100153bb7779151007d90b6e7d953d438a1075cce88
+MISC ChangeLog 1615 RMD160 318a4d77539fc82f9b14fb996dd259402bac8996 SHA1 d9436794179481a1951622914a916a999035231a SHA256 f0f45f0cc3f623e699b6767ff2dd46154dc972bfea0779a23d5f370a4119c99b
 MISC metadata.xml 338 RMD160 9d227cb50b1efa965b1fb2547dcbb32e80765e26 SHA1 f2a0b274505f2aaf15b9190e6c42800563dfc8c4 SHA256 ef2a825edd4715652aecb0215624694d20ce5cddcfb223f49b1a43c5a3975a30

diff --git a/x11-misc/xneur/xneur-0.9.9.ebuild b/x11-misc/xneur/xneur-0.9.9.ebuild
index 72f1e0ccc90a44528f6f100f29c7cdd9d57e0632..49c22ec362255af8d3a233fa38567ef89843c447 100644 (file)
--- a/x11-misc/xneur/xneur-0.9.9.ebuild
+++ b/x11-misc/xneur/xneur-0.9.9.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=2
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)"
 HOMEPAGE="http://www.xneur.ru/"
@@ -15,27 +15,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="aplay debug gstreamer libnotify nls openal xosd pcre +spell"
 
-# Sound does not works here with media-sound/alsa-utils-1.0.16
-RDEPEND="sys-libs/zlib
+COMMON_DEPEND="sys-libs/zlib
        >=x11-libs/libX11-1.1
        x11-libs/libXtst
        gstreamer? ( >=media-libs/gstreamer-0.10.6 )
-       !gstreamer? ( openal? ( >=media-libs/freealut-1.0.1 )
-                                 !openal? ( aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
+       !gstreamer? (
+               openal? ( >=media-libs/freealut-1.0.1 )
+               !openal? (
+                       aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
+       libnotify? ( >=x11-libs/libnotify-0.4.0 )
        pcre? ( >=dev-libs/libpcre-5.0 )
        spell? ( app-text/aspell )
-       xosd? ( x11-libs/xosd )
-       libnotify? ( >=x11-libs/libnotify-0.4.0 )"
-DEPEND="${RDEPEND}
+       xosd? ( x11-libs/xosd )"
+RDEPEND="${COMMON_DEPEND}
        gstreamer? ( media-libs/gst-plugins-good
-                       media-plugins/gst-plugins-alsa )
-       nls? ( sys-devel/gettext )
-       >=dev-util/pkgconfig-0.20"
+               media-plugins/gst-plugins-alsa )
+       nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+       >=dev-util/pkgconfig-0.20
+       nls? ( sys-devel/gettext )"
 
 src_prepare() {
        # Fixes error/warning: no newline at end of file
-       find . -name '*.c' -exec sed '${/[^ ]/s:$:\n:}' -i '{}' \;
-       rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4
+       find -name '*.c' -exec sed -i -e '${/[^ ]/s:$:\n:}' {} + || die
+       rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
+               ltmain.sh aclocal.m4 || die
        sed -i -e "s/-Werror -g0//" configure.in
        eautoreconf
 }
@@ -67,7 +71,7 @@ src_configure() {
 }
 
 src_install() {
-       emake install DESTDIR="${ED}" || die "emake install failed"
+       emake DESTDIR="${D}" install || die
        dodoc AUTHORS ChangeLog README NEWS TODO || die
 }