media-sound/somax: Fix deps for gnome3, Reomved unneeded die, moved to EAPI=4

svn path=/sunrise/; revision=11967

diff --git a/media-sound/somax/ChangeLog b/media-sound/somax/ChangeLog
index 978ba360a9a09848e8d8b677f9faf000ab818319..23a35e563493021cb8b05c9e92fff2d0bed1e6a6 100644 (file)
--- a/media-sound/somax/ChangeLog
+++ b/media-sound/somax/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for media-sound/somax
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> somax-1.3.ebuild:
+  Fix deps for gnome3, Reomved unneeded die, moved to EAPI=4
+
   28 Oct 2007; Markus Ullmann <jokey@gentoo.org> somax-1.3:
   don't install ABOUT-NLS file
 

diff --git a/media-sound/somax/Manifest b/media-sound/somax/Manifest
index a7e364fbe3f9fb04918a151a6e07292a31d79e27..2e0a7df3b988b82c3ca8b90e946593a5e34e742b 100644 (file)
--- a/media-sound/somax/Manifest
+++ b/media-sound/somax/Manifest
@@ -1,5 +1,5 @@
 AUX somax-1.3-gtksourceview_env.patch 957 RMD160 0bab00f38558b314c9148299a5cb5f1ea10bdc6d SHA1 eb48a877641e244dc8e4998037887faafba95b81 SHA256 12780a38b997b221639b93c3aacd179ca2f56286fd9e869edcfe78d841845264
 DIST somax-1.3.tar.gz 903527 RMD160 4ca6bff81a8c0ec940295ea452c6a7354b9b6e0d SHA1 38d9db434972b06b1e24b51eaee8f3b765073240 SHA256 d6e58d960bae8feae1029a37dd213450d8ff0bd9810b38a84cfb32b40bfb8761
-EBUILD somax-1.3.ebuild 1316 RMD160 6e6ed07f5c03b9d9549c926e8464e63b785a6606 SHA1 9eeaca1653a8969ae846bb8624254ed81383bf0a SHA256 9a20bd2b28bb51ba85f935d5b475813962aba54648f39da07787d818315a3ceb
-MISC ChangeLog 458 RMD160 a457a583b5752bd0294263d2cb672e26c0bc286d SHA1 eddda93042930fb4ddece14c10a71a1454e763a1 SHA256 adcec1b6c41f916a50e3802afe4a595b1f631f8daa9c878d52c9daf712a50d45
+EBUILD somax-1.3.ebuild 1200 RMD160 fd9018540ec11d343cbb6601499480de96936ef1 SHA1 6b62154ed1c05fef10279d572ec6a540eb7db4fc SHA256 ac1f72823119efaca69bd5447e23972d023c7e2da4e6bd4a8d91cc50a9baa163
+MISC ChangeLog 585 RMD160 a5d540730c97498d50b16401e69db47ec51166ea SHA1 7a2b9825f108c2ae78b6eeba9eeecd429e10d9ee SHA256 7c03a5e6a676d1ae87a5b474fe996ea6242edd07388a318e35eda8fe939bd42a
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/media-sound/somax/somax-1.3.ebuild b/media-sound/somax/somax-1.3.ebuild
index b749f3bca23a9cf731137a6ba7c07f324fd4b315..855950484dab9167fdc6f9d7fb13372301038a0e 100644 (file)
--- a/media-sound/somax/somax-1.3.ebuild
+++ b/media-sound/somax/somax-1.3.ebuild
@@ -1,54 +1,51 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+EAPI=4
 
-IUSE="nls gnome"
+inherit eutils
 
 DESCRIPTION="Control and configure soma through a graphic panel"
-HOMEPAGE="http://www.somasuite.org"
+HOMEPAGE="http://www.somasuite.org/"
 SRC_URI="http://www.somasuite.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="nls gnome"
 
-RDEPEND="media-sound/soma
-       >=x11-libs/gtk+-2.0
+RDEPEND="
+       media-sound/soma
+       x11-libs/gtk+:2
        x11-libs/libSM
-       x11-libs/vte
-       gnome? ( x11-libs/gtksourceview
-               >=gnome-base/libgnomeprintui-2.0 )"
-
+       x11-libs/vte:0
+       gnome? (
+               x11-libs/gtksourceview:2.0
+               gnome-base/libgnomeprintui:2.2 )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+DOCS="AUTHORS ChangeLog README README.{modules,plugins,library}"
 
+src_prepare() {
        epatch "${FILESDIR}"/${P}-gtksourceview_env.patch
 }
 
-src_compile() {
+src_configure() {
        use gnome || myconf="${myconf} --disable-gnomeprint"
 
        econf \
                $(use_enable nls) \
                $(use_enable gnome) \
-               ${myconf} \
-               || die "econf failed"
-       emake || die "emake failed"
+               ${myconf}
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
+       default
 
        doicon icons/somax.png
        make_desktop_entry ${PN} SomaX ${PN}.png AudioVideo;GTK
-
-       dodoc AUTHORS ChangeLog README README.{modules,plugins,library}
 }
 
 pkg_postinst() {