EAPI 5 - Fix build with freetype2

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0145142D)

3 files changed, 68 insertions, 15 deletions

diff --git a/games-engines/love/ChangeLog b/games-engines/love/ChangeLog
index 0e5a66a8062f..2dabb6dec663 100644
--- a/games-engines/love/ChangeLog
+++ b/games-engines/love/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for games-engines/love
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/ChangeLog,v 1.17 2014/07/06 13:20:24 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/ChangeLog,v 1.18 2015/01/07 09:21:41 tupone Exp $
 
-  06 Jul 2014; Michał Górny <mgorny@gentoo.org> love-0.7.2-r1.ebuild,
+  07 Jan 2015; Tupone Alfredo <tupone@gentoo.org> love-0.8.0.ebuild,
+  +files/love-0.8.0-freetype2.patch:
+  Fix build with freetype2 - EAPI 5
+
+  06 Jul 2014; Michał Górny <mgorny@gentoo.org> love-0.7.2-r1.ebuild,
   love-0.8.0.ebuild, love-9999.ebuild:
   Replace obsolete mirror://bitbucket with the real URI.
 
@@ -15,11 +19,11 @@
   04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> love-0.7.2-r1.ebuild:
   Stable for amd64, wrt bug #475630
 
-  21 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  21 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   love-9999.ebuild:
   Copy autotools files to build directory before eautoreconf, bug #462588.
 
-  21 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  21 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   love-0.7.2-r1.ebuild, love-0.8.0.ebuild:
   Add dependency on deprecated lua features, bug #462586.
 
@@ -42,7 +46,7 @@
 
 *love-0.7.2-r1 (21 May 2012)
 
-  21 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  21 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +love-0.7.2-r1.ebuild, -love-0.7.2.ebuild, love-0.8.0.ebuild,
   love-9999.ebuild:
   Allow slotting as suggested by Tobias Leupold in bug #416703. Implementation
@@ -50,26 +54,26 @@
 
 *love-0.8.0 (20 Apr 2012)
 
-  20 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  20 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +love-0.8.0.ebuild, love-9999.ebuild:
   Version bump, bug #412717.
 
-  17 Apr 2012; Michał Górny <mgorny@gentoo.org> love-0.7.2.ebuild,
+  17 Apr 2012; Michał Górny <mgorny@gentoo.org> love-0.7.2.ebuild,
   love-9999.ebuild:
   Use mirror://bitbucket.
 
-  08 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  08 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   love-0.7.2.ebuild, love-9999.ebuild:
   Set correct dependencies, bug #407101.
 
 *love-9999 (05 Mar 2012)
 
-  05 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  05 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +love-9999.ebuild:
   Add live ebuild, bug #406861.
 
 *love-0.7.2 (05 Nov 2011)
 
-  05 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  05 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +love-0.7.2.ebuild:
   Initial commit, taken from the gamerlay overlay.
diff --git a/games-engines/love/files/love-0.8.0-freetype2.patch b/games-engines/love/files/love-0.8.0-freetype2.patch
new file mode 100644
index 000000000000..64e42c5f2840
--- /dev/null
+++ b/games-engines/love/files/love-0.8.0-freetype2.patch
@@ -0,0 +1,48 @@
+--- src/modules/font/freetype/TrueTypeRasterizer.h.old	2015-01-07 09:49:39.394000727 +0100
++++ src/modules/font/freetype/TrueTypeRasterizer.h	2015-01-07 09:50:28.846065847 +0100
+@@ -27,10 +27,10 @@
+ 
+ // TrueType2
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include <freetype.h>
++#include <ftglyph.h>
++#include <ftoutln.h>
++#include <fttrigon.h>
+ 
+ namespace love
+ {
+@@ -67,4 +67,4 @@
+ } // font
+ } // love
+ 
+-#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
+\ No newline at end of file
++#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
+--- src/modules/font/freetype/Font.h.old	2015-01-07 09:49:20.421359400 +0100
++++ src/modules/font/freetype/Font.h	2015-01-07 09:50:02.076571918 +0100
+@@ -30,10 +30,10 @@
+ #else
+ #include <ft2build.h>
+ #endif
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include <freetype.h>
++#include <ftglyph.h>
++#include <ftoutln.h>
++#include <fttrigon.h>
+ 
+ namespace love
+ {
+@@ -73,4 +73,4 @@
+ } // font
+ } // love
+ 
+-#endif // LOVE_FONT_FREETYPE_FONT_H
+\ No newline at end of file
++#endif // LOVE_FONT_FREETYPE_FONT_H
diff --git a/games-engines/love/love-0.8.0.ebuild b/games-engines/love/love-0.8.0.ebuild
index 5fcf2a6a3084..1773a093c860 100644
--- a/games-engines/love/love-0.8.0.ebuild
+++ b/games-engines/love/love-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.10 2014/07/06 13:20:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.11 2015/01/07 09:21:41 tupone Exp $
 
-EAPI=3
+EAPI=5
 
 inherit base games
 
@@ -45,10 +45,11 @@ src_prepare() {
 		mkdir platform/unix/m4 || die
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${P}-freetype2.patch
 }
 
 src_install() {
-	base_src_install
+	default
 	if [[ "${SLOT}" != "0" ]]; then
 		mv "${ED}${GAMES_BINDIR}"/${PN} \
 			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die