diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2004-05-10 07:21:30 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-05-10 07:21:30 +0000 |
commit | e226018d4f228b6facca0efe0b37324532bd69e9 (patch) | |
tree | 3ab122106bd2338d571aced22430ed371dd9c845 /media-sound/playmidi | |
parent | Some little fixes for bug #49815 (diff) | |
download | historical-e226018d4f228b6facca0efe0b37324532bd69e9.tar.gz historical-e226018d4f228b6facca0efe0b37324532bd69e9.tar.bz2 historical-e226018d4f228b6facca0efe0b37324532bd69e9.zip |
fix bug #50517; use emake; fix use usage; tidy
Diffstat (limited to 'media-sound/playmidi')
-rw-r--r-- | media-sound/playmidi/ChangeLog | 5 | ||||
-rw-r--r-- | media-sound/playmidi/Manifest | 6 | ||||
-rw-r--r-- | media-sound/playmidi/playmidi-2.5.ebuild | 57 |
3 files changed, 42 insertions, 26 deletions
diff --git a/media-sound/playmidi/ChangeLog b/media-sound/playmidi/ChangeLog index 6f4b3cfef9aa..594bde498d74 100644 --- a/media-sound/playmidi/ChangeLog +++ b/media-sound/playmidi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/playmidi # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.3 2004/04/08 09:01:00 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.4 2004/05/10 07:21:30 mr_bones_ Exp $ + + 10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> playmidi-2.5.ebuild: + fix bug #50517; use emake; fix use usage; tidy 08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> playmidi-2.5.ebuild, files/playmidi-2.5.patch: diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest index 0f51a1377fd8..683d2770a110 100644 --- a/media-sound/playmidi/Manifest +++ b/media-sound/playmidi/Manifest @@ -1,5 +1,5 @@ -MD5 8c9478ccae03c4ab6ac44a8de7704373 ChangeLog 666 +MD5 36850045398b32ce0407ec1be58aeb3e ChangeLog 791 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 5d4d86f49f1ceb081418e23bc6864c5d playmidi-2.5.ebuild 1323 -MD5 ee0356dc56ad13119227d036ad8f409a files/playmidi-2.5.patch 773 +MD5 c58938f77abb675da0af6d061bf5b2e4 playmidi-2.5.ebuild 1480 MD5 503417b957f61f0cfcfade05c51cc8c5 files/digest-playmidi-2.5 64 +MD5 ee0356dc56ad13119227d036ad8f409a files/playmidi-2.5.patch 773 diff --git a/media-sound/playmidi/playmidi-2.5.ebuild b/media-sound/playmidi/playmidi-2.5.ebuild index c75bd45638f4..52d5c857c7aa 100644 --- a/media-sound/playmidi/playmidi-2.5.ebuild +++ b/media-sound/playmidi/playmidi-2.5.ebuild @@ -1,13 +1,16 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5.ebuild,v 1.4 2004/04/08 09:01:00 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5.ebuild,v 1.5 2004/05/10 07:21:30 mr_bones_ Exp $ inherit eutils DESCRIPTION="Command Line and GUI based MIDI Player" HOMEPAGE="http://sourceforge.net/projects/playmidi/" -LICENSE="GPL-2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~amd64 ~ppc ~sparc" IUSE="svga X gtk" DEPEND="sys-libs/ncurses @@ -16,37 +19,47 @@ DEPEND="sys-libs/ncurses =x11-libs/gtk+-1* ) X? ( virtual/x11 )" -SLOT="0" -KEYWORDS="x86 ~amd64 ~ppc ~sparc" -S=${WORKDIR}/${P/2.5/2.4} -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -RESTRICT="nomirror" +S="${WORKDIR}/${P/2.5/2.4}" -CFLAGS="${CFLAGS} `/usr/bin/gtk-config --cflags`" +src_unpack() { + unpack ${A} + cd ${S} + epatch "${FILESDIR}/${P}.patch" +} src_compile() { - epatch ${FILESDIR}/${P}.patch - - echo "5" | ./Configure + local targets="playmidi" + local LIBGTK= - if [ `use gtk` ] ; then - CFLAGS="${CFLAGS} `/usr/bin/gtk-config --cflags`" + use svga && targets="$targets splaymidi" + use X && targets="$targets xplaymidi" + if use gtk ; then + targets="$targets gtkplaymidi" + CFLAGS="${CFLAGS} $(/usr/bin/gtk-config --cflags)" + LIBGTK="$(gtk-config --libs)" fi - make CFLAGS="${CFLAGS}" playmidi || die - use svga && make CFLAGS="${CFLAGS}" splaymidi || die - use X && make CFLAGS="${CFLAGS}" xplaymidi || die - use gtk && make CFLAGS="${CFLAGS}" LIBGTK="`gtk-config --libs`" gtkplaymidi || die + echo "5" | ./Configure + + emake -j1 CFLAGS="${CFLAGS}" depend clean + emake LIBGTK="${LIBGTK}" CFLAGS="${CFLAGS}" ${targets} \ + || die "emake failed" } src_install() { - dobin playmidi || die - use svga && dobin splaymidi || die - use X && dobin xplaymidi || die - use gtk && dobin gtkplaymidi || die + dobin playmidi || die "dobin failed" + if use svga ; then + dobin splaymidi || die "dobin failed (svga)" + fi + if use gtk ; then + dobin gtkplaymidi || die "dobin failed (gtk)" + fi + if use X ; then + dobin xplaymidi || die "dobin failed (X)" + fi - dodoc BUGS COPYING QuickStart README.1ST + dodoc BUGS QuickStart README.1ST docinto techref dodoc techref/* |