Version bump, drop old

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

4 files changed, 47 insertions, 26 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index c0f05dc734ae..1ecb7d1c037b 100644
--- a/media-gfx/mandelbulber/ChangeLog
+++ b/media-gfx/mandelbulber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/mandelbulber
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.6 2012/01/14 17:53:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.7 2012/02/17 13:42:31 xarthisius Exp $
+
+*mandelbulber-1.11 (17 Feb 2012)
+
+  17 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/mandelbulber-1.11-qa.patch, +mandelbulber-1.11.ebuild,
+  -files/mandelbulber-1.08-qa.patch, -mandelbulber-1.08.ebuild:
+  Version bump, drop old
 
 *mandelbulber-1.10 (14 Jan 2012)
 
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch
deleted file mode 100644
index e94c97fbbd32..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- makefiles/makefile.orig	2011-09-04 12:36:07.388901054 +0200
-+++ makefiles/makefile	2011-09-04 12:37:15.301900642 +0200
-@@ -44,7 +44,7 @@
- mandelbulber: $(OBJS) $(USER_OBJS)
- 	@echo 'Building target: $@'
- 	@echo 'Invoking: GCC C++ Linker'
--	g++ `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber"$(OBJS) $(USER_OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(USER_OBJS) `pkg-config --libs gtk+-2.0 gthread-2.0` $(LIBS)
- 	@echo 'Finished building target: $@'
- 	@echo ' '
- 
---- makefiles/src/subdir.mk.orig	2011-09-04 12:37:21.200901233 +0200
-+++ makefiles/src/subdir.mk	2011-09-04 12:37:57.896900659 +0200
-@@ -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"$@" "$<"
-+	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
- 	@echo 'Finished building: $<'
- 	@echo ' '
- 
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
new file mode 100644
index 000000000000..f457c1902c8f
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
@@ -0,0 +1,37 @@
+--- a/makefiles/makefile
++++ b/makefiles/makefile
+@@ -5,6 +5,7 @@
+ -include ../makefile.init
+ 
+ RM := rm -rf
++CXX ?= g++
+ 
+ # All of the sources participating in the build are defined here
+ -include sources.mk
+@@ -44,7 +45,7 @@
+ mandelbulber: $(OBJS) $(USER_OBJS)
+ 	@echo 'Building target: $@'
+ 	@echo 'Invoking: GCC C++ Linker'
+-	g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
++	$(CXX) $(LDFLAGS) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 	@echo 'Finished building target: $@'
+ 	@echo ' '
+ 
+--- a/makefiles/src/subdir.mk
++++ b/makefiles/src/subdir.mk
+@@ -63,12 +63,14 @@
+ ./src/undo.d \
+ ./src/cl_support.d 
+ 
++CXX ?= g++
++CXXFLAGS ?= -O2 -fast-math
+ 
+ # Each subdirectory must supply rules for building sources it contributes
+ 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"$@" "$<"
++	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+ 	@echo 'Finished building: $<'
+ 	@echo ' '
+ 
diff --git a/media-gfx/mandelbulber/mandelbulber-1.08.ebuild b/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
index f9de8de4b3c6..633739ece36f 100644
--- a/media-gfx/mandelbulber/mandelbulber-1.08.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.08.ebuild,v 1.1 2011/09/04 10:45:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.11.ebuild,v 1.1 2012/02/17 13:42:31 xarthisius Exp $
 
 EAPI=4
 
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	# https://sourceforge.net/tracker/?func=detail&aid=3368617&group_id=303080&atid=1277701
 	epatch "${FILESDIR}"/${P}-qa.patch
 }