add patch from Cedric Pinson to correct version in .pc file (bug #171047)

(Portage version: 2.1.3.19)

5 files changed, 88 insertions, 2 deletions

diff --git a/media-libs/ftgl/ChangeLog b/media-libs/ftgl/ChangeLog
index 27b46e147277..fb2579dda167 100644
--- a/media-libs/ftgl/ChangeLog
+++ b/media-libs/ftgl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/ftgl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.19 2007/12/27 06:52:37 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.20 2008/01/05 01:15:02 mr_bones_ Exp $
+
+*ftgl-2.1.2-r2 (05 Jan 2008)
+
+  05 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ftgl-2.1.2-configure.ac.patch, +files/ftgl-2.1.2-ftgl.pc.in.patch,
+  +ftgl-2.1.2-r2.ebuild:
+  add patch from Cedric Pinson to correct version in .pc file (bug #171047)
 
   27 Dec 2007; Michael Sterrett <mr_bones_@gentoo.org> ftgl-2.1.2-r1.ebuild:
   license should have been LGPL-2 (bug #174440)
diff --git a/media-libs/ftgl/files/digest-ftgl-2.1.2-r2 b/media-libs/ftgl/files/digest-ftgl-2.1.2-r2
new file mode 100644
index 000000000000..c8d4079593a4
--- /dev/null
+++ b/media-libs/ftgl/files/digest-ftgl-2.1.2-r2
@@ -0,0 +1,3 @@
+MD5 3eabec9ad37371c4d139408c7ffd2429 ftgl-2.1.2.tar.gz 568497
+RMD160 561635a5ad871ea1a80997d3d6a0411825724920 ftgl-2.1.2.tar.gz 568497
+SHA256 83bf45ce03495bb0c0159a678144877b0dbc7d2f3d8e9f0aa006e72c5198d15f ftgl-2.1.2.tar.gz 568497
diff --git a/media-libs/ftgl/files/ftgl-2.1.2-configure.ac.patch b/media-libs/ftgl/files/ftgl-2.1.2-configure.ac.patch
new file mode 100644
index 000000000000..1ff868f44b64
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.2-configure.ac.patch
@@ -0,0 +1,8 @@
+--- FTGL/unix/configure.ac	2003-08-25 06:18:22.000000000 +0200
++++ FTGL/unix/configure.ac.patch	2007-04-08 20:08:28.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_INIT(ftgl, 2.0.5, henryj@paradise.net.nz)
++AC_INIT(ftgl, 2.1.2, henryj@paradise.net.nz)
+ AC_CONFIG_SRCDIR([Make.conf.in])
+ dnl AC_CONFIG_HEADER([src/config.h])
+ 
diff --git a/media-libs/ftgl/files/ftgl-2.1.2-ftgl.pc.in.patch b/media-libs/ftgl/files/ftgl-2.1.2-ftgl.pc.in.patch
new file mode 100644
index 000000000000..4c070eec3976
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.2-ftgl.pc.in.patch
@@ -0,0 +1,8 @@
+--- FTGL/unix/ftgl.pc.in.old	2003-08-24 23:18:22.000000000 -0500
++++ FTGL/unix/ftgl.pc.in	2004-09-07 13:47:35.429653782 -0500
+@@ -8,4 +8,4 @@
+ Version: @PACKAGE_VERSION@
+ Requires: 
+ Libs: @GL_LIBS@ @FT2_LIBS@ -L${libdir} -lftgl
+-Cflags: -I${includedir} @GL_CFLAGS@ @FT2_CFLAGS@
++Cflags: -I${includedir}/FTGL @GL_CFLAGS@ @FT2_CFLAGS@
diff --git a/media-libs/ftgl/ftgl-2.1.2-r2.ebuild b/media-libs/ftgl/ftgl-2.1.2-r2.ebuild
new file mode 100644
index 000000000000..7ea0c41d360a
--- /dev/null
+++ b/media-libs/ftgl/ftgl-2.1.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.2-r2.ebuild,v 1.1 2008/01/05 01:15:02 mr_bones_ Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
+HOMEPAGE="http://homepages.paradise.net.nz/henryj/code/#FTGL"
+SRC_URI="http://opengl.geek.nz/ftgl/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=media-libs/freetype-2.0.9
+	virtual/opengl
+	virtual/glut"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/FTGL/unix
+
+src_unpack() {
+	unpack ${A}
+
+	# Use the correct includedir for pkg-config
+	epatch \
+		"${FILESDIR}"/${P}-ftgl.pc.in.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-configure.ac.patch
+	if ! has_version app-doc/doxygen ; then
+		cd FTGL/docs
+		tar xzf html.tar.gz || die "unpack html.tar.gz"
+		ln -fs ../../docs/html "${S}/docs"
+	fi
+	sed -i \
+		-e "s:\((PACKAGE_NAME)\):\1-${PVR}:g" "${S}"/docs/Makefile \
+		|| die "sed failed"
+	sed -i \
+		-e "s:    \\$:\t\\$:g" "${S}"/src/Makefile \
+		|| die "sed failed"
+
+	cd "${S}"
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_compile() {
+	strip-flags # ftgl is sensitive - bug #112820
+	econf \
+		--enable-shared \
+		|| die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc README.txt
+}