Remove bundled gettext m4, depend on it unconditionally and eautoreconf it, fixes bug #205654

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.5 x86_64

3 files changed, 17 insertions, 14 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/Manifest b/media-sound/gmorgan/Manifest
index 0a3d5d96647f..572c2449c676 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -7,14 +7,14 @@ DIST gmorgan-0.23.tar.gz 893951 RMD160 6d958d18ef0b6c21a7b1f0911271cf63ed85e3c5
 DIST gmorgan-0.25.tar.gz 910142 RMD160 b25e474a1e49dd300846a18ea50f1cab75ba5fe5 SHA1 673123c09bf64625606c3c75122f491bee3765ae SHA256 3328339da0c2429101c38fbade36646c04463df5769cfe0e51e266239a57f7dc
 EBUILD gmorgan-0.22-r1.ebuild 878 RMD160 9ee4e71d44938c5ae870f0142a68529f7387ef77 SHA1 de65409e01b49dbded76c38039a9c26d6f14a7c8 SHA256 f5e7a24bab2a4356b68e65ccad092c2687ed344ce991bdfc2523415e4c7a7489
 EBUILD gmorgan-0.23.ebuild 1002 RMD160 2a4c39fc9c2c2938e8017775b08bc3cb0a4e0461 SHA1 fe04f1cfcc94a03e02d8dd46069af247ef46a84d SHA256 7c0867d7462252f1bb6882d72eda34e61c757ac0d4313a0ba8e0c511c94cbcae
-EBUILD gmorgan-0.25-r1.ebuild 906 RMD160 7b680cc565f854439639bec55d52aba9eefb3515 SHA1 21bf0a351a3ede80925218677b6ebbb2ddfe42a0 SHA256 f14246034cec5f9acbfe9a8b3e3b7164a5ac00f6908b2ac9b173e402fd6e8891
+EBUILD gmorgan-0.25-r1.ebuild 970 RMD160 04787a256ab37d61d7cac2e1cb37036188542941 SHA1 eefacf250a023cae107dbf869e9620f0834e0425 SHA256 8d834ff8d4a14311a2a8ed1c919221fbff48791f14f77a148449ceba5b5be3f8
 EBUILD gmorgan-0.25.ebuild 1191 RMD160 05abba31e663a017646ff8e897f5a5a82a328f4a SHA1 5d40ec9df620dd9b32adf2700a1e177163a73437 SHA256 51ece5e63b24aa7258f7397876b95a8733daf4097429bb79ffe136dc36add9de
-MISC ChangeLog 3116 RMD160 46ba3f6b19157571139b47b2b45e7827341ce2c2 SHA1 246c1cc2a1ce9537811275bb180d4acac85ab791 SHA256 b3759b0de100aef159f6da73fa45ffe341ad773e809c1db4cd8cd09fb69d8bd7
+MISC ChangeLog 3291 RMD160 b296e5a32fdcdea6b3d7ad67f8aaa1742e60f715 SHA1 0be7e0c96015eef5bb4084c9d2b3fd575c669a1a SHA256 9e643899ada5fb0332857eba2845a1370dbccd142833954f370aa2e96633fd67
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkdUbAACgkQvFcC4BYPU0pFtwCggr4Eku6Rv57JBhX/sDuK+Wbd
-rSMAoJjPlRHlQq4txtgGaBrB545eZxdr
-=N+79
+iEYEARECAAYFAkkdVckACgkQvFcC4BYPU0q95gCfep+t90Q9Rufvp+KUKFiW3XfX
+aA8AoKcqE66LLwoH3fosoW3Y7+65ZOKa
+=NsVs
 -----END PGP SIGNATURE-----
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
 }