[proaudio] [952] fix/update lmms-9999

[subversion@xxxxxxxxxxxxx]

Revision: 952
Author:   gimpel
Date:     2007-11-08 21:20:56 +0000 (Thu, 08 Nov 2007)

Log Message:
-----------
fix/update lmms-9999

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/lmms/Manifest
    trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/lmms/files/lmms-9999-acinclude.patch


Modified: trunk/overlays/proaudio/media-sound/lmms/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/Manifest	2007-11-08 20:42:38 UTC (rev 951)
+++ trunk/overlays/proaudio/media-sound/lmms/Manifest	2007-11-08 21:20:56 UTC (rev 952)
@@ -1,3 +1,7 @@
+AUX lmms-9999-acinclude.patch 574 RMD160 6df524b8a906b74e890b1aa5ed3f5335093a64fa SHA1 98b629225c8553c0ccedbc5e8309d6d4a9e5e1b1 SHA256 1ec9baf1e7ec9be8014090bd0219e3f14a09f17d3e12173e9557e55d74a7170d
+MD5 25bf0d41cf714bd5982a8923e69fa2a7 files/lmms-9999-acinclude.patch 574
+RMD160 6df524b8a906b74e890b1aa5ed3f5335093a64fa files/lmms-9999-acinclude.patch 574
+SHA256 1ec9baf1e7ec9be8014090bd0219e3f14a09f17d3e12173e9557e55d74a7170d files/lmms-9999-acinclude.patch 574
 AUX lmms-qt4_configure_gentoo.patch 1711 RMD160 c011a072d5b7e55be2a46eff4e1e2c1d9924db16 SHA1 6140f36cb7684e70076aea063dd683a288ea19c8 SHA256 06d6d92288f304b567b7d58f5cc9ada17efb8dc44a9f0578c7582f4ac59ce5a2
 MD5 3bfe52e0b7aff4081960b985d42a985b files/lmms-qt4_configure_gentoo.patch 1711
 RMD160 c011a072d5b7e55be2a46eff4e1e2c1d9924db16 files/lmms-qt4_configure_gentoo.patch 1711
@@ -17,10 +21,10 @@
 MD5 803a0beaf69aa3e327082153fef2f6d0 lmms-0.3.0.ebuild 1914
 RMD160 22f09c0425b4de938c14c77d6b73718c6a90f777 lmms-0.3.0.ebuild 1914
 SHA256 024fcb60e79f97b3fd064e9590b6c7ef8ade25aa496083de8f1d4427e2191b9c lmms-0.3.0.ebuild 1914
-EBUILD lmms-9999-r1.ebuild 2388 RMD160 56e762d56d87412beb53eec7556aa91455807efd SHA1 b0f73dce205b5b1ff8e1d4d0af4a6439f2fdbb97 SHA256 7252aabbf224d34594a8d5ac93ccf8a6cb670c3fc28249a1ea28f5f258365b13
-MD5 80a3da435f6068c9405d188f5c54751c lmms-9999-r1.ebuild 2388
-RMD160 56e762d56d87412beb53eec7556aa91455807efd lmms-9999-r1.ebuild 2388
-SHA256 7252aabbf224d34594a8d5ac93ccf8a6cb670c3fc28249a1ea28f5f258365b13 lmms-9999-r1.ebuild 2388
+EBUILD lmms-9999-r1.ebuild 2291 RMD160 f59d11bc14f7e2022bf83a1e3cb208329d984cc8 SHA1 1d2782398921d55e3c28ee0a33575d0878b8b889 SHA256 df0d074664afc3cdf2b03483b53d73d0f138e17a1f514e983f48dd5108428cd3
+MD5 ee2dda60a2689262dd458b83c185a464 lmms-9999-r1.ebuild 2291
+RMD160 f59d11bc14f7e2022bf83a1e3cb208329d984cc8 lmms-9999-r1.ebuild 2291
+SHA256 df0d074664afc3cdf2b03483b53d73d0f138e17a1f514e983f48dd5108428cd3 lmms-9999-r1.ebuild 2291
 MD5 6984728806569d50abb1696cee00b29b files/digest-lmms-0.1.4 238
 RMD160 a80bb0883cbbfdd8f0590e8ff4c8ab51f9b9cbbf files/digest-lmms-0.1.4 238
 SHA256 27b2167150fae3aeb1c9bebdeb7e599bdac1515d67127a00c26925f2c8a5eca8 files/digest-lmms-0.1.4 238

Added: trunk/overlays/proaudio/media-sound/lmms/files/lmms-9999-acinclude.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/files/lmms-9999-acinclude.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/lmms/files/lmms-9999-acinclude.patch	2007-11-08 21:20:56 UTC (rev 952)
@@ -0,0 +1,14 @@
+--- acinclude.m4.orig	2007-11-08 22:15:26.000000000 +0100
++++ acinclude.m4	2007-11-08 22:17:34.000000000 +0100
+@@ -143,9 +143,9 @@ case "${host}" in
+ 	fi
+         ;;
+     *)
+-       	QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` 
++       	QT_LIBS=`ls $QTDIR/lib64/qt4/libQt*.so 2> /dev/null` 
+         if test "x$QT_LIBS" = x;  then
+-        	QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` 
++        	QT_LIBS=`ls $QTDIR/lib/qt4/libQt*.so 2> /dev/null` 
+             	if test "x$QT_LIBS" = x;  then
+ 			AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
+             	fi

Modified: trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild	2007-11-08 20:42:38 UTC (rev 951)
+++ trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild	2007-11-08 21:20:56 UTC (rev 952)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils subversion autotools flag-o-matic
+inherit eutils subversion autotools flag-o-matic qt4
 
 DESCRIPTION="free alternative to popular programs such as FruityLoops, Cubase and Logic"
 HOMEPAGE="http://lmms.sourceforge.net";
@@ -15,11 +15,10 @@
 
 S="${WORKDIR}/${PN}"
 
-IUSE="alsa debug flac jack ladspa oss pic samplerate sdl singerbot surround stk vorbis 
-vst qt3 qt4"
+IUSE="alsa debug flac jack ladspa oss pic samplerate sdl singerbot surround 
+stk vorbis vst sndfile"
 
-DEPEND="qt4? ( >=x11-libs/qt-4.1 ) 
-	qt3? ( =x11-libs/qt-3.3* )
+DEPEND="$(qt4_min_version 4.3)
 	vorbis? ( media-libs/libvorbis )
 	alsa? ( media-libs/alsa-lib )
 	sdl? ( media-libs/libsdl 
@@ -30,15 +29,9 @@
 			app-emulation/wine )
 	ladspa? ( media-libs/ladspa-sdk )
 	singerbot? ( app-accessibility/festival )
-	stk? ( media-sound/stk )"
+	stk? ( media-sound/stk )
+	sndfile? ( media-libs/libsndfile )"
 
-pkg_setup() {
-	if use qt4; then
-		if use qt3; then
-			die "Please choose qt3 OR qt4 in USE"
-		fi
-	fi
-}
 src_unpack() {
 	subversion_src_unpack
 	cd ${S}
@@ -46,9 +39,14 @@
 	if use vst ; then
 		cp /usr/include/vst/{AEffect.h,aeffectx.h} include/
 	fi
+	
+	# fix Qt4 autofoo
+	epatch "${FILESDIR}/${P}-acinclude.patch"
 }
 
 src_compile() {
+	unset QTDIR
+
 	# autofoo
 	eautoreconf || die
 	
@@ -72,14 +70,10 @@
 		`use_with vst` \
 		`use_with singerbot` \
 		`use_with stk` \
+		`use_with sndfile libsf` \
+		--with-qtdir=/usr \
 		--enable-hqsinc"
 	
-	# qt4 fixups
-	if use qt4; then
-		myconf="${myconf} --with-qtdir=/usr"
-		#epatch ${FILESDIR}/lmms-qt4_configure_gentoo.patch
-	fi
-
 	econf ${myconf} || die "Configure failed"
 
 	# we need MAKEOPTS="-j1" for VST support