Updated to kito's suggestions, added altivec useflag. bug #105726

Package-Manager: portage-2.0.51.22-r2

3 files changed, 36 insertions, 18 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 49cafd204fcb..5292d8e494ae 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.45 2005/09/14 02:07:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.46 2005/09/14 02:21:46 eldad Exp $
+
+  14 Sep 2005; Eldad Zack <eldad@gentoo.org> ardour-0.9_beta30.ebuild:
+  Updated to kito's suggestions, added altivec useflag. bug #105726
 
 *ardour-0.9_beta30 (14 Sep 2005)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 7d16bc9d54ca..152fc0501212 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -3,10 +3,10 @@ Hash: SHA1
 
 MD5 e09cf0f70ce311c8ef94602940a6cf6c ardour-0.9_beta27.ebuild 1319
 MD5 ce9e98d8b029c69ffcdb77ac96ea5b0d ardour-0.9_beta29.ebuild 1461
-MD5 15714ab8d191ab41b3a21e8f47042aaf ardour-0.9_beta30.ebuild 2065
+MD5 d2b8fe2b0b5029f2b87ccd646c46159d ardour-0.9_beta30.ebuild 2110
 MD5 3c7ba68a6ee6a4618ac9e7da55b5644b ardour-0.9_beta26.ebuild 1322
 MD5 ddf2c2a467b0beccb346c708ae0ddca9 ardour-0.9_beta28.ebuild 1319
-MD5 e58a6f87a18a304380f63eafbc4597d9 ChangeLog 7145
+MD5 6972b2b0c09ea6e55a6d4314c9d2dbcd ChangeLog 7285
 MD5 28188f1657f0547a15f682ed3626a397 metadata.xml 330
 MD5 11e862600d9c027d453d23dc2bf8763d files/ardour.aclocal.patch 8594
 MD5 48a13a274bad04654ff331fda4c340f3 files/digest-ardour-0.9_beta26 70
@@ -18,7 +18,7 @@ MD5 e016dfbfc8e85547954395c455b04e61 files/ardour-gcc34.patch 9562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDJ4YnT+MN7JbqCpMRAiGdAJ0aI8JqKymnAAbxI0RuA5RDjtUkBwCePk/K
-s0p5eyyNKZIDafFfpno/hJk=
-=Rc+R
+iD8DBQFDJ4luT+MN7JbqCpMRAg+4AJ94gvX2SDXxYfNsmQsONMwlHlWM7wCfdKVb
+T4fqZACnAl0HcmLTkPe2rn4=
+=dML8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-0.9_beta30.ebuild b/media-sound/ardour/ardour-0.9_beta30.ebuild
index 731dd760521f..d433fa37d9a1 100644
--- a/media-sound/ardour/ardour-0.9_beta30.ebuild
+++ b/media-sound/ardour/ardour-0.9_beta30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta30.ebuild,v 1.1 2005/09/14 02:07:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta30.ebuild,v 1.2 2005/09/14 02:21:46 eldad Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="nls debug sse"
+IUSE="nls debug sse altivec"
 
 # From beta30 release notes:
 #  plugin latency compensation now working correctly (we believe)
@@ -35,30 +35,45 @@ RDEPEND="dev-util/pkgconfig
 	>=media-libs/ladspa-sdk-1.12
 	>=media-libs/libsamplerate-0.0.14
 	>=dev-libs/libxml2-2.5.7
-	>=media-libs/libart_lgpl-2.3.16
-	>=dev-util/scons-0.96.1"
+	>=media-libs/libart_lgpl-2.3.16"
 
 DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	dev-util/pkgconfig
+	>=dev-util/scons-0.96.1
 	nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${P/_/}"
 
 src_compile() {
+	# bug 99664
+	cd ${S}/libs/gtkmm
+	chmod a+x autogen.sh && ./autogen.sh || die "autogen failed"
+	econf || die "configure failed"
+
 	# Required for scons to "see" intermediate install location
 	mkdir -p ${D}
-	DBUG=no ; if useq debug ; then DBUG=yes ; fi
-	ENABLE_SSE=0 ; if useq sse ; then ENABLE_SSE=1 ; fi
 
-	scons DEBUG=${DBUG} USE_SSE_EVERYWHERE=${ENABLE_SSE} DESTDIR=${D} PREFIX=/usr KSI=0 -j2
+	use altivec && ALTIVEC=1 || ALTIVEC=0
+	use debug && ARDOUR_DEBUG=1 || ARDOUR_DEBUG=0
+	use nls && NLS=1 || NLS=0
+	use sse && SSE=1 || SSE=0
+
+	cd ${S}
+	scons \
+		ALTIVEC=${ALTIVEC} \
+		DEBUG=${ARDOUR_DEBUG} \
+		DESTDIR=${D} \
+		NLS=${NLS} \
+		PREFIX=/usr \
+		USE_SSE_EVERYWHERE=${SSE} \
+		KSI=0 \
+		-j2
 }
 
 src_install() {
 	scons install || die "make install failed"
 
-	# Workaround for xorg bug concerning lucida fonts. bug 73056. (2004 Dec 3 eldad)
-	# This workaround is no longer required as of ardour-0.9_beta29
-	# as it is already implemented in ardour_ui.rc
-	#sed -e 's/lucida[^-]*-/helvetica-/' -i ${D}/etc/ardour/ardour_ui.rc
-
 	dodoc DOCUMENTATION/*
 }