3 files changed, 42 insertions, 32 deletions
diff --git a/media-sound/nted/ChangeLog b/media-sound/nted/ChangeLog
index 2f1014e32ecf..13506d0fbc94 100644
--- a/media-sound/nted/ChangeLog
+++ b/media-sound/nted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/nted
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.26 2012/05/21 06:16:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.27 2012/05/21 06:33:24 ssuominen Exp $
+
+  21 May 2012; Samuli Suominen <ssuominen@gentoo.org> nted-1.10.18.ebuild:
+  Remove || ( ) from LICENSE field because they are all required. Missing glib,
+  freetype, gdk-pixbuf, libX11, pango and gettext dependencies. Punt
+  unnecessary doman from src_install() and whole function as a result. Missing
+  debug in IUSE. Trick ./configure to believe gnome-extra/yelp is installed so
+  we can avoid pulling in vulnerable copy of net-libs/xulrunner wrt #416843.
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org> -nted-1.10.7-r1.ebuild:
   old
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 78c2c9842acf..a0c201922536 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST nted-1.10.18.tar.gz 4099835 RMD160 22149c40ce305e607a88f8bedb48f2ecc11417ee SHA1 877e9ec58454b511ee420d91176c2e46e8f501e0 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac
-EBUILD nted-1.10.18.ebuild 920 RMD160 50085aa0c8b548b59a21c839d39a5bfd3cb53f8c SHA1 46145c3b35732a0261959c653555b8dd19b028f7 SHA256 f708f70bde7d178e181be37838cea268df5fbe9c01bea5febcc26f8c9da258ae
-MISC ChangeLog 4522 RMD160 179eed17e4a499fe9b8b5618aa07380cc664897b SHA1 ed796fa713c19d32dbb95402b679f73f2ee5be72 SHA256 6989d86e9bfdf64facfc6b235d866e92b238d6df915666045bd61b7d3256d424
+EBUILD nted-1.10.18.ebuild 1096 RMD160 27aef91532cdb1f631bcdb1bbbcee316143c90b5 SHA1 dd8acbe5d314e8d972c482642422c18be96fb4a6 SHA256 6f6c06c6c215798e76065a405a8e1991b34373f9e62c0db3751f4ff797b8c58a
+MISC ChangeLog 4982 RMD160 2a50c13a0af5fd7e15de17d2a5f9b39e05e649ff SHA1 e599144d6cc4b6095c89860ffcb82b90265f344c SHA256 8ec2fd80e2fdf9485b611db4f3dbc610c35b2127cfd5d6362d48a671ec3c0a63
 MISC metadata.xml 431 RMD160 795624e2d8daf85ab72f82cc5f0287145fdec223 SHA1 b5de7042160aec1fcb7568eb4e5e3a066b3e88ac SHA256 5430fc8c8b968f90971bf0834205ae70b5e0255b747183d7ee88d38631c3e251
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPudz9AAoJEEdUh39IaPFNRa8IAIps+rvXGOKg5Mgihk1R8xl3
-NxCT5M6z+S554PGwYrPGsFrhgAttQqbi6ux+L/LJywV+7wBqEhCJpibdVxYj/Y4M
-PoR239FviCp6BIiYNEupttZN5y4w0RXleZdmku5bn0NnlhORBZ1ORIdNN2RNivmA
-YU9W760iAsJ11s0P+QNq5rHGmCtflXn4ke3Je0TgLOwQxjDYfr78IJOjaY3sN9Ys
-A/dBBxVAtfWMyYlQvbiSJtChI4mkfreBztdKiujZDFP34XCHMDrTZDkmsxyFAs8Z
-RnKETz4+PnbQHp9xZf7digN7ypOJI4gKmNtLUBAD0ue3/zgwY+0w3UYkNsUxY0M=
-=01Ya
+iQEcBAEBAgAGBQJPueEBAAoJEEdUh39IaPFNmf8H/R7vnkCO/iRJGexsPtNGZQ4Q
+XGm2aHtRCuVlH8FYX+tiu3M4giuQJwf+NcA8nsGQ7bR5mP0KjpRtHdbLHlI+ujZR
+M2RUM3B49Hrso4rQZyNhpfITy26L0fcIdPG2uVPIov0/61voxI89kzCj8GTEVANU
+5mGw/oEUjxfzYLTkelU7Ty6WmnlGW8nC1e8AmvFe5gBWpW07kiOOBKhqCxGxdGgW
+OvY5Eq49wbcJgbsGdGqCeQ0HPdG73ml+WXFTxMSWPRrOCVregCvoRzysUtnnwL+n
+l/mzh5yoIInzD3+hIFrHHzQKOnLBcQD8g2NG2/miWwXIl/BNvWtEcDENOPLoWeo=
+=ehMS
 -----END PGP SIGNATURE-----
diff --git a/media-sound/nted/nted-1.10.18.ebuild b/media-sound/nted/nted-1.10.18.ebuild
index 4f4cd0e8d51e..c49af193c6cd 100644
--- a/media-sound/nted/nted-1.10.18.ebuild
+++ b/media-sound/nted/nted-1.10.18.ebuild
@@ -1,37 +1,40 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18.ebuild,v 1.5 2012/05/05 08:45:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18.ebuild,v 1.6 2012/05/21 06:33:24 ssuominen Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit eutils
-
-DESCRIPTION="WYSIWYG score editor for GTK+2"
+DESCRIPTION="WYSIWYG score editor for GTK+"
 HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml"
 SRC_URI="http://vsr.informatik.tu-chemnitz.de/staff/jan/${PN}/sources/${P}.tar.gz"
 
-LICENSE="|| ( GPL-2 FDL-1.2 NTED_FONT )"
+LICENSE="GPL-2 FDL-1.2 NTED_FONT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc nls"
-RDEPEND="doc? ( gnome-extra/yelp app-text/xmlto )
+IUSE="doc debug nls"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	>=media-libs/freetype-2
 	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2
 	x11-libs/gtk+:2
-	media-libs/alsa-lib"
-
+	x11-libs/libX11
+	x11-libs/pango"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	nls? ( sys-devel/gettext )"
 
-src_configure() {
-	econf $(use_with doc) \
-	$(use_enable debug) \
-	$(use_enable nls) \
-	--docdir=/usr/share/doc/${PF}
+DOCS="ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README"
 
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ABOUT_THE_EXAMPLES.TXT FAQ README
-	doman "man/${PN}.1"
+src_configure() {
+	# Trick ./configure to believe we have gnome-extra/yelp installed.
+	has_version gnome-extra/yelp || export ac_cv_path_YELP="$(type -P true)"
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_with doc)
 }