Port to autotools-utils eclass, revbump for last changes, drop old revision

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 82 insertions, 57 deletions

diff --git a/media-sound/nted/ChangeLog b/media-sound/nted/ChangeLog
index 233f9874167d..7285ee0a6954 100644
--- a/media-sound/nted/ChangeLog
+++ b/media-sound/nted/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/nted
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.36 2013/02/18 13:23:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.37 2013/02/18 13:41:33 pinkbyte Exp $
+
+*nted-1.10.18-r3 (18 Feb 2013)
+
+  18 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> -nted-1.10.18.ebuild,
+  +nted-1.10.18-r3.ebuild:
+  Port to autotools-utils eclass, revbump for last changes, drop old revision
 
   18 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> nted-1.10.18-r2.ebuild:
   Fix desktop file, wrt bug #458080. Thanks to Agostino Sarubbo for discovering
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 5292a219f3e6..3bc373f661b5 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -7,17 +7,17 @@ AUX nted-1.10.18-lilypond.patch 2317 SHA256 09bfeb1a8f8c1c4617612251b1a0e8c5ff25
 DIST nted-1.10.18.tar.gz 4099835 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 WHIRLPOOL b450a8082fd95aa2e2cc40122197c528b3500e082d09ee6c9860d0b7290aa8d723ee07c019d4d034afd2e33e648bbc0c29672f1c9a98d88a9788377a8a2a7ff0
 EBUILD nted-1.10.18-r1.ebuild 1303 SHA256 6f0ff8ee464539bfb59cda4b5b6c0ed7e6e8f4041369641fcb3200ac305f675f SHA512 90c50962a9ff8b0bd1f15688d8555d26ece773a4de4c9c01a6cb77ef639269a5cc6e328f365106068d24e921be85564bde5ab1d6b9ac7ae2609f72d4e9d75ce2 WHIRLPOOL d19c8ddb327cf376364dd187e18960799b4a38abbc910f9be51bb8e4c065e33b4cd691e43ee9c2f76f7d56b5b2edbeb0805a77db1f40c4e39a7b813ee4ccd64b
 EBUILD nted-1.10.18-r2.ebuild 1688 SHA256 c5276dec3c6b0185c8bafdea09a60f2f258b278b9afc9b65f740007650f4a3aa SHA512 cf6f96499321a1d34db6a2172ca86b05b1c8de1fb8f0b60299bccaead80d585eb0871af1dd096aa4eb466b3bb0024a1a8961e046894b00ff1d6f27eb3eed1605 WHIRLPOOL 4ae638d7b97efe863a0f760e3a028f3698f233cdf0f5e8ac4f51470a9b66d159defe85b42fda04c6b374e70df980fb0c8b5e4d50e8b9f6e73c4b78afcc0f6e35
-EBUILD nted-1.10.18.ebuild 1184 SHA256 8f36625f8135a3bba7d2c3219cf96f560e858741652a0e79bf925b02d49394ed SHA512 ac94a09c138d981c47b5956f48debad04d239a7b3c3d942e279a610f9ab625c0c53d91da38a66bbae0c54906fb7f9eb6391f7dab4f15eecef85a004eec9f6e7b WHIRLPOOL 52085a9da945066ab451c1f5ce86fe875e9aece0ff1ff2620eab6194889cb53a84ec0a4b36ed9c355315be287a8b8d029d4572eb8efd940b0133291cda4d2f64
-MISC ChangeLog 6636 SHA256 d5c852415c6caf5675d6e922192fd279c50e5021496e26aa1a9e214d6340d8a3 SHA512 c29423f1139ab86a1dae6e79665d2a340db6dd98ff934bd2844aebf137411a52c9f3b7006e9e6fc110b3a4bb71d9460af30bac77de88be0604d345345a09a8f4 WHIRLPOOL a7b0631cc564704698697aee338ab15a8297d73301edc746f94ae36035a9af1a4a5cdc3cb0c1f0bad60b49d13a5f5c5fab2031c5c65945ef9f0153500df8b580
+EBUILD nted-1.10.18-r3.ebuild 1798 SHA256 2c350ba107491d47cbcd2438bd8f4d255c1aed4f8ce9c0590774027062f21b73 SHA512 0d6c127b7b2117447117a5c475170df3428eeae134a0c50cdc9a4263fd8fdf54dc01e70e2a180fd29e21a6ee8e43197055bc8e1cc3acf0ef9c8f1417fb083aa7 WHIRLPOOL 785580e83559412e990afe8a906d0ef1a3df0a187a0f7b47d63c0e48b1bade931b27e95b894653325557b49c1934aa129b3522099a6e9ddecbe6a232129acd07
+MISC ChangeLog 6846 SHA256 5a0a79d66b1c43ba4a2bd21583ef18b98f9c9dac6a76f07c857ead306caba2d6 SHA512 4a8bb58421d3d881bd08bc92922225bfe14f22b6d1b242a7c955483371d2b44ba97da6dd48f0e5f6e409f9b8a2a1589a5b3a7e811ae726744b15ef65b9cb4887 WHIRLPOOL abc2eafded77efd3a810472fa01e43ebddb6391e11e69e64a7240b810ce2effd327b7db621010f049457d84042cb21b14a465daff9585755a2892ce283d011d5
 MISC metadata.xml 359 SHA256 94211173f2953d7ee51ca7b8e41bc315425f28318f3477e6a21538908d2e07b0 SHA512 57b12d3b01bb472f4c8cdfc81ab0ba119a9cba175d5ba5e418f6dc4de93160aa67e0d5a257efc5443bf3d5fb7acdc47da2c6b6a5dfaed71138df220633ecc9af WHIRLPOOL 4193192d7aa64a12ac41e635082d4de7357154c32fee622f4a47d4215da240d3947768d3669e9a38dfc0b940512891fce8d68af9e4084dfac28188bdffc56f64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRIitUAAoJECo/aRed92676HwIAMipi6ViCco0vt3c4FeuQ4fE
-V6pxFSXt8Nq2XQU8f/eQicsZtB5D/xcAWIBbrr5MS8EAWo/MNZlRlgwvRKEWiGgG
-lVNHbe2jLOJ4jMd+0IKRcHeOJFiBAsvVWWYXTHCzHe5qN251deTqEJwCn9B0IhSE
-1WkNKgXIKvwt+UqVp8fIiKC+8VLnO7uwmCbkRurwViKPbuPKOFebFi0gx4eRriuN
-9hrVjb6I2BR0v+KCNVTcEA6EQ9mDreVUCAMPTnBoizZpMMUYbEc2HSpQlAgHgVx1
-BfeBUYZce3OEmZVNyog7rNpUl/GMMnpu9VQ0kCpFm+k7J+7yk4ekEsPLYmHM+/Q=
-=aaAX
+iQEcBAEBCAAGBQJRIi+OAAoJECo/aRed9267N7YH+wUnXaVaLuSo+aV4xoq9tWNp
+mx2CJa9z5b0lIfsUlVL5/eWsui5tVW0t4CUcPu/b33q3vjtUC9RI6s1XgSl3rCsc
+eZmqKKIKHd/i5Zf+SnPtculw6Kj8nPYp/mCE96CcqD/K7Oqy6pWXgkkuzTIlFDKw
+x04E25apYh1FPd8KvnUUjXJIIOQyrFoA+N1QosfLwHwwLj7oqRE1KqH1+a7WdcCQ
+86RWXbqlcDs9Tc+76D+KnQVtEHIkrDHR3yC59D1M9DI16MY7JSeIJTk8VnIXFZFt
+LsHRHy6jMAWHTweh/fNFZdUBiBCS/qTw0GvNDOefzVPgnr/ylaO/7nLIGAyvbEs=
+=iwlb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
new file mode 100644
index 000000000000..cbdd6cd8bdea
--- /dev/null
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/02/18 13:41:33 pinkbyte Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils eutils toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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
+	x11-libs/libX11
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	nls? ( sys-devel/gettext )"
+
+DOCS=( ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch" # bug #424291
+	"${FILESDIR}/${P}-lilypond.patch" # bug #437540
+	"${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540
+)
+
+src_prepare() {
+	# fix desktop file, wrt bug #458080
+	sed -i \
+		-e 's/nted.png/nted/' \
+		-e '/^Categories/s/Application;//' \
+		datafiles/applications/nted.desktop || die 'sed on desktop file failed'
+	# drop -g from CXXFLAGS, wrt bug #458086
+	sed -i -e '/CXXFLAGS/s/ -g//' configure.in || die 'sed on configure.in failed'
+
+	autotools-utils_src_prepare
+}
+
+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)"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_with doc)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	# respect AR, wrt bug #458084
+	autotools-utils_src_compile AR="$(tc-getAR)"
+}
diff --git a/media-sound/nted/nted-1.10.18.ebuild b/media-sound/nted/nted-1.10.18.ebuild
deleted file mode 100644
index 9cccbcc9993a..000000000000
--- a/media-sound/nted/nted-1.10.18.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.7 2012/07/12 19:08:53 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils
-
-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"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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
-	x11-libs/libX11
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	nls? ( sys-devel/gettext )"
-
-DOCS="ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README"
-
-src_prepare() {
-	# bug #424291
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-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)
-}