sample_ardourrc fix. (~x86 masked)

9 files changed, 15 insertions, 211 deletions

diff --git a/media-sound/ardour-cvs/ChangeLog b/media-sound/ardour-cvs/ChangeLog
index d8c43788ea72..02116de03849 100644
--- a/media-sound/ardour-cvs/ChangeLog
+++ b/media-sound/ardour-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour-cvs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ChangeLog,v 1.8 2003/05/06 13:26:50 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ChangeLog,v 1.9 2003/05/09 10:59:30 jje Exp $
+
+  09 May 2003; jje <jje@gentoo.org> ardour-cvs-0.5-r1.ebuild,
+  ardour-cvs-0.5-r1.ebuild, ardour-cvs-0.5.ebuild, ardour-cvs-0.5.ebuild,
+  ardour-cvs-0.6.4.ebuild, ardour-cvs-0.6.ebuild, ardour-cvs-0.6.ebuild:
+  Bug fix to sample_ardour.rc. Removed old ebuilds.
+  
+  Submitted by Rob Holland.
 
 *ardour-cvs-0.6.4 (06 May 2003)
 
diff --git a/media-sound/ardour-cvs/Manifest b/media-sound/ardour-cvs/Manifest
index 5e8eda35ed22..cd9e719d0e9e 100644
--- a/media-sound/ardour-cvs/Manifest
+++ b/media-sound/ardour-cvs/Manifest
@@ -1,4 +1,4 @@
-MD5 ebcfc34ee8cfc1d094367ee34a0d9378 ChangeLog 1760
-MD5 080eeea455cc387cf7a32414d585d0f5 ardour-cvs-0.6.4.ebuild 3016
+MD5 3a2d3e8c714fc14ddbd3fb635c5ce0a2 ChangeLog 1760
+MD5 15355bf03b705c36b496cfe1210c6ff2 ardour-cvs-0.6.4.ebuild 3016
 MD5 5bfe23209b494a8d0e56b22917448e8b files/asoundrc 74
 MD5 dd3df3c6861244c6791c849acb00b7c9 files/digest-ardour-cvs-0.6.4 70
diff --git a/media-sound/ardour-cvs/ardour-cvs-0.5-r1.ebuild b/media-sound/ardour-cvs/ardour-cvs-0.5-r1.ebuild
deleted file mode 100644
index 9ef2865a8af4..000000000000
--- a/media-sound/ardour-cvs/ardour-cvs-0.5-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ardour-cvs-0.5-r1.ebuild,v 1.2 2003/02/13 13:07:25 vapier Exp $
-
-inherit cvs            
-
-ECVS_SERVER="cvs.ardour.sourceforge.net:/cvsroot/ardour"
-ECVS_MODULE="ardour"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/ardour" 
-                                                                                
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ardour/ardour-pixmaps-2.5.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-
-DEPEND="dev-util/pkgconfig
-	>=media-libs/alsa-lib-0.9.0_rc6
-	>=media-sound/jack-cvs-0.44
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libsndfile-1.0.0
-	sys-libs/gdbm
-	media-libs/ladspa-sdk"
-
-S="${WORKDIR}/${PN/-cvs/}"
-
-src_compile() {
-
-	sh autogen.sh
-
-	econf || die "configure failed"
-
-	emake || die "parallel make failed"
-
-}
-
-src_install() {
-
-	einstall || die "make install failed"
-
-	cd ${WORKDIR}
-	mkdir pixmaps
-	cd pixmaps
-	unpack ${DISTFILES}/ardour-pixmaps-2.5.0.tar.gz
-	dodir /usr/share/ardour/pixmaps
-	cp * ${D}/usr/share/ardour/pixmaps
-
-	insinto /etc/skel
-	newins ${FILESDIR}/asoundrc .asoundrc
-
-	insinto /etc
-	doins ${S}/ardour.rc
-
-}
-
-pkg_postinst() {
-
-	einfo ""
-	einfo "ardour-cvs now depends on jack-cvs"
-	einfo "make sure to re-emerge jack-cvs before re-emerging ardour-cvs"
-	einfo ""
-
-}
diff --git a/media-sound/ardour-cvs/ardour-cvs-0.5.ebuild b/media-sound/ardour-cvs/ardour-cvs-0.5.ebuild
deleted file mode 100644
index b1411594e5da..000000000000
--- a/media-sound/ardour-cvs/ardour-cvs-0.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ardour-cvs-0.5.ebuild,v 1.2 2003/02/13 13:07:29 vapier Exp $
-
-inherit cvs            
-
-ECVS_SERVER="cvs.ardour.sourceforge.net:/cvsroot/ardour"
-ECVS_MODULE="ardour"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/ardour" 
-                                                                                
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ardour/ardour-pixmaps-2.5.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-DEPEND="dev-util/pkgconfig
-	>=media-libs/alsa-lib-0.9.0_rc2
-	>=media-sound/jack-audio-connection-kit-0.34
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libsndfile-1.0.0
-	sys-libs/gdbm
-	media-libs/ladspa-sdk"
-
-S="${WORKDIR}/${PN/-cvs/}"
-
-src_compile() {
-
-	sh autogen.sh
-
-	econf || die "configure failed"
-
-	emake || die "parallel make failed"
-
-}
-
-src_install() {
-
-	einstall || die "make install failed"
-
-	cd ${WORKDIR}
-	mkdir pixmaps
-	cd pixmaps
-	unpack ${DISTFILES}/ardour-pixmaps-2.5.0.tar.gz
-	dodir /usr/share/ardour/pixmaps
-	cp * ${D}/usr/share/ardour/pixmaps
-
-	insinto /etc/skel
-	newins ${FILESDIR}/asoundrc .asoundrc
-
-	insinto /etc
-	doins ${S}/ardour.rc
-
-}
diff --git a/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild b/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild
index b8cdfd1976c2..877ff359e5bc 100644
--- a/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild
+++ b/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild,v 1.1 2003/05/06 13:26:50 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ardour-cvs-0.6.4.ebuild,v 1.2 2003/05/09 10:59:30 jje Exp $
 
 IUSE="nls"
 
@@ -59,17 +59,19 @@ src_install() {
 
 	einstall || die "make install failed"
 
-	cd ${WORKDIR}
+	pushd ${WORKDIR}
 	mkdir pixmaps
 	cd pixmaps
 	unpack ${DISTFILES}/ardour-pixmaps-2.6.tar.bz2
 	dodir /usr/share/ardour/pixmaps
 	cp * ${D}/usr/share/ardour/pixmaps
+	popd
 
 	insinto /usr/share/ardour
 
         cp ardour.rc ardour.rc~
-	sed -e 's/\/usr\/local\/music\/src\/ardour\//\/usr\/local\/share\/ardour\//' ardour.rc~ > ardour.rc
+	sed -e 's/\/usr\/local\/music\/src\/ardour\//\/usr\/local\/share\/ardour\//' \
+	    -e 's/\/home\/paul\//\/usr\/local\/share\/ardour\//' ardour.rc~ > ardour.rc
 	cp ardour.rc sample_ardour.rc
 
 	cp ardour_system.rc ardour_system.rc~
diff --git a/media-sound/ardour-cvs/ardour-cvs-0.6.ebuild b/media-sound/ardour-cvs/ardour-cvs-0.6.ebuild
deleted file mode 100644
index 3e790b941371..000000000000
--- a/media-sound/ardour-cvs/ardour-cvs-0.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour-cvs/ardour-cvs-0.6.ebuild,v 1.5 2003/04/12 04:49:25 jje Exp $
-
-inherit cvs            
-
-ECVS_SERVER="cvs.ardour.sourceforge.net:/cvsroot/ardour"
-ECVS_MODULE="ardour"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/ardour" 
-                                                                                
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ardour/ardour-pixmaps-2.5.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="$DEPEND
-        dev-util/pkgconfig
-	>=media-libs/alsa-lib-0.9.0_rc7
-	media-sound/jack-cvs
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libsndfile-1.0.4
-	sys-libs/gdbm
-	>=media-libs/ladspa-sdk-1.12
-	>=media-libs/libsamplerate-0.0.14
-	>=media-libs/liblrdf-0.2.4"
-
-S="${WORKDIR}/${PN/-cvs/}"
-
-src_compile() {
-
-	sh autogen.sh
-        # nasty little hack to create version.h, will remove when this
-        # is fixed upstream...
-        cd gtk_ardour 
-        sh version.sh remake || die "failed to create version.h" 
-        cd ..
-	econf || die "configure failed"
-
-	# while troubleshooting upgrades to ardour-cvs-0.6 i changed from
-	# emake to make.  Can probably change back.  Need to test.
-	make || die "parallel make failed"
-
-}
-
-src_install() {
-
-	einstall || die "make install failed"
-
-	cd ${WORKDIR}
-	mkdir pixmaps
-	cd pixmaps
-	unpack ${DISTFILES}/ardour-pixmaps-2.5.0.tar.gz
-	dodir /usr/share/ardour/pixmaps
-	cp * ${D}/usr/share/ardour/pixmaps
-
-	insinto /etc/skel
-	newins ${FILESDIR}/asoundrc .asoundrc
-
-	insinto /etc
-	doins ${S}/ardour.rc
-
-}
-
-pkg_postinst() {
-
-	einfo ""
-	einfo "ardour-cvs now depends on jack-cvs"
-	einfo "make sure to re-emerge jack-cvs before re-emerging ardour-cvs"
-	einfo "as the development of both programs are closely linked."
-	einfo ""
-
-}
diff --git a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5 b/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5
deleted file mode 100644
index 630034ac8047..000000000000
--- a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9eb5bf0952d55fe30e05a39e109f1d60 ardour-pixmaps-2.5.0.tar.gz 105044
diff --git a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5-r1 b/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5-r1
deleted file mode 100644
index 630034ac8047..000000000000
--- a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9eb5bf0952d55fe30e05a39e109f1d60 ardour-pixmaps-2.5.0.tar.gz 105044
diff --git a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.6 b/media-sound/ardour-cvs/files/digest-ardour-cvs-0.6
deleted file mode 100644
index 630034ac8047..000000000000
--- a/media-sound/ardour-cvs/files/digest-ardour-cvs-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9eb5bf0952d55fe30e05a39e109f1d60 ardour-pixmaps-2.5.0.tar.gz 105044