Fix building against latest freetype, bug #514522

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 41 insertions, 81 deletions

diff --git a/media-sound/nted/ChangeLog b/media-sound/nted/ChangeLog
index 79a1079161f6..05333b7e2c15 100644
--- a/media-sound/nted/ChangeLog
+++ b/media-sound/nted/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2013/03/15 10:12:43 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/ChangeLog,v 1.40 2014/06/24 13:16:53 pacho Exp $
+
+  24 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/nted-1.10.18-freetype.patch, -nted-1.10.18-r2.ebuild,
+  nted-1.10.18-r3.ebuild:
+  Fix building against latest freetype, bug #514522
 
   15 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Dropping package to maintainer-needed, wrt bug #459466
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
index 27e8d90040df..488598797f8d 100644
--- a/media-sound/nted/Manifest
+++ b/media-sound/nted/Manifest
@@ -2,23 +2,19 @@
 Hash: SHA256
 
 AUX nted-1.10.18-automake-1.12.patch 360 SHA256 096dd97f53fcb99ab104574d03ea5eb8092cf5d3d3a013e2fa0cada11f4ca0d3 SHA512 2651b2e6330b6adb7c0877ed14ed351a7c96439da7f6bb283d1de30a119242fba7bb690586d83d99363084e8f3cc285e3a78ae45b6743e81682af1afeca43201 WHIRLPOOL e34b2604045dfed84e3e6e100ff5b281b9b0ff0f669542928b1d2ed71d57fdc6a3b6afc6ff64191a5f05997e718a311d29f9bf625037dc2a5bb221a984c59d65
+AUX nted-1.10.18-freetype.patch 577 SHA256 334ec8c31398b864fb4d1423a89a778a056731688c1cd11d0dcac4379efd18b5 SHA512 d84072b35093395973c8d85e2e34a2f152aa1fa94cbd8c8704f9e6ac8c6eb786b58b03998379ad339404d7f4f954d98728b8d0ea3a0ed7e367106d60ad92b785 WHIRLPOOL 8168bb73a52a6de95bb89cbdfa3a33c0c347127910500294b6863af09d94e692041f2c677c0c66b1ad21b81bef7c44571266dbf9568d906fd834b24cadd0d1a9
 AUX nted-1.10.18-gcc47.patch 380 SHA256 bd805943c7c01676e92fa469e0541db1525f8dfeb4de3ebcca75438ffd06a2a1 SHA512 d3e390cfc387b12d2cded614b8f40001f9c03002f7da03e1c61a5c490df4a4327263393ced492e204416e006c37278429db2a825d5498b65fd2ad450df256ce0 WHIRLPOOL 76ad3e2f1f1562e1e4720ffa951c368ce9b2ab1635fd1906faa927a02df9850f18c418895d15cb6ca36cbd9449f3f907dbf29500aaf94d359210aeaf6bbcd46f
 AUX nted-1.10.18-lilypond-tremolo.patch 1487 SHA256 b50d328b1924afa17ab7e9ccbd193dfd1bb4ed600d16a9fc73b3bcee23cced5f SHA512 f30cc982ce656d45579cf8af276d71f053de4e8cf403aa21d8edbf990b6a1aa90651d3e887451a2d90f5c91a09532aacc5c5aba15c3ff6d1d25792dd4ced8cf1 WHIRLPOOL 0b6a206099925302e6aa62923024b1e1022c27f7a2cc26ef08aeffba9265f1c4af588aad8cc6ce4e095dbf58501662fc4aa4f209fd8e1238ba4e7cd84b4d663a
 AUX nted-1.10.18-lilypond.patch 2317 SHA256 09bfeb1a8f8c1c4617612251b1a0e8c5ff25a7c57fcad938206faba94d49b9ba SHA512 c6414281c4eee507ab1d3a5499f6b21a0f84bbc94a6c187ec31dae899342e7a3b3b50d7b667eff6f65777682e362c8f9a7885473733f93bd805f66b1f78ead66 WHIRLPOOL e81df81d20ff57ec275f2fa35f7f1d16183ee6acbea275c8df35ef28969bb75d5022b0b4cccb5e7bf70d5c189b21ba45bcdfb45210abdf275782e87ee2a03289
 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-r3.ebuild 1880 SHA256 ff1522b4ef38013a9e5ce3b9e073e94f5e0494d062a988d57cb7367bf9c05230 SHA512 e79c8eaa392eb5407df7e5f68c921abdfd8d1a5014aecee515a293c66220ebb21354dc411bd2442af2cf6e1c37c5c55ad308c679091913310c807867597ea48f WHIRLPOOL 4ad54d8e5422d2e0f7d8bac17ec370f2e6cd1eb17f72dff1aae56a7a4fed285a9139a6e5771eecb9a4f9038a25ffa11d320d849ae8303d9468566aeedf1a25d9
-MISC ChangeLog 7259 SHA256 0b5af48bacb27607a6adf5e22ca4cf7b5dd377b389596897a5f10cff7e9d4968 SHA512 ead0d543d11864f3206fa4b03b4c087be2b9fdadc85c804420fba42f1f640f2f89ed15b97006bc6c58424f6c2271091c1f8f9bb400a80a560c45938a714c177b WHIRLPOOL 62ec3f0f018b1bdd19eed4138928b40d8e02fcedd28c4f5dc7b3637a12e4a47b65d48b046e8c7e3b8d90eef556e7dbe81483badccda308d8599562f4507f223b
+EBUILD nted-1.10.18-r3.ebuild 1933 SHA256 c53f351ee2f03e133ebd92992756887a1225a8b7f10aff28bb5a4a48f394e39d SHA512 e3868a96f0073856ff4b04679c7ff71d5513b233921069c29c88fc52ba35cf318f1d9483b1cd9127e7c8e1382e76721895a21727daa9c379458fc087a0e9d6cc WHIRLPOOL 277847c45893eb493c36b41eb24f0e1011cd436435390d1bb310d9cc411cdb552ed36068f3f701332c16a0cee46e944893bbc1a92738ab9239b9bb8175e5b4ee
+MISC ChangeLog 7444 SHA256 101adbfded3b76896f121be78b21cfe88d6efa330f461cc0d0845e325c53a35f SHA512 0bf35ba810fa955a48d77b7cc80e523e9b3c6e18365f4bbc5706c3453058ce8173245fc2971be6181b4486d3fb02666e0982724c50b585a11e24701f1b112f33 WHIRLPOOL 896c149d702a7ea419a499fe32d3182154e8f73a385d8252d18ecaaa62158bfb4f7e217b857421be2cdafa98dd3d8cf29fcf227fd2bbe3b1d0e9ab0e2b4f0bf0
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQvQcAAoJECo/aRed9267iwsH/3e2DQNqas0ehB7sueAn63wK
-9AAkyTix1/du4HUGwVK97S1jkEUhQBiOK1BCGICmdnt9rpithfnqe6Vr7FxQ1nGA
-zpL0atPa1o/cq8PrascVfytBfWRjySIhJCW1i+SCnPUnOkWWFodAQuXTVTNwIWYT
-upZTfn5xIKiXnK01fsBkrnLU9EqtHLi0EWfIX9DdqsdGo9Jvq9FMfDKj0iXqJU/d
-3lHnoQPiA+uWl+06561r8h0k9L5X2vckV/7UxiHdrgrIZV52DLYPM5Dgg5YHN9qk
-wNFOy5scILZwSXBGtDjPTp58QpFTCcNLKCHRrKB8Aeblt2DW7E8upCeJRaCcqiA=
-=vExP
+iEYEAREIAAYFAlOpekYACgkQCaWpQKGI+9Q/CQCfcrssaNIfWvjHvMrrLv7cOe/k
+vMYAn3EfQVAufZFM4Io4jF/GJC4oJ+iF
+=Y608
 -----END PGP SIGNATURE-----
diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
new file mode 100644
index 000000000000..66acdf2c7ffa
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS caused by freetype headers path change.
+Author: Gilles Filippini <pini@debian.org>
+Bug-Debian: http://bugs.debian.org/733403
+Index: nted/mainwindow.cpp
+===================================================================
+--- nted.orig/mainwindow.cpp	2013-12-30 17:45:21.000000000 +0100
++++ nted/mainwindow.cpp	2013-12-30 17:45:44.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include <freetype.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo-ps.h>
diff --git a/media-sound/nted/nted-1.10.18-r2.ebuild b/media-sound/nted/nted-1.10.18-r2.ebuild
deleted file mode 100644
index 882fb4910c46..000000000000
--- a/media-sound/nted/nted-1.10.18-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-r2.ebuild,v 1.5 2013/02/18 13:23:30 pinkbyte Exp $
-
-EAPI=5
-
-inherit autotools 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 )
-
-src_prepare() {
-	# bug #424291
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	# bug #437540
-	epatch "${FILESDIR}"/${P}-lilypond.patch
-	epatch "${FILESDIR}"/${P}-lilypond-tremolo.patch
-	# 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'
-	eautoreconf
-}
-
-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)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
index ad1cd26bcde5..daddba9ddfb0 100644
--- a/media-sound/nted/nted-1.10.18-r3.ebuild
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2 2013/03/15 10:10:16 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r3.ebuild,v 1.3 2014/06/24 13:16:53 pacho Exp $
 
 EAPI=5
-
 AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=1
+
 inherit autotools-utils eutils toolchain-funcs
 
 DESCRIPTION="WYSIWYG score editor for GTK+"
@@ -17,25 +17,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug nls"
 
-RDEPEND=">=dev-libs/glib-2
+RDEPEND="
+	>=dev-libs/glib-2: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"
+	x11-libs/pango
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/xmlto )
-	nls? ( sys-devel/gettext )"
+	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
 	"${FILESDIR}/${P}-automake-1.12.patch" # bug #459466
+	"${FILESDIR}/${P}-freetype.patch" # bug #514522
 )
 
 src_prepare() {