Resolving conflict in executable name with media-sound/muse. We instal as lmuse and setup a symlink if muse is not installed. Closes bug #34973.

4 files changed, 28 insertions, 10 deletions

diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index a63812e14998..31af4ef0ecde 100644
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/museseq
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.5 2004/02/01 23:38:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.6 2004/02/19 18:39:37 eradicator Exp $
+
+  19 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.0.ebuild,
+  museseq-0.6.2.ebuild:
+  Resolving conflict in executable name with media-sound/muse. We install
+  as lmuse and setup a symlink if muse is not installed. Closes bug #34973.
 
   02 Feb 2004; Martin Holzer <mholzer@gentoo.org> museseq-0.6.2.ebuild:
   fixing sandbox.
diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index f1bf0fb238b8..bcfe6511fce9 100644
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,6 +1,6 @@
-MD5 310f5a32a689e83a1cd6f9d7673380ab ChangeLog 768
-MD5 c0bf30b7efb0ba31f409b95590e03dc1 museseq-0.6.0.ebuild 1384
-MD5 ae8ef8a7331491a69eaf4b475f1827e4 museseq-0.6.2.ebuild 2118
+MD5 d3dea9812f3917f9ae15dc1530edb6fd museseq-0.6.0.ebuild 1582
+MD5 dd8f905617fc3dd4acb7b58c704e3a88 museseq-0.6.2.ebuild 2322
+MD5 255ebd0ebccb45173c271dc274818b02 ChangeLog 1025
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 cbc52b356437ff53ced441374a08d178 files/digest-museseq-0.6.0 64
 MD5 fbb837028f0103f8c2775f24e661888b files/digest-museseq-0.6.2 64
diff --git a/media-sound/museseq/museseq-0.6.0.ebuild b/media-sound/museseq/museseq-0.6.0.ebuild
index fd733866c9c3..48e6d34d58a1 100644
--- a/media-sound/museseq/museseq-0.6.0.ebuild
+++ b/media-sound/museseq/museseq-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.0.ebuild,v 1.2 2003/12/06 23:25:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.0.ebuild,v 1.3 2004/02/19 18:39:37 eradicator Exp $
 
 inherit virtualx
 
@@ -36,6 +36,13 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc COPYING INSTALL README README.softsynth SECURITY TODO
+
+	# Name conflict with media-sound/muse.  See bug #34973
+	mv ${D}/usr/bin/muse ${D}/usr/bin/lmuse
+
+	if [ ! -f /usr/bin/muse -o -L /usr/bin/muse ]; then
+		dosym /usr/bin/lmuse /usr/bin/muse
+	fi
 }
 
 pkg_postinst() {
@@ -43,7 +50,7 @@ pkg_postinst() {
 	einfo "Muse has been installed normally. If,"
 	einfo "you would like to use muse with real time"
 	einfo "time capabilities for the sequencer then do"
-	einfo "chmod 4755 /usr/bin/muse"
+	einfo "chmod 4755 /usr/bin/lmuse"
 	einfo ""
 	einfo "Muse can use /dev/rtc if it is compiled in"
 	einfo "to your kernel, or available as a module."
diff --git a/media-sound/museseq/museseq-0.6.2.ebuild b/media-sound/museseq/museseq-0.6.2.ebuild
index 41f4ae6b0e30..a6d6dc6b99c9 100644
--- a/media-sound/museseq/museseq-0.6.2.ebuild
+++ b/media-sound/museseq/museseq-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2.ebuild,v 1.4 2004/02/01 23:38:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2.ebuild,v 1.5 2004/02/19 18:39:37 eradicator Exp $
 
 inherit virtualx
 
@@ -19,7 +19,7 @@ IUSE="jack fluidsynth ladcca"
 DEPEND="media-libs/alsa-lib \
 	>=media-libs/libsndfile-1.0.4 \
 	>=x11-libs/qt-3.1.0
-	ladcca? ( media-libs/ladcca ) \
+	ladcca? ( >=media-libs/ladcca-0.4.0 ) \
 	jack? ( virtual/jack ) \
 	fluidsynth? ( media-sound/fluidsynth )"
 
@@ -60,6 +60,12 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc COPYING INSTALL README README.softsynth SECURITY TODO
+
+	# Name conflict with media-sound/muse.  See bug #34973
+	mv ${D}/usr/bin/muse ${D}/usr/bin/lmuse
+	if [ ! -f /usr/bin/muse -o -L /usr/bin/muse ]; then
+		dosym /usr/bin/lmuse /usr/bin/muse
+	fi
 }
 
 pkg_postinst() {
@@ -67,7 +73,7 @@ pkg_postinst() {
 	einfo "Muse has been installed normally. If,"
 	einfo "you would like to use muse with real time"
 	einfo "time capabilities for the sequencer then do"
-	einfo "chmod 4755 /usr/bin/muse"
+	einfo "chmod 4755 /usr/bin/lmuse"
 	einfo ""
 	einfo "Muse can use /dev/rtc if it is compiled in"
 	einfo "to your kernel, or available as a module."