old

(Portage version: 2.1.6.13/cvs/Linux i686)

6 files changed, 2 insertions, 96 deletions

diff --git a/media-libs/ftgl/files/2.1.2-ftgl.pc.in.patch b/media-libs/ftgl/files/2.1.2-ftgl.pc.in.patch
deleted file mode 100644
index 4c070eec3976..000000000000
--- a/media-libs/ftgl/files/2.1.2-ftgl.pc.in.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/files/ftgl-2.1.2-configure.ac.patch b/media-libs/ftgl/files/ftgl-2.1.2-configure.ac.patch
deleted file mode 100644
index 1ff868f44b64..000000000000
--- a/media-libs/ftgl/files/ftgl-2.1.2-configure.ac.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index 4c070eec3976..000000000000
--- a/media-libs/ftgl/files/ftgl-2.1.2-ftgl.pc.in.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/files/ftgl-2.1.2-gcc41.patch b/media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch
deleted file mode 100644
index c23aaacaf0a4..000000000000
--- a/media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- FTGL/include/FTTextureGlyph.h.old	2006-01-29 11:08:54.000000000 -0700
-+++ FTGL/include/FTTextureGlyph.h	2006-01-29 11:09:06.000000000 -0700
-@@ -52,7 +52,7 @@
-          * Reset the currently active texture to zero to get into a known state before
-          * drawing a string. This is to get round possible threading issues.
-          */
--        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
-+        static void ResetActiveTexture(){ activeTextureID = 0;}
-         
-     private:
-         /**
diff --git a/media-libs/ftgl/ftgl-2.1.2-r2.ebuild b/media-libs/ftgl/ftgl-2.1.2-r2.ebuild
deleted file mode 100644
index f37743c9a58f..000000000000
--- a/media-libs/ftgl/ftgl-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 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.2 2009/08/21 21:02:05 ssuominen Exp $
-
-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
-}
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index dbab9f4e3f36..83d1d1d8c314 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.8 2009/08/21 21:02:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.9 2009/11/10 16:36:21 mr_bones_ Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -18,11 +18,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-libs/freetype-2.0.9
+DEPEND=">=media-libs/freetype-2.0.9
 	virtual/opengl
 	virtual/glu
 	virtual/glut"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P2}