Version bump wrt #365063 by Ondrej Filip <chytzkoi@seznam.cz>. Fixes building with gcc 4.6. Drop old.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 35 insertions, 21 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index 7ae973edcaad..67471fbb96fb 100644
--- a/media-gfx/mandelbulber/ChangeLog
+++ b/media-gfx/mandelbulber/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/mandelbulber
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.2 2011/01/30 12:30:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.3 2011/04/27 20:19:09 xarthisius Exp $
+
+*mandelbulber-1.00 (27 Apr 2011)
+
+  27 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -mandelbulber-0.97-r1.ebuild, -files/mandelbulber-0.97-qa.patch,
+  +mandelbulber-1.00.ebuild, +files/mandelbulber-1.00-gcc46.patch,
+  +files/mandelbulber-1.00-qa.patch:
+  Version bump wrt #365063 by Ondrej Filip <chytzkoi@seznam.cz>. Fixes building
+  with gcc 4.6. Drop old.
 
 *mandelbulber-0.97-r1 (30 Jan 2011)
 
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch b/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch
new file mode 100644
index 000000000000..2a4e6657864e
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch
@@ -0,0 +1,12 @@
+Fix building with GCC 4.6
+
+--- src/fractal.h
++++ src/fractal.h
+@@ -9,6 +9,7 @@
+ #define FRACTAL_H_
+ 
+ #include <vector>
++#include <cstddef>
+ #include "common_math.h"
+ #include "fractparams.h"
+ 
diff --git a/media-gfx/mandelbulber/files/mandelbulber-0.97-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch
index e9f0f0f6351d..447bea5fdad8 100644
--- a/media-gfx/mandelbulber/files/mandelbulber-0.97-qa.patch
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch
@@ -2,9 +2,9 @@ Respect CXX,CXXFLAGS, fix as-needed
 
 Patch written by Kacper Kowalik <xarthisius@gentoo.org>
 
---- a/src/Release/makefile
-+++ b/src/Release/makefile
-@@ -43,7 +43,7 @@
+--- a/makefiles/makefile
++++ b/makefiles/makefile
+@@ -44,7 +44,7 @@
  mandelbulber: $(OBJS) $(USER_OBJS)
  	@echo 'Building target: $@'
  	@echo 'Invoking: GCC C++ Linker'
@@ -13,18 +13,10 @@ Patch written by Kacper Kowalik <xarthisius@gentoo.org>
  	@echo 'Finished building target: $@'
  	@echo ' '
  
---- a/src/Release/subdir.mk
-+++ b/src/Release/subdir.mk
-@@ -65,14 +65,14 @@
- Render3D.o: ../Render3D.cpp
- 	@echo 'Building file: $<'
- 	@echo 'Invoking: GCC C++ Compiler'
--	g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"Render3D.d" -o"$@" "$<"
-+	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"Render3D.d" -o"$@" "$<"
- 	@echo 'Finished building: $<'
- 	@echo ' '
- 
- %.o: ../%.cpp
+--- a/makefiles/src/subdir.mk
++++ b/makefiles/src/subdir.mk
+@@ -65,7 +65,7 @@
+ src/%.o: ../src/%.cpp
  	@echo 'Building file: $<'
  	@echo 'Invoking: GCC C++ Compiler'
 -	g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
diff --git a/media-gfx/mandelbulber/mandelbulber-0.97-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.00.ebuild
index 5daf68cfaeae..7359403094a8 100644
--- a/media-gfx/mandelbulber/mandelbulber-0.97-r1.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-1.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-0.97-r1.ebuild,v 1.1 2011/01/30 12:30:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.00.ebuild,v 1.1 2011/04/27 20:19:08 xarthisius Exp $
 
 EAPI=3
 
@@ -27,16 +27,17 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-qa.patch
+	epatch "${FILESDIR}"/${P}-qa.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" -C src/Release all || die
+	emake CXX="$(tc-getCXX)" -C makefiles all || die
 }
 
 src_install() {
-	dobin src/Release/${PN} || die
-	dodoc README.txt CHANGE_LOG.txt || die
+	dobin makefiles/${PN} || die
+	dodoc README NEWS || die
 	insinto /usr/share/${PN}
 	doins -r .${PN}/* || die
 }