ver bump

8 files changed, 106 insertions, 160 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index 4b4314ffc874..f23ef26147e2 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mup
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.4 2003/07/31 16:00:58 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.5 2004/01/14 06:04:04 vapier Exp $
+
+*mup-4.6 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + more cleanups ;).
+
+*mup-4.5 (31 Jul 2003)
 
   31 Jul 2003; rob holland <tigger@gentoo.org> :
   Version bump and tidied ebuild to make version bumps easier. Prompted by
@@ -8,8 +15,8 @@
 
 *mup-4.4 (21 Oct 2002)
 
-  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : New version, closes bug
-  #7880.
+  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> :
+  New version, closes bug #7880.
 
 *mup-4.3 (26 Feb 2002)
 
diff --git a/media-sound/mup/files/4.6-gcc.patch b/media-sound/mup/files/4.6-gcc.patch
new file mode 100644
index 000000000000..e66344de25e0
--- /dev/null
+++ b/media-sound/mup/files/4.6-gcc.patch
@@ -0,0 +1,9 @@
+--- mupdisp/mupdisp.h.orig	2004-01-14 01:00:11.637757984 -0500
++++ mupdisp/mupdisp.h	2004-01-14 01:00:18.243753720 -0500
+@@ -146,6 +146,3 @@
+ extern void init P((void));
+ extern void do_cmd P((int c));
+ 
+-extern char *getenv();
+-extern long ftell();
+-extern long lseek();
diff --git a/media-sound/mup/files/digest-mup-4.3 b/media-sound/mup/files/digest-mup-4.3
deleted file mode 100644
index 333cb60abe93..000000000000
--- a/media-sound/mup/files/digest-mup-4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 890966a230f7f60b5f70ecab9beb83cf mup43src.tar.gz 683963
-MD5 e283f8e377c984802e6f3f1e8d319c84 mup43doc.tar.gz 556395
diff --git a/media-sound/mup/files/digest-mup-4.5 b/media-sound/mup/files/digest-mup-4.5
deleted file mode 100644
index 11d0d982f003..000000000000
--- a/media-sound/mup/files/digest-mup-4.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4896e4a0dc9b54afe398c816db30ac5b mup45src.tar.gz 724239
-MD5 54548d097ab8e7fe09b207e99ecc01f3 mup45doc.tar.gz 557008
diff --git a/media-sound/mup/files/digest-mup-4.6 b/media-sound/mup/files/digest-mup-4.6
new file mode 100644
index 000000000000..39fbad6809b8
--- /dev/null
+++ b/media-sound/mup/files/digest-mup-4.6
@@ -0,0 +1,2 @@
+MD5 a4019542e0de5337240552adf5a56430 mup46src.tar.gz 745999
+MD5 4a912caac886bc4a6b1896fc8a1848cc mup46doc.tar.gz 586421
diff --git a/media-sound/mup/mup-4.3.ebuild b/media-sound/mup/mup-4.3.ebuild
deleted file mode 100644
index 2019b928dcee..000000000000
--- a/media-sound/mup/mup-4.3.ebuild
+++ /dev/null
@@ -1,60 +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/mup/mup-4.3.ebuild,v 1.8 2003/09/07 00:06:06 msterret Exp $
-
-S=${WORKDIR}/${P}
-MY_P="${PN}43"
-DESCRIPTION="Mup is a shareware program for printing music. It takes an input file containing ordinary (ASCII) text describing music, and produces PostScript output for printing the musical score described by the input."
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/${MY_P}src.tar.gz
-ftp://ftp.arkkra.com/pub/unix/${MY_P}doc.tar.gz"
-HOMEPAGE="http://www.arkkra.com"
-
-DEPEND="virtual/x11
-	>=media-libs/svgalib-1.4.3"
-
-SLOT="0"
-LICENSE="Arkkra"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	mkdir ${P}
-	mkdir ${P}/doc
-
-	cd ${WORKDIR}/${P}
-	unpack mup43src.tar.gz
-
-	cd doc
-	unpack mup43doc.tar.gz
-
-}
-
-src_compile() {
-
-	cd ${S}/mup
-	cc -o mup *.c -lm
-
-	cd ${S}/mupdisp
-	cc -o mupdisp *.c -lm -lvga -lX11 -L/usr/X11R6/lib
-
-	cd ${S}/mkmupfnt
-	cc -o mkmupfnt *.c
-
-}
-
-src_install () {
-
-	dobin mup/mup
-	dobin mupdisp/mupdisp
-	dobin mkmupfnt/mkmupfnt
-	dobin mupprnt
-
-	dodoc license.txt README0
-	cd doc
-	dodoc faq.txt license.txt mupfeat.txt overview.txt register.txt README1
-	dodoc mkmupfnt.ps mupdisp.ps mupprnt.ps mup.ps mupqref.ps oddeven.ps uguide.ps
-	doman mup.1 mupdisp.1 mupprnt.1
-	dodoc sample.mup sample.ps star.mup star.ps template.mup
-	dohtml uguide/*
-
-}
diff --git a/media-sound/mup/mup-4.5.ebuild b/media-sound/mup/mup-4.5.ebuild
deleted file mode 100644
index af76d46463f1..000000000000
--- a/media-sound/mup/mup-4.5.ebuild
+++ /dev/null
@@ -1,93 +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/mup/mup-4.5.ebuild,v 1.2 2003/09/07 00:06:06 msterret Exp $
-
-MY_P="${P//[-.]/}"
-
-DESCRIPTION="Program for printing music scores."
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/${MY_P}src.tar.gz
-	ftp://ftp.arkkra.com/pub/unix/${MY_P}doc.tar.gz"
-HOMEPAGE="http://www.arkkra.com"
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="X svga"
-
-RDEPEND="X? ( virtual/x11 )
-	svga? ( >=media-libs/svgalib-1.4.3 )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}src.tar.gz
-
-	mkdir doc
-	cd doc
-	unpack ${MY_P}doc.tar.gz
-}
-
-src_compile() {
-	local param
-
-	cd mup
-	cc -O2 -o mup *.c -lm
-
-	cd ../mkmupfnt
-	cc -o mkmupfnt *.c
-
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
-		cd ../mupdisp
-		if [ -n "`use X`" ] ; then
-			param="-lX11 -L/usr/X11R6/lib"
-		else
-			mv dispttyp.h dispttyp.h.orig
-			sed <dispttyp.h.orig >dispttyp.h \
-				-e '/^#define XWINDOW/ d'
-		fi
-		if [ -n "`use svga`" ] ; then
-			param="${param} -lvga"
-		else
-			param="${param} -DNO_VGA_LIB"
-		fi
-		cc -o mupdisp *.c -lm ${param}
-	fi
-}
-
-src_install () {
-	dobin mup/mup
-	dobin mkmupfnt/mkmupfnt
-	dobin mupprnt
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
-		dobin mupdisp/mupdisp
-	fi
-
-	dodoc license.txt README0
-	cd doc
-	dodoc faq.txt mupfeat.txt overview.txt register.txt README1 \
-		mkmupfnt.ps mupdisp.ps mupprnt.ps mup.ps mupqref.ps oddeven.ps uguide.ps
-
-	doman mup.1 mupprnt.1 mkmupfnt.1
-	if [ -n "`use X`" -o -n "`use svga`" ] ; then
-		doman mupdisp.1
-	fi
-
-	dohtml uguide/*
-
-	docinto sample
-	dodoc sample.mup sample.ps star.mup star.ps template.mup
-}
-
-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 [ -n "`use X`" -o -n "`use svga`" ] ; then
-		echo
-		einfo "If you want to use mupdisp, make sure you also install ghostscript."
-	fi
-}
diff --git a/media-sound/mup/mup-4.6.ebuild b/media-sound/mup/mup-4.6.ebuild
new file mode 100644
index 000000000000..154d8b688299
--- /dev/null
+++ b/media-sound/mup/mup-4.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2004/01/14 06:04:04 vapier 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"
+IUSE="X svga"
+
+RDEPEND="X? ( virtual/x11 )
+	svga? ( >=media-libs/svgalib-1.4.3 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc.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
+}