diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-14 10:41:07 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-14 10:41:07 +0000 |
| commit | c18ca0adc2598b573a7357bc87597c10b5236a56 (patch) | |
| tree | 522396d892e1ba97970b5b8b2904bb1a0ed84cc0 /media-sound/gmorgan | |
| parent | Remove old. (diff) | |
| download | gentoo-2-c18ca0adc2598b573a7357bc87597c10b5236a56.tar.gz gentoo-2-c18ca0adc2598b573a7357bc87597c10b5236a56.tar.bz2 gentoo-2-c18ca0adc2598b573a7357bc87597c10b5236a56.zip | |
Remove bundled gettext m4, depend on it unconditionally and eautoreconf it, fixes bug #205654
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64)
Diffstat (limited to 'media-sound/gmorgan')
| -rw-r--r-- | media-sound/gmorgan/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gmorgan/gmorgan-0.25-r1.ebuild | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/media-sound/gmorgan/ChangeLog b/media-sound/gmorgan/ChangeLog index c8be438d095b..6693bc5f6dbe 100644 --- a/media-sound/gmorgan/ChangeLog +++ b/media-sound/gmorgan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gmorgan # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.22 2008/11/14 10:23:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.23 2008/11/14 10:41:07 aballier Exp $ + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> gmorgan-0.25-r1.ebuild: + Remove bundled gettext m4, depend on it unconditionally and eautoreconf + it, fixes bug #205654 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> gmorgan-0.22-r1.ebuild, gmorgan-0.23.ebuild, gmorgan-0.25.ebuild, gmorgan-0.25-r1.ebuild: diff --git a/media-sound/gmorgan/gmorgan-0.25-r1.ebuild b/media-sound/gmorgan/gmorgan-0.25-r1.ebuild index 081639015407..18dff88bd49d 100644 --- a/media-sound/gmorgan/gmorgan-0.25-r1.ebuild +++ b/media-sound/gmorgan/gmorgan-0.25-r1.ebuild @@ -1,12 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.25-r1.ebuild,v 1.3 2008/11/14 10:23:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.25-r1.ebuild,v 1.4 2008/11/14 10:41:07 aballier Exp $ EAPI=2 -inherit eutils - -IUSE="nls" +inherit eutils autotools DESCRIPTION="gmorgan is an opensource software rhythm station." HOMEPAGE="http://gmorgan.sourceforge.net/" @@ -15,22 +13,23 @@ SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" +IUSE="" RDEPEND=">=x11-libs/fltk-1.1.2:1.1 >=media-libs/alsa-lib-0.9.0[midi]" DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.11.5-r1 )" + >=sys-devel/gettext-0.11.5-r1" src_unpack() { unpack ${A} - cd "${S}/po" - sed -i "/mkinstalldirs =/s%.*%mkinstalldirs = ../mkinstalldirs%" Makefile.in.in cd "${S}" epatch "${FILESDIR}/${PN}-amd64.patch" + rm -f m4/gettext.m4 m4/inttypes_h.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/nls.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/po.m4 || die "failed to remove gettext m4" + eautoreconf } src_install() { - make prefix="${D}/usr" localedir="${D}/usr/share/locale" install || die + emake DESTDIR="${D}" install || die dodoc AUTHORS NEWS README } |