revision bump with patches from fedora, also reported in bug #202315

(Portage version: 2.2_rc6/cvs/Linux 2.6.27-rc2 i686)

12 files changed, 193 insertions, 103 deletions

diff --git a/media-libs/amanith/ChangeLog b/media-libs/amanith/ChangeLog
index 3eecf8df1741..78523ec12f17 100644
--- a/media-libs/amanith/ChangeLog
+++ b/media-libs/amanith/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-libs/amanith
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/ChangeLog,v 1.3 2007/06/11 04:40:45 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/ChangeLog,v 1.4 2008/08/11 21:25:50 maekke Exp $
+
+*amanith-0.3-r2 (11 Aug 2008)
+
+  11 Aug 2008; Markus Meier <maekke@gentoo.org>
+  -files/amanith-0.3-build.patch, -files/amanith-0.3-freetype.patch,
+  +files/amanith-0.3-freetype-fix.patch,
+  +files/amanith-0.3-gcc-C++fix.patch, -files/amanith-0.3-gcc4.patch,
+  +files/amanith-0.3-gcc43.patch,
+  +files/amanith-0.3-nothirdpartystatic.patch,
+  +files/amanith-0.3-system-freetype.patch,
+  +files/amanith-0.3-system-glew.patch,
+  +files/amanith-0.3-system-libjpeg.patch,
+  +files/amanith-0.3-system-libpng.patch, -amanith-0.3-r1.ebuild,
+  +amanith-0.3-r2.ebuild:
+  revision bump with patches from fedora, also reported in bug #202315
 
   11 Jun 2007; Mike Frysinger <vapier@gentoo.org>
   +files/amanith-0.3-freetype.patch, amanith-0.3-r1.ebuild:
diff --git a/media-libs/amanith/amanith-0.3-r1.ebuild b/media-libs/amanith/amanith-0.3-r2.ebuild
index af202c83c823..a0914fb84542 100644
--- a/media-libs/amanith/amanith-0.3-r1.ebuild
+++ b/media-libs/amanith/amanith-0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/amanith-0.3-r1.ebuild,v 1.2 2007/06/11 04:40:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/amanith/amanith-0.3-r2.ebuild,v 1.1 2008/08/11 21:25:50 maekke Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs qt4
 
 DESCRIPTION="OpenSource C++ CrossPlatform framework designed for 2d & 3d vector graphics"
 HOMEPAGE="http://www.amanith.org/"
@@ -13,21 +13,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples jpeg opengl png truetype"
 
-DEPEND="truetype? ( >=media-libs/freetype-2.2.1 )
+DEPEND="
 	jpeg? ( >=media-libs/jpeg-6b )
-	png? ( >=media-libs/libpng-1.2.10 )
 	opengl? ( media-libs/glew )
+	png? ( >=media-libs/libpng-1.2.10 )
+	truetype? ( >=media-libs/freetype-2.2.1 )
 	>=x11-libs/qt-4.1.0"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-freetype.patch #179734
+	epatch "${FILESDIR}"/${P}-freetype-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc-C++fix.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-nothirdpartystatic.patch
+	epatch "${FILESDIR}"/${P}-system-freetype.patch
+	epatch "${FILESDIR}"/${P}-system-glew.patch
+	epatch "${FILESDIR}"/${P}-system-libjpeg.patch
+	epatch "${FILESDIR}"/${P}-system-libpng.patch
 
 	rm -rf 3rdpart include/GL || die
 	sed -i -e '/SUBDIRS/s:3rdpart::' amanith.pro || die
@@ -42,17 +48,11 @@ src_unpack() {
 }
 
 src_compile() {
-	export AMANITHDIR=${S}
-	# make sure our env settings are respected
-	qmake \
-		-unix \
-		QMAKE_CC=$(tc-getCC) \
-		QMAKE_CXX=$(tc-getCXX) \
-		QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LFLAGS="${LDFLAGS}" \
-		|| die "qmake failed"
-	emake || die "emake failed"
+	export AMANITHDIR="${S}"
+	export LD_LIBRARY_PATH="${AMANITHDIR}/lib:${LD_LIBRARY_PATH}"
+
+	eqmake4 || die
+	emake || die
 }
 
 src_install() {
diff --git a/media-libs/amanith/files/amanith-0.3-build.patch b/media-libs/amanith/files/amanith-0.3-build.patch
deleted file mode 100644
index 27e6f3a45fec..000000000000
--- a/media-libs/amanith/files/amanith-0.3-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- amanith/plugins/fonts/build.conf
-+++ amanith/plugins/fonts/build.conf
-@@ -38,9 +38,9 @@
- # take into account compilation mode (debug or release)

- DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE

- 

--INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include

-+QMAKE_CXXFLAGS += `pkg-config --cflags freetype2`
- 

--unix: LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a

-+unix: LIBS += `pkg-config --libs freetype2` -lz
- win32: {

- 

-     !contains(DEFINES, WIN32_MINGW) {

---- amanith/plugins/jpeg/build.conf
-+++ amanith/plugins/jpeg/build.conf
-@@ -25,7 +25,7 @@
-     }

- }

- 

--unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a

-+unix: LIBS += -ljpeg
- win32: {

- 

-     !contains(DEFINES, WIN32_MINGW) {

---- amanith/plugins/jpeg/gjpegimpexp.cpp
-+++ amanith/plugins/jpeg/gjpegimpexp.cpp
-@@ -36,7 +36,7 @@
- #include <csetjmp>

- 

- G_EXTERN_C {
--	#include "../../3rdpart/libjpeg/jpeglib.h"
-+	#include <jpeglib.h>
- };

- 

- /****************************************************************************
---- amanith/plugins/png/build.conf
-+++ amanith/plugins/png/build.conf
-@@ -25,9 +25,8 @@
-     }

- }

- 

--INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib

- 

--unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a

-+unix: LIBS += -lpng -lz
- win32: {

- 

-     !contains(DEFINES, WIN32_MINGW) {

---- amanith/plugins/png/gpngimpexp.cpp
-+++ amanith/plugins/png/gpngimpexp.cpp
-@@ -35,7 +35,7 @@
- //#include <csetjmp>

- 

- G_EXTERN_C {
--	#include "../../3rdpart/libpng/png.h"
-+	#include <png.h>
- };

- 

- /****************************************************************************
diff --git a/media-libs/amanith/files/amanith-0.3-freetype.patch b/media-libs/amanith/files/amanith-0.3-freetype-fix.patch
index bd5a93c6bb3e..fd6e052162ad 100644
--- a/media-libs/amanith/files/amanith-0.3-freetype.patch
+++ b/media-libs/amanith/files/amanith-0.3-freetype-fix.patch
@@ -1,9 +1,6 @@
-should be fixed upstream already
-
-http://bugs.gentoo.org/179734
-
---- amarinth/plugins/fonts/fontsimpexp.cpp
-+++ amarinth/plugins/fonts/gfontsimpexp.cpp
+diff -up amanith/plugins/fonts/gfontsimpexp.cpp.BAD amanith/plugins/fonts/gfontsimpexp.cpp
+--- amanith/plugins/fonts/gfontsimpexp.cpp.BAD	2007-11-15 10:02:49.000000000 -0500
++++ amanith/plugins/fonts/gfontsimpexp.cpp	2007-11-15 10:05:59.000000000 -0500
 @@ -34,7 +34,6 @@
  

  #include <ft2build.h>

@@ -12,17 +9,18 @@ http://bugs.gentoo.org/179734
  

  namespace Amanith {

  

-@@ -198,7 +197,8 @@
+@@ -197,8 +196,9 @@ static void LoadGlyph(GFont2D& Font, con
+ 	GFontChar2D *c;

  	GGlyphMetrics tmpMetrics;

  	FT_Error error;

- 	GInt32 i, j, k0, k1, numVert;

--	FT_SubGlyphRec subGlyph;

 +	FT_Matrix subGlyphMatrix;
 +	FT_Int subGlyphArg1, subGlyphArg2;
+ 	GInt32 i, j, k0, k1, numVert;

+-	FT_SubGlyphRec subGlyph;

  	GPoint2 p;

  	GReal x, y;

  	GVect<GReal, 2> v;

-@@ -223,19 +223,22 @@
+@@ -223,19 +223,22 @@ static void LoadGlyph(GFont2D& Font, con
  		GDynArray<GSubChar2D> subChars(Face->glyph->num_subglyphs);

  

  		for (i = 0; i < (GInt32)Face->glyph->num_subglyphs; i++) {

diff --git a/media-libs/amanith/files/amanith-0.3-gcc-C++fix.patch b/media-libs/amanith/files/amanith-0.3-gcc-C++fix.patch
new file mode 100644
index 000000000000..e7b2f41b8908
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-gcc-C++fix.patch
@@ -0,0 +1,12 @@
+diff -up amanith/examples/opengl/vectorizer/drawer.h.BAD amanith/examples/opengl/vectorizer/drawer.h
+--- amanith/examples/opengl/vectorizer/drawer.h.BAD	2007-11-14 17:52:37.000000000 -0500
++++ amanith/examples/opengl/vectorizer/drawer.h	2007-11-14 17:53:07.000000000 -0500
+@@ -71,7 +71,7 @@ public:
+ #endif
+ 	// destructor
+ 	~QGLWidgetTest();
+-	void QGLWidgetTest::timerEvent(QTimerEvent *e);
++	void timerEvent(QTimerEvent *e);
+ };
+ 
+ 
diff --git a/media-libs/amanith/files/amanith-0.3-gcc4.patch b/media-libs/amanith/files/amanith-0.3-gcc4.patch
deleted file mode 100644
index d1294bd1320d..000000000000
--- a/media-libs/amanith/files/amanith-0.3-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amanith/examples/opengl/vectorizer/drawer.h
-+++ amanith/examples/opengl/vectorizer/drawer.h
-@@ -71,7 +71,7 @@
- #endif
- 	// destructor
- 	~QGLWidgetTest();
--	void QGLWidgetTest::timerEvent(QTimerEvent *e);
-+	void timerEvent(QTimerEvent *e);

- };
- 
- 
diff --git a/media-libs/amanith/files/amanith-0.3-gcc43.patch b/media-libs/amanith/files/amanith-0.3-gcc43.patch
new file mode 100644
index 000000000000..0e7e867e1a74
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-gcc43.patch
@@ -0,0 +1,22 @@
+diff -up amanith/include/amanith/support/gutilities.h.BAD amanith/include/amanith/support/gutilities.h
+--- amanith/include/amanith/support/gutilities.h.BAD	2008-02-19 11:00:42.000000000 -0500
++++ amanith/include/amanith/support/gutilities.h	2008-02-19 11:00:49.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include "amanith/geometry/gvect.h"

+ #include "amanith/geometry/gquat.h"

+ #include <algorithm>

++#include <cstring>

+ 

+ /*!

+ 	\file gutilities.h

+diff -up amanith/include/amanith/rendering/gopenglboard.h.BAD amanith/include/amanith/rendering/gopenglboard.h
+--- amanith/include/amanith/rendering/gopenglboard.h.BAD	2008-02-19 10:59:06.000000000 -0500
++++ amanith/include/amanith/rendering/gopenglboard.h	2008-02-19 10:59:13.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include "amanith/rendering/gdrawboard.h"

+ #include "amanith/2d/gtesselator2d.h"

+ #include "amanith/gopenglext.h"

++#include <cstring>

+ #include <utility>

+ 

+ /*!

diff --git a/media-libs/amanith/files/amanith-0.3-nothirdpartystatic.patch b/media-libs/amanith/files/amanith-0.3-nothirdpartystatic.patch
new file mode 100644
index 000000000000..1634234aa849
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-nothirdpartystatic.patch
@@ -0,0 +1,45 @@
+--- amanith/amanith.pro.BAD	2007-05-26 18:03:40.000000000 -0500
++++ amanith/amanith.pro	2007-05-26 18:03:48.000000000 -0500
+@@ -1,4 +1,4 @@
+ TEMPLATE     = subdirs

+ CONFIG      += ordered

+ 

+-SUBDIRS += 3rdpart build plugins examples

++SUBDIRS += build plugins examples

+--- amanith/plugins/jpeg/build.conf.BAD	2007-05-26 18:03:57.000000000 -0500
++++ amanith/plugins/jpeg/build.conf	2007-05-26 18:04:09.000000000 -0500
+@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) {

+     }

+ }

+ 

+-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a

++unix: LIBS += -ljpeg

+ win32: {

+ 

+     !contains(DEFINES, WIN32_MINGW) {

+--- amanith/plugins/png/build.conf.BAD	2007-05-26 18:04:21.000000000 -0500
++++ amanith/plugins/png/build.conf	2007-05-26 18:04:33.000000000 -0500
+@@ -25,9 +25,7 @@ contains(DEFINES, _PNG_PLUGIN) {

+     }

+ }

+ 

+-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib

+-

+-unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a

++unix: LIBS += -lpng -lz

+ win32: {

+ 

+     !contains(DEFINES, WIN32_MINGW) {

+--- amanith/plugins/fonts/build.conf.BAD	2007-05-26 18:04:44.000000000 -0500
++++ amanith/plugins/fonts/build.conf	2007-05-26 18:05:08.000000000 -0500
+@@ -38,9 +38,9 @@ contains(DEFINES, _FONTS_PLUGIN) {

+ # take into account compilation mode (debug or release)

+ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE

+ 

+ INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include

+ 

+-unix: LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a

++unix: LIBS += -lfreetype -lz

+ win32: {

+ 

+     !contains(DEFINES, WIN32_MINGW) {

diff --git a/media-libs/amanith/files/amanith-0.3-system-freetype.patch b/media-libs/amanith/files/amanith-0.3-system-freetype.patch
new file mode 100644
index 000000000000..45158cf1d603
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-system-freetype.patch
@@ -0,0 +1,19 @@
+diff -up amanith/plugins/fonts/build.conf.BAD amanith/plugins/fonts/build.conf
+--- amanith/plugins/fonts/build.conf.BAD	2007-11-15 10:18:43.000000000 -0500
++++ amanith/plugins/fonts/build.conf	2007-11-15 10:19:10.000000000 -0500
+@@ -38,7 +38,7 @@ contains(DEFINES, _FONTS_PLUGIN) {

+ # take into account compilation mode (debug or release)

+ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE

+ 

+-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include

++QMAKE_CXXFLAGS += `pkg-config --cflags freetype2`

+ 

+ unix: LIBS += -lfreetype -lz

+ win32: {

+@@ -51,4 +51,4 @@ win32: {

+     contains(DEFINES, WIN32_MINGW) {

+         LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a

+     }

+-}
+\ No newline at end of file
++}

diff --git a/media-libs/amanith/files/amanith-0.3-system-glew.patch b/media-libs/amanith/files/amanith-0.3-system-glew.patch
new file mode 100644
index 000000000000..ab9d4394d754
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-system-glew.patch
@@ -0,0 +1,26 @@
+diff -up amanith/build/build.pro.BAD amanith/build/build.pro
+--- amanith/build/build.pro.BAD	2007-11-14 17:41:00.000000000 -0500
++++ amanith/build/build.pro	2007-11-14 17:41:41.000000000 -0500
+@@ -69,8 +69,9 @@ SOURCES = gelement.cpp \

+ #

+ #*********************************************************

+ contains(DEFINES, _OPENGLEXT_PLUGIN) {

+-    SOURCES += support/glew.c gopenglext.cpp

++    SOURCES += gopenglext.cpp

+     CONFIG += opengl

++    LIBS += -lGLEW

+ 

+     # Qt4 syntax

+     contains(DEFINES, USE_QT4) {

+diff -up amanith/include/amanith/gopenglext.h.BAD amanith/include/amanith/gopenglext.h
+--- amanith/include/amanith/gopenglext.h.BAD	2007-11-14 17:42:28.000000000 -0500
++++ amanith/include/amanith/gopenglext.h	2007-11-14 17:42:52.000000000 -0500
+@@ -29,7 +29,7 @@
+ #ifndef GOPENGLEXT_H

+ #define GOPENGLEXT_H

+ 

+-#include "GL/glew.h"

++#include <GL/glew.h>

+ // this inclusion to make glew linking working with some platforms (ex: Mac)

+ #include "amanith/gelement.h"

+ #ifdef G_OS_WIN

diff --git a/media-libs/amanith/files/amanith-0.3-system-libjpeg.patch b/media-libs/amanith/files/amanith-0.3-system-libjpeg.patch
new file mode 100644
index 000000000000..de6bd334e816
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-system-libjpeg.patch
@@ -0,0 +1,12 @@
+diff -up amanith/plugins/jpeg/gjpegimpexp.cpp.BAD amanith/plugins/jpeg/gjpegimpexp.cpp
+--- amanith/plugins/jpeg/gjpegimpexp.cpp.BAD	2007-11-14 22:06:33.000000000 -0500
++++ amanith/plugins/jpeg/gjpegimpexp.cpp	2007-11-14 22:07:15.000000000 -0500
+@@ -36,7 +36,7 @@
+ #include <csetjmp>

+ 

+ G_EXTERN_C {
+-	#include "../../3rdpart/libjpeg/jpeglib.h"
++	#include <jpeglib.h>
+ };

+ 

+ /****************************************************************************
diff --git a/media-libs/amanith/files/amanith-0.3-system-libpng.patch b/media-libs/amanith/files/amanith-0.3-system-libpng.patch
new file mode 100644
index 000000000000..c6a9ad808eca
--- /dev/null
+++ b/media-libs/amanith/files/amanith-0.3-system-libpng.patch
@@ -0,0 +1,12 @@
+diff -up amanith/plugins/png/gpngimpexp.cpp.BAD amanith/plugins/png/gpngimpexp.cpp
+--- amanith/plugins/png/gpngimpexp.cpp.BAD	2007-11-14 22:09:31.000000000 -0500
++++ amanith/plugins/png/gpngimpexp.cpp	2007-11-14 22:10:11.000000000 -0500
+@@ -35,7 +35,7 @@
+ //#include <csetjmp>

+ 

+ G_EXTERN_C {
+-	#include "../../3rdpart/libpng/png.h"
++	#include <png.h>
+ };

+ 

+ /****************************************************************************