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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 45 insertions, 30 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/Manifest b/media-gfx/mandelbulber/Manifest
index 5e4715034414..cb31a4b50a70 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mandelbulber-0.97-qa.patch 1473 RMD160 3fe1325b5a4e1584c99bb704b0f98829f4b6ef50 SHA1 a286ac7142eacd950106e8b1b9a7828f97266293 SHA256 2da3536e986887feae764eacb887069175c0a72bff4d3206f038fd6eee88be6b
-DIST mandelbulber0.97.tar.gz 1318251 RMD160 f25c1869d7d18d741bbcc60193a00ebef26dd704 SHA1 24bff66e013096673f55726e92db62eed6b5e868 SHA256 cafbf4182fde0501e81e9de8b9f9eab9a1962e84226053a155c309a9335bd8a0
-EBUILD mandelbulber-0.97-r1.ebuild 1025 RMD160 b6715ff9101019e04d8a34ddf6b41d7befabc53e SHA1 9313725209241600d5520cd0f190bb99ac822579 SHA256 f75d4c29a713766d4ee39d7d6c4abfdce3ab91ab10e5937d4e48ff88e19d37af
-MISC ChangeLog 766 RMD160 f60109aac31f6cc93c54760ee00585705815e2db SHA1 5d17e1086706b046dd643bcef2bf034baa511f62 SHA256 8b7106394a8c0784cc3ec10273e57bd041fb6fd0c57eea3886dac4fe35f685d2
+AUX mandelbulber-1.00-gcc46.patch 194 RMD160 7453bc283e05072abfdbd9b5fc1a8043eaac98c9 SHA1 ee02cd52d051d9deff9a3d9c4973f47e666743b5 SHA256 39b13b0d1428369258ae3aa29aa8200dc2c962e4bf798578b14d631ed191716f
+AUX mandelbulber-1.00-qa.patch 1042 RMD160 2aa5c994fc734dfab2c5cd6bfcee1d306fb7cd9c SHA1 c60ca978d2fff94c6233b7084dd9066af6e7563e SHA256 f3ffffb1ee4f898f53a3830bb4226565ad7e7d8ec953aa658fd3518bbec24d74
+DIST mandelbulber1.00.tar.gz 1313544 RMD160 a67c3a9f048411578b41fb2478ae6e1a223bf0a9 SHA1 09daadbbbe23a7dfe03668d1b31d8e974e7f88bc SHA256 b2b7cdb693050f49d1220846b21cc8c14ca2d96453061534e3a870d74e834394
+EBUILD mandelbulber-1.00.ebuild 1039 RMD160 e850c41d755fc16fa6774a19014149ee33819c74 SHA1 da8f6a2817468e20179cdf0231a00c5164361004 SHA256 a59cb0aec62504501a0777f364ad7d1478f19e098b450381b4bfae15418ab1c6
+MISC ChangeLog 1132 RMD160 990af993e3a3a5172dd714f81a9670306ca90462 SHA1 19e5c874c2b468372199b06cbb72ac39a85055d3 SHA256 7ba1368686fd4969eeca99b1f41a84cc436586af485208006a22c9e033769072
 MISC metadata.xml 532 RMD160 c5c0f33f73c2c7fb6687f340914847f6b395b0c2 SHA1 67e92912a3050780a9d2355afd510d2b627e374d SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk1FWdkACgkQIiMqcbOVdxQevAP/XQ4L1vIIfRzDO9ZEYB3RaDdm
-MXiANxa9YgyCuGGUEqcpoMlMWNqMG2JatD6Kli2LdshVWW2pj4eNegfJuiU15i/j
-4e8bbJOsiZoW/wTx56cgxpcmbkHi8YBHISiOBBJq/WetMfUaQae3ZwXj8KuknAs0
-5cfBGoQF5CE7WApdOys=
-=sFDo
+iJwEAQECAAYFAk24ekgACgkQIiMqcbOVdxRN6QP9FRWXVJvwCsi3vRUh1eYgw5ld
+WB4Qxc4zrp/SOns4yVA5fIGK75S5x3/xGeY8u3pS0q7CSBR7LgsFj5iOHTilUpNX
+UoD1MsalkYj3xNGrMXeKrNK6jK9Q5JRITVUI7YO5IsNaxaN2xyT9Bq2nGUOTUflE
+LgL4BMdF82R8ZvC7BEk=
+=vNeo
 -----END PGP SIGNATURE-----
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
 }