Fix building against latest freetype, bug #514522

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 34 insertions, 70 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/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() {