diff options
| -rw-r--r-- | media-sound/mup/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/mup/mup-5.1.ebuild | 21 | ||||
| -rw-r--r-- | media-sound/protux/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/protux/protux-0.20.1.ebuild | 18 | ||||
| -rw-r--r-- | media-sound/protux/protux-0.20.2.ebuild | 18 |
5 files changed, 35 insertions, 33 deletions
diff --git a/media-sound/mup/ChangeLog b/media-sound/mup/ChangeLog index 41299383a2bc..15924c94606d 100644 --- a/media-sound/mup/ChangeLog +++ b/media-sound/mup/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/mup # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.24 2007/01/05 17:40:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/ChangeLog,v 1.25 2007/07/22 08:26:52 drac Exp $ + + 22 Jul 2007; Samuli Suominen <drac@gentoo.org> mup-5.1.ebuild: + Remove virtual/x11 references and fix quoting. 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> mup-5.1.ebuild: Convert to use elog. diff --git a/media-sound/mup/mup-5.1.ebuild b/media-sound/mup/mup-5.1.ebuild index 9120c0b7110f..245a3e5484e9 100644 --- a/media-sound/mup/mup-5.1.ebuild +++ b/media-sound/mup/mup-5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.8 2007/01/05 17:40:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.1.ebuild,v 1.9 2007/07/22 08:26:52 drac Exp $ inherit eutils toolchain-funcs @@ -8,37 +8,36 @@ 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? ( || ( x11-libs/libX11 virtual/x11 ) ) +RDEPEND="X? ( x11-libs/libX11 ) svga? ( >=media-libs/svgalib-1.4.3 )" - DEPEND="${RDEPEND} - X? ( || ( x11-proto/xextproto virtual/x11 ) )" + X? ( x11-proto/xextproto )" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}css.patch + cd "${S}" + epatch "${FILESDIR}"/${P}css.patch } src_compile() { local param - cd ${S}/mup + cd "${S}"/mup echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm || die "mup compile failed" - cd ${S}/mkmupfnt + cd "${S}"/mkmupfnt 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 + cd "${S}"/mupdisp if use X ; then param="-lX11 -L/usr/X11R6/lib" else @@ -60,7 +59,7 @@ src_install() { dobin mupdisp/mupdisp || die fi - dodoc license.txt README0 + dodoc README0 cd docs dodoc *.txt README1 doman mup.1 mkmupfnt.1 mupprnt.1 diff --git a/media-sound/protux/ChangeLog b/media-sound/protux/ChangeLog index 2ec4aecdd836..33ff093b3654 100644 --- a/media-sound/protux/ChangeLog +++ b/media-sound/protux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/protux # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.24 2007/07/02 15:16:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.25 2007/07/22 08:23:59 drac Exp $ + + 22 Jul 2007; Samuli Suominen <drac@gentoo.org> protux-0.20.1.ebuild, + protux-0.20.2.ebuild: + Remove virtual/x11 references. 02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml: Hand to newly-born proaudio herd. diff --git a/media-sound/protux/protux-0.20.1.ebuild b/media-sound/protux/protux-0.20.1.ebuild index c7d730e61840..c442c1c1f349 100644 --- a/media-sound/protux/protux-0.20.1.ebuild +++ b/media-sound/protux/protux-0.20.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.1.ebuild,v 1.9 2006/03/27 11:22:28 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.1.ebuild,v 1.10 2007/07/22 08:23:59 drac Exp $ inherit eutils kde-functions @@ -13,8 +13,7 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ~amd64" -DEPEND="|| ( ( x11-libs/libXt ) - virtual/x11 ) +DEPEND="x11-libs/libXt =x11-libs/qt-3* >=media-libs/libmustux-0.20.1" @@ -22,18 +21,17 @@ set-qtdir 3 src_unpack() { unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PN}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}"/${PN}-gentoo.patch } src_compile() { export QT_MOC=${QTDIR}/bin/moc - econf $(use_enable static) || die "configure failed" - emake || die + econf $(use_enable static) || die "econf failed." + emake || die "emake failed." } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "make install failed." dodoc AUTHORS ChangeLog README } diff --git a/media-sound/protux/protux-0.20.2.ebuild b/media-sound/protux/protux-0.20.2.ebuild index dab2c819efa4..504daf85602e 100644 --- a/media-sound/protux/protux-0.20.2.ebuild +++ b/media-sound/protux/protux-0.20.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.2.ebuild,v 1.10 2006/04/06 00:47:54 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.2.ebuild,v 1.11 2007/07/22 08:23:59 drac Exp $ inherit eutils kde-functions @@ -13,8 +13,7 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ~amd64 ~ppc" -DEPEND="|| ( ( x11-libs/libXt ) - virtual/x11 ) +DEPEND="x11-libs/libXt =x11-libs/qt-3* >=media-libs/libmustux-0.20.2" @@ -22,18 +21,17 @@ set-qtdir 3 src_unpack() { unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PN}-gentoo.patch + cd "${S}" + epatch "${FILESDIR}"/${PN}-gentoo.patch } src_compile() { export QT_MOC=${QTDIR}/bin/moc - econf $(use_enable static) || die "configure failed" - emake || die + econf $(use_enable static) || die "econf failed." + emake || die "emake failed." } src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "make install failed." dodoc AUTHORS ChangeLog README } |