[proaudio] [1017] improve linuxsampler ebuilds

[subversion@xxxxxxxxxxxxx]

Revision: 1017
Author:   gimpel
Date:     2007-12-13 10:48:17 +0000 (Thu, 13 Dec 2007)

Log Message:
-----------
improve linuxsampler ebuilds

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/linuxsampler/Manifest
    trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
    trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-9999.ebuild


Modified: trunk/overlays/proaudio/media-sound/linuxsampler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/linuxsampler/Manifest	2007-12-12 23:50:23 UTC (rev 1016)
+++ trunk/overlays/proaudio/media-sound/linuxsampler/Manifest	2007-12-13 10:48:17 UTC (rev 1017)
@@ -1,12 +1,12 @@
 DIST linuxsampler-0.5.1.tar.bz2 614500 RMD160 ea964c5033b3d44c1b5b72cb2447496cbd736992 SHA1 ceecf9751c20cd8e05c3c0056bbf7fb14ecb33e6 SHA256 e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f
-EBUILD linuxsampler-0.5.1.ebuild 724 RMD160 34bb184622d2540435a41821f15a870b6a86e583 SHA1 5e713a4ebcaf2dc444c85282a2fa3d24b2124acf SHA256 21cf589ad938d7a8e0a9731828b791aec1d61bdaae5642828f7d7bc1659e6952
-MD5 983d8cfa979d8640ea3daa2d2095aa3c linuxsampler-0.5.1.ebuild 724
-RMD160 34bb184622d2540435a41821f15a870b6a86e583 linuxsampler-0.5.1.ebuild 724
-SHA256 21cf589ad938d7a8e0a9731828b791aec1d61bdaae5642828f7d7bc1659e6952 linuxsampler-0.5.1.ebuild 724
-EBUILD linuxsampler-9999.ebuild 890 RMD160 3f07a953a56a47b5c297b1a9f1d0e161503823cd SHA1 9e17d9ee9135dcab5f7e9395ed4a121d5740d26a SHA256 e86a16dd816cd6fa986baf2d651ecb13f39d440b9085c6951c8585310e119ce8
-MD5 8f5a332275056babddd99bf43cd07d55 linuxsampler-9999.ebuild 890
-RMD160 3f07a953a56a47b5c297b1a9f1d0e161503823cd linuxsampler-9999.ebuild 890
-SHA256 e86a16dd816cd6fa986baf2d651ecb13f39d440b9085c6951c8585310e119ce8 linuxsampler-9999.ebuild 890
+EBUILD linuxsampler-0.5.1.ebuild 1489 RMD160 c6629c7993bd845cbdf99f3cdbb352efa0b6be81 SHA1 689899a628b09d47e194373fcc517df793f2f2a0 SHA256 63cfe887d63efc8b8b22a0a87bc8ef9f48b9d476faf5214981a59acafcefe62b
+MD5 d34b7caa79f13ae86e51931d92fbaaa1 linuxsampler-0.5.1.ebuild 1489
+RMD160 c6629c7993bd845cbdf99f3cdbb352efa0b6be81 linuxsampler-0.5.1.ebuild 1489
+SHA256 63cfe887d63efc8b8b22a0a87bc8ef9f48b9d476faf5214981a59acafcefe62b linuxsampler-0.5.1.ebuild 1489
+EBUILD linuxsampler-9999.ebuild 1621 RMD160 39fc0f432a8e53bb8ddd51227e5dbbb3693d6df6 SHA1 5ca230e797e7d711312f9a322ad7433bfc508b9e SHA256 43e508698bc078cf78d0f6b89a624f9ae776144a5d9c5e8672104dc0469f841a
+MD5 5b165e91baea402f216cde765ea7bef7 linuxsampler-9999.ebuild 1621
+RMD160 39fc0f432a8e53bb8ddd51227e5dbbb3693d6df6 linuxsampler-9999.ebuild 1621
+SHA256 43e508698bc078cf78d0f6b89a624f9ae776144a5d9c5e8672104dc0469f841a linuxsampler-9999.ebuild 1621
 MD5 6246578c18070ac6b9aa894da9a8b36a files/digest-linuxsampler-0.5.1 259
 RMD160 10d528c4e040336f4c25e876369bb155fa5a037b files/digest-linuxsampler-0.5.1 259
 SHA256 e85d82c87e0750b858428342c274f008a446dca832975a74b949d53eee6c0b86 files/digest-linuxsampler-0.5.1 259

Modified: trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild	2007-12-12 23:50:23 UTC (rev 1016)
+++ trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild	2007-12-13 10:48:17 UTC (rev 1017)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features."
 HOMEPAGE="http://www.linuxsampler.org/";
@@ -11,18 +11,44 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="jack"
+IUSE="alsa arts jack sqlite"
 
 RDEPEND=">=media-libs/liblscp-0.5.5
 	>=media-libs/libgig-3.2.1
-	media-libs/alsa-lib
-	jack? ( media-sound/jack-audio-connection-kit )"
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	arts? ( || ( kde-base/kdebase kde-base/arts ) )
+	sqlite? ( >=dev-db/sqlite-3.3 )"
 
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	if [ $(gcc-major-version)$(gcc-minor-version) -eq 41 ]; then
+		ewarn "${PN} will maybe crash a lot with gcc-4.1."
+		ewarn "You better upgrade to 4.2!"
+	fi
+
+	if ! use sqlite; then
+		ewarn "sqlite useflag not set. Disabling support for instrument-db!"
+	fi
+}
+
 src_compile() {
-	econf || die "./configure failed"
-	emake || die "make failed"
+	local myconf=""
+	use arts && myconf="--with-arts-prefix=/usr/kde/3.5"
+	
+	# disable nptl bug check for gcc-4.1
+	[[ $(gcc-major-version)$(gcc-minor-version) -eq 41 ]] && \
+		myconf="--disable-nptl-bug-check"
+	
+	econf \
+		`use_enable alsa alsa-driver` \
+		`use_enable arts arts-driver` \
+		`use_enable jack jack-driver` \
+		`use_enable sqlite instruments-db` \
+		${myconf} || die "configure failed"
+	
+	emake -j1 || die "make failed"
 }
 
 src_install() {

Modified: trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-9999.ebuild	2007-12-12 23:50:23 UTC (rev 1016)
+++ trunk/overlays/proaudio/media-sound/linuxsampler/linuxsampler-9999.ebuild	2007-12-13 10:48:17 UTC (rev 1017)
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils cvs
+inherit eutils toolchain-funcs cvs
 
 DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features."
 HOMEPAGE="http://www.linuxsampler.org/";
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="jack"
+IUSE="alsa arts jack sqlite"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
@@ -22,15 +22,40 @@
 RDEPEND="
 	>=media-libs/liblscp-9999
 	>=media-libs/libgig-9999
-	media-libs/alsa-lib
-	!media-sound/linuxsampler-cvs
-	jack? ( media-sound/jack-audio-connection-kit )"
-
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	arts? ( || ( kde-base/kdebase kde-base/arts ) )
+	sqlite? ( >=dev-db/sqlite-3.3 )"
+	
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	if [ $(gcc-major-version)$(gcc-minor-version) -eq 41 ]; then
+		ewarn "${PN} will maybe crash a lot with gcc-4.1."
+		ewarn "You better upgrade to 4.2!"
+	fi
+
+	if ! use sqlite; then
+		ewarn "sqlite useflag not set. Disabling support for instrument-db!"
+	fi
+}
+
 src_compile() {
 	make -f Makefile.cvs
-	econf || die "./configure failed"
+	local myconf=""
+	use arts && myconf="--with-arts-prefix=/usr/kde/3.5"
+	
+	# disable nptl bug check for gcc-4.1
+	[[ $(gcc-major-version)$(gcc-minor-version) -eq 41 ]] && \
+		myconf="--disable-nptl-bug-check"
+	
+	econf \
+		`use_enable alsa alsa-driver` \
+		`use_enable arts arts-driver` \
+		`use_enable jack jack-driver` \
+		`use_enable sqlite instruments-db` \
+		${myconf} || die "configure failed"
+	
 	emake -j1 || die "make failed"
 }