Fix force --as-needed bug 276286

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 76 insertions, 2 deletions

diff --git a/media-sound/nted/ChangeLog b/media-sound/nted/ChangeLog
index b4d5734d8c22..ed12b8be1ae7 100644
--- a/media-sound/nted/ChangeLog
+++ b/media-sound/nted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/nted
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.3 2009/07/02 14:22:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.4 2009/07/09 20:57:01 hwoarang Exp $
+
+*nted-1.6.0-r3 (09 Jul 2009)
+
+  09 Jul 2009; Markos Chandras <hwoarang@gentoo.org> +nted-1.6.0-r3.ebuild,
+  +files/makefile_am_ldflags.patch:
+  Fix force --as-needed bug 276286. Thanks to Diego E. 'Flameeyes' Pettenò 
+  <flameeyes@gentoo.org>
 
 *nted-1.6.0-r2 (02 Jul 2009)
 
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 14c4de17a52b..990b62bc9829 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -1,7 +1,9 @@
+AUX makefile_am_ldflags.patch 1167 RMD160 f59a1993d78e0a28faa46a63617cc38ab4b89c72 SHA1 b65f9e667d373a79ab188749c20a90e0a4c065ad SHA256 2c2eb565ba3bb755e785c1b6e02ce1ba45e6e41359ed1153a250e9da61c20b7d
 AUX nted-1.6.0-time-signature.patch 477 RMD160 3c752e17b8b7c923a2cb3be453dbb34b96ed81ff SHA1 352085b5b94e6b8c11e634ed552b42ea7d332132 SHA256 d81b2801bae216f5a4d818acaec406794935ee46accadfa981418e7ec1ee1b60
 AUX nted.desktop.patch 2509 RMD160 3298c930be44e9935e6046b308febba42d255392 SHA1 a8ec7aa190415d88b09898d72f03d3fe066e7f5b SHA256 2f68284f342298fcf190f503784368d30ffb76dda79f080c19d951ea05450a29
 DIST nted-1.6.0.tar.gz 3202514 RMD160 ba8068c23397fd088e724ae33754dd47863631b5 SHA1 9aef12049789b7786c30e171a55d32274bb859c2 SHA256 cca33b7411cd558fc15d9c2a283eefa2e7fffc6704564e70c53d43a7660dec33
 EBUILD nted-1.6.0-r1.ebuild 1022 RMD160 73f1e12081a3c18748abd0553fcdf2b713862347 SHA1 1bb5e2c9b322c889b396a68df1cebfc6d08d712a SHA256 0de3f407b6f350577798bf659a99cd08a1df103180eb3dcdeebf4f85952ea85b
 EBUILD nted-1.6.0-r2.ebuild 1070 RMD160 45f13b5dfd59055cf3abc2a545a4e31e8305333c SHA1 066b5a33ae0f27b805a32926f32626d4b0315ea2 SHA256 bbeb0225fdee78c4690f8eeb6db3f2ed59415d4ceac476c11714d5276bdf64f9
-MISC ChangeLog 1043 RMD160 183eb29219ee323d3c6f70eeb058efd4f6599ad3 SHA1 2a514c08632862a11ba26ce99ba721b28b0bcdb1 SHA256 8fbdc0f7efcd7c2b0d79139f6c9835feca40b6c7633642727bb31249b9911a06
+EBUILD nted-1.6.0-r3.ebuild 1141 RMD160 880fb5e21d5c12f0b636c5ba6eb78927a6002db5 SHA1 5835bd1d53cef2753aa18dc1bb7cfe51966bcee3 SHA256 455a9c160d0755704e2e7fea9be007d78a10eaccc6c17ac784150cbaf72a6d02
+MISC ChangeLog 1288 RMD160 dce6b4f986dae9133445b200806e296653bf587c SHA1 043e32f6786b2fc8e3ba620e74db4db7eee58a3f SHA256 61b191cb6baaa4d5a17049f33c561573b1af0f9be2df9b6444842871d931bdf3
 MISC metadata.xml 431 RMD160 795624e2d8daf85ab72f82cc5f0287145fdec223 SHA1 b5de7042160aec1fcb7568eb4e5e3a066b3e88ac SHA256 5430fc8c8b968f90971bf0834205ae70b5e0255b747183d7ee88d38631c3e251
diff --git a/media-sound/nted/files/makefile_am_ldflags.patch b/media-sound/nted/files/makefile_am_ldflags.patch
new file mode 100644
index 000000000000..8d83a28393dc
--- /dev/null
+++ b/media-sound/nted/files/makefile_am_ldflags.patch
@@ -0,0 +1,23 @@
+Index: nted-1.6.0/Makefile.am
+===================================================================
+--- nted-1.6.0.orig/Makefile.am
++++ nted-1.6.0/Makefile.am
+@@ -33,8 +33,6 @@ AM_CPPFLAGS += -DLOCALEDIR=\"${localedir
+ AM_CPPFLAGS += -I$(top_srcdir)/dialogs -I$(top_srcdir)/commands -I$(top_srcdir)/chords -I$(top_srcdir)/idiotseditor
+ AM_CPPFLAGS += $(FT2_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+ 
+-AM_LDFLAGS = $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) -lasound
+-
+ bin_PROGRAMS = nted
+ nted_SOURCES = mainwindow.cpp resource.cpp page.cpp system.cpp staff.cpp \
+ 	voice.cpp chordorrest.cpp note.cpp musicxmlimport.cpp \
+@@ -53,7 +51,8 @@ nted_SOURCES += acceleration.h beam.h be
+ 	temposign.h tuplet.h voice.h volumesign.h positionarray.h dynarray.h COPYING.GFDL COPYING.FONT.TXT \
+ 	freechord.h freespacer.h pangocairotext.h freechordname.h midiimporter2.h
+ 
+-nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a
++nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) -lasound
++
+ 
+ cleanup: maintainer-clean cleanup-local
+ 
diff --git a/media-sound/nted/nted-1.6.0-r3.ebuild b/media-sound/nted/nted-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..81dc61140041
--- /dev/null
+++ b/media-sound/nted/nted-1.6.0-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.6.0-r3.ebuild,v 1.1 2009/07/09 20:57:01 hwoarang Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="WYSIWYG score editor for GTK+2"
+HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml"
+SRC_URI="http://vsr.informatik.tu-chemnitz.de/staff/jan/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nls debug"
+RDEPEND="doc? ( gnome-extra/yelp app-text/xmlto )
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	media-libs/alsa-lib"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}.desktop.patch"
+	epatch "${FILESDIR}/${P}-time-signature.patch"
+	epatch "${FILESDIR}/makefile_am_ldflags.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with doc) \
+	$(use_enable debug) \
+	$(use_enable nls) || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ABOUT_* ChangeLog FAQ NEWS README || die "dodoc failed"
+	doman "man/${PN}.1" || die "doman failed"
+}