Drop virtual/libc dependency. Respect LDFLAGS.

(Portage version: 2.1_pre5-r4)

7 files changed, 14 insertions, 215 deletions

diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog
index d756e49f4be9..74f15623a68a 100644
--- a/media-sound/mup/ChangeLog
+++ b/media-sound/mup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mup
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.18 2006/01/27 18:48:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.19 2006/03/07 15:26:10 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/5.0-beaming-bug.patch, -mup-4.4.ebuild, -mup-5.0.ebuild,
+  mup-5.1.ebuild:
+  Drop virtual/libc dependency. Respect LDFLAGS.
 
   27 Jan 2006; Andrej Kacian <ticho@gentoo.org> mup-5.1.ebuild:
   Fixed/optimized modular X deps.
diff --git a/media-sound/mup/files/5.0-beaming-bug.patch b/media-sound/mup/files/5.0-beaming-bug.patch
deleted file mode 100644
index 2b6714a69305..000000000000
--- a/media-sound/mup/files/5.0-beaming-bug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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-4.4 b/media-sound/mup/files/digest-mup-4.4
deleted file mode 100644
index 7389b592f6b2..000000000000
--- a/media-sound/mup/files/digest-mup-4.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c6197621dcbfe4133575a2ddb8311441 mup44src.tar.gz 704850
-MD5 6dfd17cd78021c12ebede6371eeb24f1 mup44doc.tar.gz 558212
diff --git a/media-sound/mup/files/digest-mup-5.0 b/media-sound/mup/files/digest-mup-5.0
deleted file mode 100644
index cec82314c83c..000000000000
--- a/media-sound/mup/files/digest-mup-5.0
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b0c2073b819c..000000000000
--- a/media-sound/mup/mup-4.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.10 2005/07/09 19:18:40 swegener Exp $
-
-MY_P="${PN}44"
-
-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"
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="X? ( virtual/x11 )
-	svga? ( >=media-libs/svgalib-1.4.3 )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir doc
-
-	unpack ${MY_P}src.tar.gz
-
-	cd doc
-	unpack ${MY_P}doc.tar.gz
-}
-
-src_compile() {
-	local param
-
-	cd mup
-	cc -O2 -o mup *.c -lm || die "compile mup failed"
-
-	cd ../mkmupfnt
-	cc -o mkmupfnt *.c || die "compile mkmupfnt failed"
-
-	if use X || use svga; then
-		cd ../mupdisp
-		if use X ; then
-			param="-lX11 -L/usr/X11R6/lib"
-		else
-			sed -i '/^#define XWINDOW/d' dispttyp.h || die "sed failed"
-		fi
-		if use svga ; then
-			param="${param} -lvga"
-		else
-			param="${param} -DNO_VGA_LIB"
-		fi
-		cc -o mupdisp *.c -lm ${param} || die "compile mupdisp failed"
-	fi
-}
-
-src_install () {
-	dobin mup/mup
-	dobin mkmupfnt/mkmupfnt
-	dobin mupprnt
-	if use X || 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 use X || 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 use X || 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-5.0.ebuild b/media-sound/mup/mup-5.0.ebuild
deleted file mode 100644
index 4e4e2cf154ed..000000000000
--- a/media-sound/mup/mup-5.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.6 2005/08/24 07:48:41 flameeyes Exp $
-
-inherit eutils toolchain-funcs
-
-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="~amd64 ~ppc ~sparc ~x86"
-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 $(tc-getCC) ${CFLAGS} -o mup *.c -lm
-	$(tc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
-
-	cd ${S}/mkmupfnt
-	echo $(tc-getCC) ${CFLAGS} -o mkmupfnt *.c
-	$(tc-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 $(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
-		$(tc-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 /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
-}
diff --git a/media-sound/mup/mup-5.1.ebuild b/media-sound/mup/mup-5.1.ebuild
index 2ce8b18db6d2..ced6f06ae439 100644
--- a/media-sound/mup/mup-5.1.ebuild
+++ b/media-sound/mup/mup-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.1.ebuild,v 1.3 2006/01/27 18:48:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.1.ebuild,v 1.4 2006/03/07 15:26:10 flameeyes Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X svga"
 
 RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )
-	svga? ( >=media-libs/svgalib-1.4.3 )
-	virtual/libc"
+	svga? ( >=media-libs/svgalib-1.4.3 )"
 
 DEPEND="${RDEPEND}
 	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
@@ -31,12 +30,12 @@ src_compile() {
 	local param
 
 	cd ${S}/mup
-	echo $(tc-getCC) ${CFLAGS} -o mup *.c -lm
-	$(tc-getCC) ${CFLAGS} -o mup *.c -lm || die "mup compile failed"
+	echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm || die "mup compile failed"
 
 	cd ${S}/mkmupfnt
-	echo $(tc-getCC) ${CFLAGS} -o mkmupfnt *.c
-	$(tc-getCC) ${CFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
+	echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mkmupfnt *.c
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed"
 
 	if use X || use svga ; then
 		cd ${S}/mupdisp
@@ -50,8 +49,8 @@ src_compile() {
 		else
 			param="${param} -DNO_VGA_LIB"
 		fi
-		echo $(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param}
-		$(tc-getCC) ${CFLAGS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
+		echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mupdisp *.c -lm ${param}
+		$(tc-getCC) ${CFLAGS} ${LDFLAS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed"
 	fi
 }