version bump, fixes #18636

Package-Manager: portage-2.0.51.19

7 files changed, 126 insertions, 7 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index d0ebc761c7e2..78f3fba9ff53 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mup
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.11 2004/09/15 17:16:03 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.12 2005/03/09 19:17:02 luckyduck Exp $
+
+*mup-5.0 (09 Mar 2005)
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/5.0-beaming-bug.patch, +mup-5.0.ebuild:
+  version bump, fixes #18636
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> mup-4.6.ebuild:
   Stable amd64, sparc.
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 22fba2999a75..c8e76f2e7760 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,7 +1,10 @@
+MD5 234ec2d99e4c992ccc12fa76de885a0e 5.0-beaming-bug.patch 928
+MD5 344f663ad17f2f3c60d462122a65d7d2 mup-5.0.ebuild 2177
+MD5 ff0d30d91473665a0ca575dd39e8afff mup-4.4.ebuild 2105
 MD5 beea2b9abc509eb98147e5d2a919afa1 ChangeLog 1417
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ff0d30d91473665a0ca575dd39e8afff mup-4.4.ebuild 2105
 MD5 2504195044dd0636286d2fb13a173591 mup-4.6.ebuild 2132
 MD5 d73a9c5effa0eb340ee9eb4b799e32b8 files/4.6-gcc.patch 272
 MD5 3cdff463ef32c2e7b16982e0db999cfa files/digest-mup-4.4 120
 MD5 54c05300dd4879fbf61504bc145fc1ef files/digest-mup-4.6 120
+MD5 631bd9db6b998acd073dbeae3e9cc0b8 files/digest-mup-5.0 120
diff --git a/media-sound/mup/files/5.0-beaming-bug.patch b/media-sound/mup/files/5.0-beaming-bug.patch
new file mode 100644
index 000000000000..2b6714a69305
--- /dev/null
+++ b/media-sound/mup/files/5.0-beaming-bug.patch
@@ -0,0 +1,23 @@
+--- mup/prntdata.c.orig	2004-07-21 06:38:36.000000000 +0200
++++ mup/prntdata.c	2004-07-21 06:39:49.000000000 +0200
+@@ -2717,6 +2717,20 @@
+ 
+ {
+ 	int grpsize, grpvalue;
++        /* If we are passed the first group, it could be a space,
++         * in which case we need to use the below staff's group instead.
++         */
++        if (gs_p->grpcont == GC_SPACE) {
++                /* Need to hop to below staff. Go down the chord to find
++                 * the matching cross-staff beam group. */
++                do {
++                        if ((gs_p = gs_p->gs_p) == (struct GRPSYL *) 0) {
++                                pfatal("can't find matching beam chord");
++                        }
++
++                /* skip any lyrics and such till we find the beamed-to group */
++                } while (gs_p->beamto != BT_ABOVE);
++        }
+ 
+ 	/* need to skip past any groups of the wrong kind */
+ 	grpsize = gs_p->grpsize;
diff --git a/media-sound/mup/files/digest-mup-5.0 b/media-sound/mup/files/digest-mup-5.0
new file mode 100644
index 000000000000..cec82314c83c
--- /dev/null
+++ b/media-sound/mup/files/digest-mup-5.0
@@ -0,0 +1,2 @@
+MD5 980d467c9f42f00bd9ba54b34fcf61c9 mup50src.tar.gz 779418
+MD5 cb5b4ddea95f38c220a12dbe74f570d9 mup50doc.tar.gz 641955
diff --git a/media-sound/mup/mup-4.4.ebuild b/media-sound/mup/mup-4.4.ebuild
index 716ddbfd25f4..81f3e7d4c9e8 100644
--- a/media-sound/mup/mup-4.4.ebuild
+++ b/media-sound/mup/mup-4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.4.ebuild,v 1.8 2004/06/25 19:57:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.4.ebuild,v 1.9 2005/03/09 19:17:02 luckyduck Exp $
 
 MY_P="${PN}44"
 
diff --git a/media-sound/mup/mup-4.6.ebuild b/media-sound/mup/mup-4.6.ebuild
index 919678995907..6fcc664f45ca 100644
--- a/media-sound/mup/mup-4.6.ebuild
+++ b/media-sound/mup/mup-4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.6.ebuild,v 1.7 2004/09/15 17:16:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.6.ebuild,v 1.8 2005/03/09 19:17:02 luckyduck Exp $
 
 inherit eutils gcc
 
diff --git a/media-sound/mup/mup-5.0.ebuild b/media-sound/mup/mup-5.0.ebuild
new file mode 100644
index 000000000000..ca17aa24043f
--- /dev/null
+++ b/media-sound/mup/mup-5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.0.ebuild,v 1.1 2005/03/09 19:17:02 luckyduck Exp $
+
+inherit eutils gcc
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz
+	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}doc.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc"
+IUSE="X svga"
+
+RDEPEND="X? ( virtual/x11 )
+	svga? ( >=media-libs/svgalib-1.4.3 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-beaming-bug.patch
+}
+
+src_compile() {
+	local param
+
+	cd ${S}/mup
+	echo $(gcc-getCC) ${CFLAGS} -o mup *.c -lm
+	$(gcc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
+
+	cd ${S}/mkmupfnt
+	echo $(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c
+	$(gcc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
+
+	if [ `use X` ] || [ `use svga` ] ; then
+		cd ${S}/mupdisp
+		if [ `use X` ] ; then
+			param="-lX11 -L/usr/X11R6/lib"
+		else
+			sed -i '/XWINDOW/s:.*::' dispttyp.h
+		fi
+		if [ `use svga` ] ; then
+			param="${param} -lvga"
+		else
+			param="${param} -DNO_VGA_LIB"
+		fi
+		echo $(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
+		$(gcc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
+	fi
+}
+
+src_install() {
+	dobin mup/mup mkmupfnt/mkmupfnt mupprnt || die
+	if [ `use X` ] || [ `use svga` ] ; then
+		dobin mupdisp/mupdisp || die
+	fi
+
+	dodoc license.txt README0
+	cd docs
+	dodoc *.txt README1
+	doman mup.1 mkmupfnt.1 mupprnt.1
+	if [ `use X` ] || [ `use svga` ] ; then
+		doman mupdisp.1
+	fi
+	dohtml uguide/*
+	docinto sample
+	dodoc *.mup *.ps
+}
+
+pkg_postinst() {
+	if [ `use svga` ] ; then
+		einfo "Please note that using mupdisp in SVGA mode on the console"
+		einfo "requires that it can write to the console device. To allow"
+		einfo "this, make mupdisp setuid to root, like this:"
+		einfo ""
+		einfo "\tchown root:root /usr/bin/mupdisp"
+		einfo "\tchmod u+s /usr/bin/mupdisp"
+	fi
+	if [ `use X` ] || [ `use svga` ] ; then
+		echo
+		einfo "If you want to use mupdisp, make sure you also install ghostscript."
+	fi
+}