[proaudio] [1306] hydrogen: new buildsystem (thx Daniel_J) closes bug #53

[subversion@xxxxxxxxxxxxx]

Revision: 1306
Author:   evermind
Date:     2008-08-27 12:53:59 +0200 (Wed, 27 Aug 2008)

Log Message:
-----------
hydrogen: new buildsystem (thx Daniel_J) closes bug #53

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	2008-08-25 12:25:59 UTC (rev 1305)
+++ trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog	2008-08-27 10:53:59 UTC (rev 1306)
@@ -1,7 +1,11 @@
 # ChangeLog for media-sound/hydrogen
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+  hydrogen-9999.ebuild:
+  new buildsystem (thx Daniel_J) closes bug #53
+
   17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
   added a changelog
 

Modified: trunk/overlays/proaudio/media-sound/hydrogen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/Manifest	2008-08-25 12:25:59 UTC (rev 1305)
+++ trunk/overlays/proaudio/media-sound/hydrogen/Manifest	2008-08-27 10:53:59 UTC (rev 1306)
@@ -5,6 +5,6 @@
 AUX hydrogen-9999-configure.patch 1389 RMD160 afda9f8885753457b210aca4e8cc59f236a5c8b6 SHA1 553287b8b46b4dd9c2adcd66e434a4dd28056733 SHA256 6dc6a1e7fe1524d8e000528f2311befd5abc74b0def7519a0d8a23c3641f602a
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
 EBUILD hydrogen-0.9.3-r1.ebuild 3360 RMD160 a5af3e24d3501fcfb35216b42ed0a2bec225fc14 SHA1 701eeb6fe14f6ab5c66d00824f006418e35a7c02 SHA256 8e83a50db9a5980bee145d3f1705630ac660d913de7c8d03d696ea718ec28d16
-EBUILD hydrogen-9999.ebuild 1284 RMD160 f989e6b2e630b0c8cf794222f7847f04e09a112b SHA1 315c9f5aa2c137e281f634d48ef87f8d6adcdf3e SHA256 030fdf91c8b13349981a40be556b6ec8eab69581a3be5f35a5aa3187b699c260
-MISC ChangeLog 208 RMD160 c49c2ee7c49dafbacb97e64b2d31f8e997e2b4b2 SHA1 5f0d9e65015f9ee464fd89b910b9a9f80abe4af3 SHA256 e960f37ee681f20e9710785b99ebefc1ef3c0df7d89c55595178a5bc7af651f7
+EBUILD hydrogen-9999.ebuild 2163 RMD160 e6b4176aa4e3bde0919fa02adec02f67b6f9d052 SHA1 e8b4f4492da0cc72709078fd925c4591dd754ca0 SHA256 0f3bc7fe0138ba5f0b09b6e02998c05751e6a8d4ddcaec0c7633f7323baf88af
+MISC ChangeLog 339 RMD160 011da40e5c53ece6b8e4b53a14a2a8bc9a41534a SHA1 c5f85175e7e10a2da4c386b79c69216d1e6b5715 SHA256 b8772e4d8ae44b49b47653dc9261ab74c170908054bc0d13ccff221e7789dca8
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild	2008-08-25 12:25:59 UTC (rev 1305)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild	2008-08-27 10:53:59 UTC (rev 1306)
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug jack ladspa oss portaudio"
+IUSE="alsa debug flac jack ladspa lash portaudio"
 
 RDEPEND="
 	|| ( (
@@ -24,29 +24,50 @@
 	dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
-	media-libs/flac
 	dev-libs/libtar
-	portaudio? ( =media-libs/portaudio-18.1* )
+	portaudio? ( >=media-libs/portaudio-18.1 )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/liblrdf )"
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	flac? ( media-libs/flac )"
 
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
-	sed -i -e 's:/lib/libQtCore.so:/lib/qt4/libQtCore.so:' configure || die
-}
+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_compile() {
-	prefix=/usr ./configure
-	eqmake4 all.pro || die
-	emake -j1 || die "emake failed"
+	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_install() {
-	make INSTALL_ROOT="${D}/usr" install || die "make install failed"
+	scons install prefix="${ROOT}usr" destdir="${D}" || die "scons install failed"
 
 	# install tools
 	for i in hydrogenSynth hydrogenPlayer; do