[proaudio] [1151] fix ardour-99992 to use 3.0 branch

[subversion@xxxxxxxxxxxxx]

Revision: 1151
Author:   gimpel
Date:     2008-02-07 15:02:51 +0000 (Thu, 07 Feb 2008)

Log Message:
-----------
fix ardour-99992 to use 3.0 branch

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild


Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-02-07 14:48:32 UTC (rev 1150)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest	2008-02-07 15:02:51 UTC (rev 1151)
@@ -7,6 +7,6 @@
 EBUILD ardour-2.1.ebuild 4205 RMD160 c1009642cb3ab16b14663fd9903b7f2be417445d SHA1 d51e9d56bd8dfba515ab83bf186225473ba031cc SHA256 8022e867006cf705163b6928c705a010e3dbb75f50f73f271a1191dc34aeca6a
 EBUILD ardour-2.2.ebuild 4205 RMD160 74950f3ef10f5330949d7ccb0d13ed287db965aa SHA1 d0fd6eb6b4e4587f11bece468895922e8f270de8 SHA256 906c66c2efb70f1163c84170d530ef8091f8b4cba97a83cf28b32b82243c1aa7
 EBUILD ardour-2.9999.ebuild 3655 RMD160 e196a6e98bebe8d3631b817293e9facbe8e90e8e SHA1 99efefa79210d78500a9f617d3f40a83ac9bbbf0 SHA256 9ff4fb649a1576278b8b89f125a0c3a2270c63b3b0c028293f0d6f86ef645262
-EBUILD ardour-99992.ebuild 5122 RMD160 199a759ac74262b96780cf61867b85d13c77b4b3 SHA1 fe87ad7d60b96b85eddf884e7d0d425434e9a8b3 SHA256 594cbd4e091f1c86d50188f5242787a7de6ee198724fd2d3a637c21ba6079365
+EBUILD ardour-99992.ebuild 3357 RMD160 8f20b5e6598f87d1fca4573b7cf1d12ec48defbb SHA1 b1d3f58ed9a2da4db5f7c5e9641e8bc3222f3757 SHA256 4d1e7740509fd04d9e7aa06c6263fe0c81ee28d1d05816505ee780f28ea57299
 MISC ChangeLog 1113 RMD160 507827c74710ada50865864f485ae6a67a93ef1d SHA1 ac0f1d5239e07ba1aa34722605445e022b11280a SHA256 f3c57ef25fbfca3ca3af5094b25eddd8c9a152368b29495df0b4066d7a5c9280
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild	2008-02-07 14:48:32 UTC (rev 1150)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild	2008-02-07 15:02:51 UTC (rev 1151)
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit eutils fetch-tools scons-ccache subversion
 
-ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/trunk";
+ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/3.0";
 DESCRIPTION="multi-track hard disk recording software"
 HOMEPAGE="http://ardour.org/";
 SRC_URI=""
@@ -87,9 +87,6 @@
 	subversion_src_unpack
 	cd ${S}
 
-	# change template dir to not overwrite ardour1 stuff
-	sed -i -e 's:\(share\)/ardour/\(templates\):\1/ardour2/\2:g' \
-		templates/SConscript || die "changing template names failed"
 	add_ccache_to_scons
 
 	# Fix libsoundtouch-1.0.pc detection
@@ -97,24 +94,6 @@
 		sed -i -e 's:libSoundTouch:soundtouch-1.0:g' SConstruct \
 			|| die "Fixing soundtouch detection failed"
 	fi
-
-	# ################
-	# adjust files for vst support
-	#if use vst;then
-		# delete vst question
-	#	touch ${S}/.personal_use_only
-
-		# fix vst header
-	#	sed -ie 's@vstsdk2.3/source/common/aeffectx.h@/usr/include/vst/aeffectx.h@g' libs/fst/SConscript || die "change vst-header location"
-		#symlink the include vst include files
-	#	vst_tmp_dir="vstsdk2.3/source/common"
-	#	mkdir -p ${vst_tmp_dir}
-	#	cp -r  /usr/include/vst/./ ${vst_tmp_dir}
-	#	zip -0r  libs/fst/vstsdk2.3.zip vstsdk2.3 &>/dev/null
-		#/usr/include/vst/ libs/fst
-		#ln -s ${DISTDIR}/vstsdk2.3.zip /libs/fst/
-	#fi
-	# ###############
 }
 
 src_compile() {
@@ -138,37 +117,5 @@
 
 src_install() {
 	scons DESTDIR="${D}" install || die "make install failed"
-	#if use vst;then
-	#	newbin vst/ardour_vst.exe.so ardour2.exe.so
-	#	newbin vst/ardour_vst ardour2
-	#	fperms 644 /usr/bin/ardour2.exe.so
-	#	sed -i -e'/^appname/'i"export\ LD_LIBRARY_PATH=\"/usr/lib/ardour2/:\$LD_LIBRARY_PATH\"" ${D}/usr/bin/ardour2
-
-		# fix ardour file_name
-	#	sed -i -e 's@ardour_vst@ardour2@' ${D}/usr/bin/ardour2
-	#else
-		# fix ardour path
-		sed -i -e 's:'${D}'::g' ${D}/usr/bin/ardour2
-	#fi
-
-	cd DOCUMENTATION/
-	for i in `find -iname 'CVS'`;do rm -rf ${i};done
-	cd - &>/dev/null
-	dodoc  DOCUMENTATION/*
 }
 
-agree_vst() {
-	local ANSWER="no"
-	einfo "Are you building Ardour for personal use (rather than distribution to others)? [yes/no]: "
-	read ANSWER
-	if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "yes" ];then
-		einfo "OK, VST support will be enabled"
-	else
-		eerror "You cannot build Ardour with VST support for distribution to others"
-		eerror "It is a violation of several different licenses"
-
-		eerror "use: USE=-vst emerge $P"
-		eerror "to disable vst support"
-		return 1
-	fi
-}