Version bump.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

2 files changed, 32 insertions, 20 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 0140a697b74f..0c4739a66370 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.83 2009/12/27 09:34:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.84 2009/12/27 10:56:34 ssuominen Exp $
+
+*hydrogen-0.9.4 (27 Dec 2009)
+
+  27 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +hydrogen-0.9.4.ebuild:
+  Version bump wrt #298360, thanks to Ben de Groot for reporting.
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> hydrogen-0.9.3-r4.ebuild:
   Marked ppc stable for bug #281590.
diff --git a/media-sound/hydrogen/hydrogen-0.9.4_rc2.ebuild b/media-sound/hydrogen/hydrogen-0.9.4.ebuild
index 775e6a5f566c..5c7b9b2bdeea 100644
--- a/media-sound/hydrogen/hydrogen-0.9.4_rc2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.4.ebuild
@@ -1,46 +1,52 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.4_rc2.ebuild,v 1.3 2009/08/31 10:56:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.4.ebuild,v 1.1 2009/12/27 10:56:34 ssuominen Exp $
 
 EAPI=2
-MY_P=${P/_/-}
 inherit eutils multilib
 
-DESCRIPTION="Advanced Drum Machine"
+DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa oss jack lash ladspa flac"
+IUSE="alsa flac jack ladspa lash oss"
 
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+RDEPEND="x11-libs/qt-gui:4
+	app-arch/libarchive
 	alsa? ( media-libs/alsa-lib )
-	lash? ( media-sound/lash )
 	flac? ( media-libs/flac[cxx] )
+	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )
-	app-arch/libarchive
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4
-	x11-libs/qt-script:4
-	x11-libs/qt-qt3support:4"
+	lash? ( media-sound/lash )"
 DEPEND="${RDEPEND}
 	dev-util/scons"
 
-S=${WORKDIR}/${MY_P}
+src_prepare() {
+	sed -i \
+		-e '/cppflags +=/d' \
+			Sconstruct || die
+}
 
 src_compile() {
 	export QTDIR="/usr/$(get_libdir)"
-	local myconf="prefix=/usr libarchive=1"
-	use oss || myconf="${myconf} oss=0"
+
+	local myconf="libarchive=1 portaudio=0 portmidi=0"
+
 	use alsa || myconf="${myconf} alsa=0"
+	use flac || myconf="${myconf} flac=0"
 	use jack || myconf="${myconf} jack=0"
-	use lash || myconf="${myconf} lash=0"
 	use ladspa || myconf="${myconf} lrdf=0"
-	use flac || myconf="${myconf} flac=0"
-	scons ${myconf} || die "scons failed"
+	use lash && myconf="${myconf} lash=1"
+	use oss || myconf="${myconf} oss=0"
+
+	scons \
+		prefix=/usr \
+		DESTDIR="${D}" \
+		optflags="${CXXFLAGS}" \
+		${myconf} || die
 }
 
 src_install() {