[proaudio] [2285] Various fixes for hydrogen-9999; may need some cleanup, but it work at least.

[subversion@xxxxxxxxxxxxx]

Revision: 2285
Author:   dominique
Date:     2012-11-11 10:55:41 +0100 (Sun, 11 Nov 2012)
Log Message:
-----------
Various fixes for hydrogen-9999; may need some cleanup, but it work at least.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
    trunk/overlays/proaudio/media-sound/hydrogen/Manifest
    trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog	2012-11-10 21:30:21 UTC (rev 2284)
+++ trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog	2012-11-11 09:55:41 UTC (rev 2285)
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  hydrogen-9999.ebuild: Added qt4-r2 and cmake-utils eclass;
+  Replaced scons by cmake;
+  Added some missing USE flags: jacksession, lrdf, portmidi, rubberbamd;
+  Removed flac USE flag,flac and ogg are provided by sndfile.
+  May need some cleanup, but it work at least.
+
 *hydrogen-0.9.5.1 (28 Oct 2012)
 
   28 Oct 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> -files/0.9.1-OSS.patch,

Modified: trunk/overlays/proaudio/media-sound/hydrogen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/Manifest	2012-11-10 21:30:21 UTC (rev 2284)
+++ trunk/overlays/proaudio/media-sound/hydrogen/Manifest	2012-11-11 09:55:41 UTC (rev 2285)
@@ -1,6 +1,6 @@
 AUX hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch 858 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31 WHIRLPOOL de87409c530f8a3ce2ef959d43e46bb6462e7310660532be83d85b94ac4ab1dac50daf355d3a301923cc0ac3c4df0e691312640dcdf270ca9d03f23744db8cd5
 DIST hydrogen-0.9.5.1.tar.gz 5515314 SHA256 ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb SHA512 bcbd0684499f8ff019540746ed6ad5b99b5a1af04771365880e4fbdac5c26b5944c7f9815875390f42b8d2b428457d414732ed171589c094da99d99eae3a0873 WHIRLPOOL 14908df1f342b92eb53ed3d4118ddd5a918d3c78e9b0becd85777bc7ceee81a4a990192ad7f40ce3ddd7a7d1eb6b99012696f5ce012e68b7ab04aaf7697e2014
 EBUILD hydrogen-0.9.5.1.ebuild 1830 SHA256 360b9d8698930c498f600a1792318ce493e418ec810469f7cdc7ab882d64a2ef SHA512 e95c1e0441b73b627a7dda03e0e41ebe1c0f19eb5678017716d46e7f0c6955de549ca1405a5831af052a0141db7f38f59502b8f53c452c201220b8ccd7fe5357 WHIRLPOOL 8ec4aef85d9ce08b5d9a7addf15da0cebf0b8c13ec25559a58027f429f9923a9eef8bebd0d2bbb14cc9a7cdd60847df1e1cd7c138de1c2aeaff8a2913ff55a56
-EBUILD hydrogen-9999.ebuild 1984 SHA256 9cd7a599dc0d8e37ffb38179ced2d3a37d789215a477eaf7a4a601e96d04147d SHA512 c819b89793e7d4dce47cea95bf67c3eb5569aeff8eff2f91a8ef2144f2b0c5ddd440e5bc65a15461da4880b996c6737ae3effb99a1d0829b48a241f7e8444f7a WHIRLPOOL 4c9f8790478bafc8eaf44dbabf6f1e7b883d29e6476f82e886ba5f814c832b782cfcd6849508c4b25c2c5d4eabb2370ccde509a71f8ca305cd80cf9fefff4b89
-MISC ChangeLog 1012 SHA256 cdc7fee9843e6953a76ff0e41e6e4b5301ec701f85281ee4fc57e2ad1ef39f89 SHA512 1e577f22edaa8c4389a5c07f08a754492d036dca8370af5e720b3463167cd9b9d2dcd29cad4300119e954996ea77edc289d150fdae13b8af656fcfc0bd694cfb WHIRLPOOL 02f1575717788d92c32092f663c001a56785f8ece5761c27d247f55f9317a5d2623faee852cee23fbc879b2cbd90fbb75a505c8c1976bdb36f90c1bd10d50bd1
+EBUILD hydrogen-9999.ebuild 1598 SHA256 e5c489bd3fe0d53b3cde4674833c01f75b032bd1191ccd4a811fdddb260cf15d SHA512 c76f27aaaf23f99312eb640f56e6004cd71edab959e8d4714e45e26eec5b00a7530b57c53d961745373cbd97fc8d37bc829aa77792319981172e8b4e3ba73e11 WHIRLPOOL 3e927877f1b4eb6e27b50dead3df89a68b8e7b05b7d9db8f902830f6136d16c576a6f1acccd4af3d0ca33f65b90d6b27a527d9863b6611dcdf35bbcf1093da38
+MISC ChangeLog 1349 SHA256 15230aac54cc334cbd5e0bbd0e141a69c48646b199abf5deb866781518492878 SHA512 25197c4164f009c03f71e701d5b36bbe25a63a3b3bc76465045ccc67f1f8913524289930ed0e7c7df5f70b286da8c3667aa612e888c1737ed4ae07ca93d29e4a WHIRLPOOL 6fa22d6796bf97dda369a989249df8cc113b5917569d8fa88d262f6fc5ff60be0849cd6ce84b5fa081f85675957bad95ea493b5564327b6fd40b39b91d803d5b
 MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild	2012-11-10 21:30:21 UTC (rev 2284)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild	2012-11-11 09:55:41 UTC (rev 2285)
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=2
 
-inherit eutils multilib subversion
+inherit eutils qt4-r2 subversion cmake-utils
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://hydrogen.sourceforge.net/";
@@ -14,59 +14,53 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug flac jack ladspa lash portaudio"
+IUSE="alsa debug jack jacksession ladspa lash lrdf portaudio portmidi rubberband"
 
-RDEPEND="x11-libs/qt-core:4 x11-libs/qt-gui:4
+RDEPEND="
+	|| ( (
+         	x11-libs/qt-core:4
+			x11-libs/qt-gui:4 )
+			>=x11-libs/qt-4.4:4	)
 	dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
 	dev-libs/libtar
+	media-libs/rubberband
 	portaudio? ( >=media-libs/portaudio-18.1 )
+	portmidi? ( media-libs/portmidi )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )
 	lash? ( media-sound/lash )
-	flac? ( media-libs/flac )"
+	lrdf? ( media-libs/liblrdf )"
 
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	# export qt4 related environ (copy 'n paste fromt qt4.eclass)
-	export QTDIR=/usr/$(get_libdir)
-	export QMAKE=/usr/bin/qmake
-	export QMAKE_CC=$(tc-getCC)
-	export QMAKE_CXX=$(tc-getCXX)
-	export QMAKE_LINK=$(tc-getCXX)
-	export QMAKE_CFLAGS_RELEASE="${CFLAGS}"
-	export QMAKE_CFLAGS_DEBUG="${CFLAGS}"
-	export QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"
-	export QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}"
-	export QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
-	export QMAKE_LFLAGS_DEBUG="${LDFLAGS}"
+src_configure() {
+	mkdir build
+	cd build
+	cmake -L \
+		-DCMAKE_INSTALL_PREFIX=${ROOT}usr DESTDIR=${D} \
+		$(cmake-utils_use_want alsa ALSA) \
+		$(cmake-utils_use_want debug DEBUG) \
+		$(cmake-utils_use_want jack JACK) \
+		$(cmake-utils_use_want jacksession JACKSESSION) \
+		$(cmake-utils_use_want ladspa LADSPA) \
+		$(cmake-utils_use_want lash LASH) \
+		$(cmake-utils_use_want lrdf LRDF) \
+		$(cmake-utils_use_want portaudio PORTAUDIO) \
+		$(cmake-utils_use_want portmidi PORTMIDI) \
+		$(cmake-utils_use_want rubberband RUBBERBAND) ..
+}
 
-	local myconf="prefix=${ROOT}usr DESTDIR=${D}"
-	! use alsa; myconf="${myconf} alsa=$?"
-	! use debug; myconf="${myconf} debug=$?"
-	! use jack; myconf="${myconf} jack=$?"
-	! use ladspa; myconf="${myconf} lrdf=$?"
-	! use portaudio; myconf="${myconf} portaudio=$?"
-	! use lash; myconf="${myconf} lash=$?"
-	! use flac; myconf="${myconf} flac=$?"
-
-	tc-export CC CXX
-	myconf="${myconf} CC=${CC} CXX=${CXX}"
-	mkdir -p "${D}"
-	einfo "${myconf}"
-	scons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
-		MAKEOPTS="${MAKEOPTS}" \
-		${myconf} || die "scons failed"
+src_compile() {
+	cd ${S}/build
+	emake 
 }
 
 src_install() {
-	scons install prefix="${ROOT}usr" DESTDIR="${D}" || die "scons install failed"
-
-	# install tools
-	for i in hydrogenSynth hydrogenPlayer; do
-		dobin extra/$i/$i
-	done
+	cd ${S}/build
+	emake DESTDIR=${D} install
+	cd ..
+	dodoc AUTHORS ChangeLog DEVELOPERS README.txt
 }