Version bump

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

4 files changed, 112 insertions, 8 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index 900a54c8dd5d..c0f05dc734ae 100644
--- a/media-gfx/mandelbulber/ChangeLog
+++ b/media-gfx/mandelbulber/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2011/09/04 10:45:04 xarthisius Exp $
+# 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 $
+
+*mandelbulber-1.10 (14 Jan 2012)
+
+  14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/mandelbulber-1.10-qa.patch, +mandelbulber-1.10.ebuild:
+  Version bump
 
 *mandelbulber-1.08 (04 Sep 2011)
 
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index 2be1c0f0930c..69ff73ee4278 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -2,16 +2,27 @@
 Hash: SHA256
 
 AUX mandelbulber-1.08-qa.patch 1081 RMD160 b15a09ee2e27e4af0442881b7b8604b3cb3f1586 SHA1 ddf7de264d35928d51c5f62de9e98ae38a5b5ae2 SHA256 da8b129c0277d8a76cee767b4c8d8bd5f49ebb2ea3e383a959d945347d214cde
+AUX mandelbulber-1.10-qa.patch 1391 RMD160 19fe8a6c69b277d84966279436146ce785c049ef SHA1 1c800b2db05ebf82e71cdb559e9073f8805851e5 SHA256 92d1fccc6d269ef12a2d188677f2961a870791c2e4a477e2f0e33987f41dc5dc
 DIST mandelbulber1.08.tar.gz 1145324 RMD160 ca9652fe160901af9895973744a0214bf72d7c87 SHA1 f3a02939607379534bdc65c023fd7806ff8deb00 SHA256 642b376120bd5da3c87ff185949a666eb2e01ee18b1206ceb47ac92c5cb5e364
+DIST mandelbulber1.10.tar.gz 1167848 RMD160 c1ed996c24831380fba6c09e9c499f74c94f58b3 SHA1 8d2bbd03fc134ebcaf467748ec8ef56100ab3250 SHA256 f6a027f6db5f73dd1b6bf58660fbbc3baa973fbbd465c73f2e2e46ce891920fd
 EBUILD mandelbulber-1.08.ebuild 1068 RMD160 7168bc4a2216e8c43542e62d32870a9a49c1bd48 SHA1 fe6d1149a4d0b8680431aaba822893459680e4c7 SHA256 dbdd80866195f1311b14df4fef73da7f4e64f259673f952f027207d0a4755da6
-MISC ChangeLog 1719 RMD160 306e1fd993535ffdbab22499102834165ed5d140 SHA1 8118028f4f581a39f6f84694df143420589ee9e6 SHA256 b4b9ed0b1984fa53d3318c575903981216ca24f4fdc852e5b1bc332676932c76
+EBUILD mandelbulber-1.10.ebuild 1068 RMD160 e164346e52bc890cd94d3f9c923ff686f1470a48 SHA1 6ffa9ae18bf730708ed3fda5f372a342bb96c0c0 SHA256 e63bf714246343c7eabc69c427945744c9bce7356b5fab6b766c0868b218132e
+MISC ChangeLog 1887 RMD160 80e3ddded96611cc9fe75906280e7d3587abcc45 SHA1 92ae83a720f32b0d1ff30e05598ba9dd8a6eea95 SHA256 12ab6a5d1035ce76bd6b27d146b3e1b967380c4949ebbc7fb80ff01d317af6d3
 MISC metadata.xml 532 RMD160 c5c0f33f73c2c7fb6687f340914847f6b395b0c2 SHA1 67e92912a3050780a9d2355afd510d2b627e374d SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5jVrsACgkQIiMqcbOVdxS7JAQAjODeLHa2pNHO+n/onhtYzi6x
-hyBe+XiI0FV+qCnRH9ErGKrd0s4snX4Hs0i0c2SjIytpX3GOa0z2XVtdle8eMzEH
-j2M02UEK4BoqqWNAHFEvlCftChTK2jdga6CC/cDqV5A2Z4uq7jnO0dmlyIZrooY7
-avJZ6uHEGn92FY0pMXI=
-=oZ6H
+iQIcBAEBCAAGBQJPEcEQAAoJEF0huFKJUZL5MU4QAJqY+oe6nHyfRThj7E+okOur
+fF47IKQYsfuOSeEtrEZ3uGUqKVUQSzR3x+zGEjsG3qbVP5KYbFyoVmpyhMtBkLuF
+ztTvSJyMVVd4nWlE23z5cRoiW9yLlZdZQ62bFbNTCKVxoZtjZ2+vX0uoQzxbS3Ou
+RGT21YCu7zBWLWkONiWSrJ6Df2vu6QnWiiPJ3w/OlmjIYKEq3a4QqIm+xXFsRBvk
+B/xrbW1QSZIiVm+ZH9XNuP+BJW3VEBxLX+RolgXA4hh67wOrKfy99YwNpX0/MAGW
+96dGAv5Zl/FwWfj7paiV+I79Dm8VJ4furDcBTRvHGeZ7qSzslhld29RRGKaRknXw
+qJ8OEiI5jxIs53oesCJjl7T6pSfn7jZLsJOVsZiZ9sUZ/Vl7qSZzTemTUpAlGwMt
+wibrLgXs3SFj9jX7XAQvMt/uP09T/w69NFvE1fkxRHGyvRtlnAY8iW8YndGyyYBG
+PMuOgiVjHQHFoweQkcZ6G5aNfJrCYoxOG2HZ1T6hzJgXvkMRhFDzUcrKKVP+e1MH
+hxQ4lI7ZzuST/n+Z8M1TvXmYTbPQaYsuSxBR+Q/N7d9ZN/7oXLBp/s9+9t1H0v+2
+MNJUiT4cNbms8rAyWybN4SWB+5ubEfTgM/9GgLgG+B4tDQ1IppqkHrWhqI5BIB7B
+rc+KrWutY7phiMpC4OBV
+=9Kl5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch
new file mode 100644
index 000000000000..036d24539e9c
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch
@@ -0,0 +1,40 @@
+Respect CXX,CXXFLAGS, fix linking order
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- 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 -ffast-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 ' '
+ 
+--- 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++ -L/usr/lib/x86_64-linux-gnu/ `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber"$(OBJS) $(USER_OBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o"mandelbulber" $(OBJS) $(USER_OBJS) `pkg-config --libs gtk+-2.0 gthread-2.0` $(LIBS)
+ 	@echo 'Finished building target: $@'
+ 	@echo ' '
+ 
diff --git a/media-gfx/mandelbulber/mandelbulber-1.10.ebuild b/media-gfx/mandelbulber/mandelbulber-1.10.ebuild
new file mode 100644
index 000000000000..c41737183bc6
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-1.10.ebuild
@@ -0,0 +1,47 @@
+# 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.10.ebuild,v 1.1 2012/01/14 17:53:11 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}${PV}
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="http://sites.google.com/site/mandelbulber/home"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=media-libs/libsndfile-1
+	>=media-libs/libpng-1.4
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# https://sourceforge.net/tracker/?func=detail&aid=3368617&group_id=303080&atid=1277701
+	epatch "${FILESDIR}"/${P}-qa.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" -C makefiles all
+}
+
+src_install() {
+	dobin makefiles/${PN}
+	dodoc README NEWS
+	insinto /usr/share/${PN}
+	doins -r usr/share/*
+}
+
+pkg_postinst() {
+	elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
+}