Version bump.

6 files changed, 75 insertions, 71 deletions

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 8234dd27649a..6b1f56969621 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.20 2004/10/20 05:34:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.21 2004/11/22 05:14:20 eradicator Exp $
+
+*rosegarden-4.0.9.91_rc2 (21 Nov 2004)
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -rosegarden-4.0.9.9.ebuild, +rosegarden-4.0.9.91_rc2.ebuild:
+  Version bump.
 
   19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -rosegarden-4.0.9.6.ebuild, -rosegarden-4.0.9.7.ebuild,
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 17424b30a030..502bffdda708 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 60d9abd6604a10a79e8b0c6eda9267b7 ChangeLog 3093
+MD5 13a7851faefe5ba80acc5122ada65c62 ChangeLog 3270
 MD5 c88092184926549fd28a504c79731af2 metadata.xml 256
 MD5 ddd42c5d69e1a41574637425ab5a0147 rosegarden-4.0.9.8.ebuild 943
-MD5 cd958bec365e6bb85b99efe4cb7492b4 rosegarden-4.0.9.9.ebuild 1357
+MD5 5df1015ef83d4866883cfde800ca6955 rosegarden-4.0.9.91_rc2.ebuild 1575
+MD5 f9434a09349540e99ec3ef2e25b0f894 files/digest-rosegarden-4.0.9.91_rc2 76
 MD5 eedfa71e3000918862d19d5ac29cc0ef files/digest-rosegarden-4.0.9.8 71
-MD5 2cf63411a83b0ffc1879b3b05d1b9a29 files/digest-rosegarden-4.0.9.9 71
 MD5 a5c7d144703aa1e8bdaebf26ee9c630b files/rosegarden-4.0.9.9-gcc34.patch 396
 MD5 a3bf2374bdf25fce50cea38edb2888f7 files/rosegarden-4.0.9.9-pic.patch 641
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBdfj0ArHZZzCEUG0RAr0qAJ49fW7QvfyqOxJ+D1W7jLhBcWtxZwCfcUEj
-dq6kIZMJIbKy+5/ogykeNvA=
-=uGRf
+iD8DBQFBoXXNArHZZzCEUG0RAo4SAJ96pXYXvf9Bls7UWaRbK3AhJzf1KgCdELn+
+4XXx5haivjKwqfnkNoDanUA=
+=VymN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.0.9.9 b/media-sound/rosegarden/files/digest-rosegarden-4.0.9.9
deleted file mode 100644
index 792f54493bac..000000000000
--- a/media-sound/rosegarden/files/digest-rosegarden-4.0.9.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fada44610177aecc6136be8ccae92eb rosegarden-4-0.9.9.tar.gz 4625489
diff --git a/media-sound/rosegarden/files/digest-rosegarden-4.0.9.91_rc2 b/media-sound/rosegarden/files/digest-rosegarden-4.0.9.91_rc2
new file mode 100644
index 000000000000..321d4a31175f
--- /dev/null
+++ b/media-sound/rosegarden/files/digest-rosegarden-4.0.9.91_rc2
@@ -0,0 +1 @@
+MD5 4c5a51494688a1d3f1a45cac7684d875 rosegarden-4-0.9.91rc2.tar.bz2 4382008
diff --git a/media-sound/rosegarden/rosegarden-4.0.9.9.ebuild b/media-sound/rosegarden/rosegarden-4.0.9.9.ebuild
deleted file mode 100644
index f3ad4b1de02d..000000000000
--- a/media-sound/rosegarden/rosegarden-4.0.9.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.9.ebuild,v 1.2 2004/09/30 23:37:52 eradicator Exp $
-
-IUSE="jack"
-
-inherit eutils flag-o-matic
-
-MY_PV="${PV/./-}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="MIDI and audio sequencer and notation editor."
-HOMEPAGE="http://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~x86 ~ppc ~amd64"
-KEYWORDS="-*"
-
-RDEPEND=">=kde-base/kdelibs-3.0
-	>=x11-libs/qt-3
-	media-libs/alsa-lib
-	jack? ( media-sound/jack-audio-connection-kit )
-	>=media-libs/ladspa-sdk-1.0
-	>=media-libs/ladspa-cmt-1.14"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc34.patch
-	epatch ${FILESDIR}/${P}-pic.patch
-
-	# Fix broken (-fPIC) tools
-	libtoolize -f -c || die
-
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-	aclocal || die
-	automake || die
-	autoconf || die
-}
-
-src_compile() {
-	addwrite ${QTDIR}/etc/settings
-
-	#append-flags -fexceptions
-
-	econf `use_with jack` \
-		--with-ladspa \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO TRANSLATORS
-}
diff --git a/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild b/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild
new file mode 100644
index 000000000000..9163e8d8b1d8
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild,v 1.1 2004/11/22 05:14:20 eradicator Exp $
+
+IUSE="alsa arts jack"
+
+MY_PV="${PV/_rc*/}"
+MY_PV="${MY_PV/./-}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="MIDI and audio sequencer and notation editor."
+HOMEPAGE="http://www.rosegardenmusic.com/"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.telegraph-road.org/rosegarden/rosegarden-4-0.9.91rc2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=kde-base/kdelibs-3.0
+	kde-base/kdemultimedia
+	>=x11-libs/qt-3
+	!arts? ( media-libs/alsa-lib )
+	alsa? ( media-libs/alsa-lib )
+	!alsa? ( arts? ( kde-base/arts ) )
+	jack? ( media-sound/jack-audio-connection-kit )
+	>=media-libs/ladspa-sdk-1.0
+	>=media-libs/ladspa-cmt-1.14"
+
+pkg_setup() {
+	snd_conf=""
+	if use alsa; then
+		if use arts; then
+			ewarn "alsa and arts USE flags detected.  Only one can"
+			ewarn "used by rosegarden... selecting alsa by default."
+		fi
+		snd_conf="--without-arts"
+	else
+		if use arts; then
+			snd_conf="--without-arts"
+		else
+			ewarn "Neither arts or alsa USE flags selected.  Choosing"
+			ewarn "alsa by default."
+			snd_conf="--without-arts"
+		fi
+	fi	
+}
+
+src_compile() {
+	addwrite ${QTDIR}/etc/settings
+	econf ${snd_conf} `use_with jack` \
+		--with-ladspa \
+		|| die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog NEWS README TODO TRANSLATORS
+}