re-arrange some ebuild variables to match the default arragment, add missing die messages.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 i686

2 files changed, 11 insertions, 13 deletions

diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
index 542ba1241066..6386709c487f 100644
--- a/media-sound/mhwaveedit/Manifest
+++ b/media-sound/mhwaveedit/Manifest
@@ -1,6 +1,6 @@
 DIST mhwaveedit-1.4.14.tar.bz2 485762 RMD160 7b31a048d244c2893f865d8650ae1a57b48c2c8c SHA1 c2dc5c3ff7ce694d7f126c1d2cbb8176e066bb21 SHA256 088bdbe7ef0ad8e6a53a2f7ea7d1c90dcc570cd608d0874503f60c0751592c8e
 DIST mhwaveedit-1.4.15.tar.bz2 488551 RMD160 ac080e65c433b9ca9a77a77c882ac9619384bb79 SHA1 c5a5b314a9a2aef2e9bfd01f625d323e1125548c SHA256 332ab753863d13d02575ea6c5497ef5e230107d012e0c0cf8f91603210ec8674
 EBUILD mhwaveedit-1.4.14.ebuild 1541 RMD160 17db58e45a80eaf396f848aeee946bfd8c3c8aad SHA1 b1a01cec7143d0a97cb3de19dbc43c29107e542f SHA256 86e1ed3b2a3f0bbee2f8e08273709616617c179c4513a996eea6ed0c949e66ff
-EBUILD mhwaveedit-1.4.15-r1.ebuild 1400 RMD160 1b80b5ac63c23539a0ceb61509c626417d5a1f79 SHA1 70012ee445ccd96304bd0a886ad322b44f94f93a SHA256 ae67fbadf09e800dd614f0807d27a10920e5edf196ea2fccb28dc457e36e033b
+EBUILD mhwaveedit-1.4.15-r1.ebuild 1420 RMD160 d53e45c8bbf49bf0964def8f8c5d66f63a0e27bd SHA1 c9f3b016a04239d8ee7b0866a35a785b4628504b SHA256 5427ce20b30dcd0ad65c30e34d228a4c8f9d1c355b2e053dac43c920cdf3132b
 MISC ChangeLog 5024 RMD160 6b4b894713c3982b768663d92e0801201ff13eda SHA1 d7e2f2d1240a07b14a8d4c86ec0672cecb8f2a1f SHA256 9a03570500ce38c96fcd831aa8a6f7b6e039b3d6a9b39db8856c2ec2a082f076
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild
index 97349097a998..fd7b147312e0 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild,v 1.1 2008/05/19 19:54:40 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mhwaveedit/mhwaveedit-1.4.15-r1.ebuild,v 1.2 2008/11/26 08:49:57 ssuominen Exp $
 
 inherit eutils
 
-IUSE="alsa arts esd jack ladspa libsamplerate nls oss sdl sndfile sox"
-
-DESCRIPTION="GTK2 Sound file editor (wav, and a few others.)"
-HOMEPAGE="https://gna.org/projects/mhwaveedit/"
-SRC_URI="http://download.gna.org/mhwaveedit/${P}.tar.bz2"
+DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
+HOMEPAGE="https://gna.org/projects/mhwaveedit"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa arts esd jack ladspa libsamplerate nls oss sdl sndfile sox"
 
 RDEPEND=">=x11-libs/gtk+-2
 	sndfile? ( >=media-libs/libsndfile-1.0.10 )
@@ -28,21 +27,20 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	econf \
+	econf --without-portaudio \
 		$(use_enable nls) \
 		$(use_with sndfile libsndfile) \
 		$(use_with libsamplerate) \
-		--without-portaudio \
 		$(use_with sdl) \
 		$(use_with alsa alsalib) \
 		$(use_with oss) \
 		$(use_with jack) \
 		$(use_with esd esound) \
-		$(use_with arts) || die "econf failed"
-	emake || die "emake failed"
+		$(use_with arts) || die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README TODO
 }