Version bump.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 35 insertions, 23 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/Manifest b/media-sound/hydrogen/Manifest
index 84941ecefb51..7294921ab411 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -8,8 +8,8 @@ AUX hydrogen-0.9.3-gcc43.patch 2434 RMD160 3cae0403a3b41e52c593d94447ab5bfb8eadd
 AUX hydrogen-0.9.3-gcc43noalsa.patch 346 RMD160 99b3b287b912a207b834a49b39a7e004785489e9 SHA1 f98d51f15de1f25717e36c96780e05905933c1a2 SHA256 9ddf776a7d6627d2ce08d52ce7696a3f7a4802001064c974af0f085f48a95c98
 AUX hydrogen-0.9.3-gcc44.patch 602 RMD160 ff3690e5c5f9b783dd32b492f90766a3a36d1d92 SHA1 5cee2166883948a09ed3b4c77d0343d6b132edec SHA256 323287db15751c3846825871c37bfa06de7c754f20afa2c9cec7b0e3330a5c13
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
-DIST hydrogen-0.9.4-rc2.tar.gz 3701206 RMD160 9873d79997590596a5681a2f6511f9c1d5db0e89 SHA1 476b95fcff1158f798245036a85ef82a4dfb7102 SHA256 2bf1851cbc5da7e24183073707a9eae6a230131eff50c4903344d58607cb6c45
+DIST hydrogen-0.9.4.tar.gz 3808532 RMD160 9f1514462eaa756fe0a3e8fed3ff647a32ad033d SHA1 e988710f82af858c0c688cb1d1e19d789fca49ef SHA256 982b768b48e8402104949c64fac4d74d804f41b6ab1b90457711840da99685d7
 EBUILD hydrogen-0.9.3-r4.ebuild 2943 RMD160 8934d8c894557c1580fb157f7c2454ce61af888d SHA1 0cf609e3d9d2060147976405a90b16df4eb1ca35 SHA256 c1a069bc9c5a8aa27572c23facb983be0b4cef69493d1739c509dae58351f34c
-EBUILD hydrogen-0.9.4_rc2.ebuild 1507 RMD160 68df3eb111f3f009aa5e7965d6c6ea188000a0e2 SHA1 9b1f60300c8d919db60a89ea8ca983c6f2dc5577 SHA256 b315664b5441f43c37ef7533f8baad24629f84946f3995022a1bc1cf681e5680
-MISC ChangeLog 13009 RMD160 803a37dc14c00062329d031ec84553c91732c556 SHA1 4a5405ea12761bbc5629987911b630fdd9318bb5 SHA256 56dcdd68d981e27e62a8ab23e129f3946091b8b85c2d8b59e80ce81e8c6ad3b5
+EBUILD hydrogen-0.9.4.ebuild 1513 RMD160 de9cdb547cd5b1edbc2bef1aa44af819a6613d57 SHA1 199932168fd673ebc0bd15e8b242dc0791fd3fcc SHA256 768ba2ea8c9c2b6e8b475776acf0aac026fb757f746b28a072b5ffe01a3f8ecd
+MISC ChangeLog 13190 RMD160 d32f617e69aab49abb00dec8acfa4c2a2db05ebe SHA1 47827445197b075332a7f01ddccd577c9a7de04e SHA256 d2c1fbaf4b501f7cf89132c5e1903c4a7cec31d3cae39298c9412602e3172ab8
 MISC metadata.xml 163 RMD160 c2b208c0913f8c5bd1148627b5c3c9e37b53060a SHA1 4195ac5ca8352b0f52be6ed92640e4365be5bf0d SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb
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() {