Version bump, install desktop file (bug #496042).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 98 insertions, 11 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index b504aa5ba224..acd7ea55ccf6 100644
--- a/media-gfx/mandelbulber/ChangeLog
+++ b/media-gfx/mandelbulber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/mandelbulber
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.11 2013/04/08 15:05:56 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.12 2014/02/08 07:20:50 radhermit Exp $
+
+*mandelbulber-1.21.1 (08 Feb 2014)
+
+  08 Feb 2014; Tim Harder <radhermit@gentoo.org> +mandelbulber-1.21.1.ebuild,
+  +files/mandelbulber-1.21.1-qa.patch:
+  Version bump, install desktop file (bug #496042).
 
   08 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
   mandelbulber-1.12.1.ebuild,
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index bcbc3a7b79f2..2ebf81d1f68d 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX mandelbulber-1.11-qa.patch 1313 SHA256 ab6cd3852408b7e3e8034f194562e3cd82742749cff120c3cc2ead79c70998d7 SHA512 d4ec5a1e6f475a518414a402942240b5679b0eae15d1ac83cb73148759ade31e69cb5bf61081ec9a9e9349697ed4eccd61f180b67588937d84cc990202393770 WHIRLPOOL a4dec86e4e3038ecfadb561e07c5720d1f45e9ffe44847d50880dcd0c071d2118fc7fbf7473129537beac9584ac6f02f30d05f3d072cea51362f2748daaea594
 AUX mandelbulber-1.12.1-memcpy_and_memset.patch 358 SHA256 953ab6d6a3074d5808daaaeb8ee5fb5397b6030260d79c7b6c97e05c94bdebd4 SHA512 3ace39be67fc5ee66c66a7d6ff6b81f8939c2d1c598effe676f6b8f750fa904c294197aea5f4a62519f1c129580ed8f037a55af0d88da0e02cbe993b2630082c WHIRLPOOL 187240e58b462fcca7ebcad0b931128396e54e5d113abc9eae9bb8fea8e2454e290fd175dd4755a20a4340b7ec4d42276c01f36b085f78a03ca2413718a65226
+AUX mandelbulber-1.21.1-qa.patch 1254 SHA256 61dd936769ffb34d1e36575660c83ac0eefdf628540910b38b833c21208aa851 SHA512 90a7638b702a40af9c5f0927d8e13c8db6f67c1dc0fc144910a5a3da1872e05b4cba137a8f16856fc7d9c6883fec9e0bdb0e801d9d5d685c324a708a63a8e9c0 WHIRLPOOL 4e52d5a6d4968484449f591a2b9cce946acf269375256f381bc3ad3cafb069bf14fcda15d4bf783c83cf402ba38e5080134f27fd3d2172c1059b6dd362281c2d
 DIST mandelbulber1.11.tar.gz 1176248 SHA256 3f57a23f91c3d88f1e28cba29e4f076e03c9bcb97ce7ecdd0cd713687cab714e
 DIST mandelbulber1.12-1.tar.gz 1179684 SHA256 75376616b52cb8dac7c7f358f4eb26f9d2fb171b9b0a54dbb25eeb57e494d382 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512 WHIRLPOOL 7b5113bc81913607a544d19e9d16f53ec8888f97584110d0b8ad545b4603582f88fdfab4260d9fc74feaaae815739ac14f4b42e045fa1d6ae86d0e72e52f77fa
+DIST mandelbulber1.21-1.orig.tar.gz 1076836 SHA256 d9d95be4e21311fa2b2b7883a659d2c173940499a7c5f8436aa62cdf543b6eca SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3 WHIRLPOOL 204ebc870e9d6a80dbbff210424bcef333dafc24b8b6010d10f7eda833b3e6342154182d171e0960d02531ebc812b727197f8dfe2aa4aa641e5160b0256993c8
 EBUILD mandelbulber-1.11.ebuild 974 SHA256 693e9915b32438390dfb4775fadf7bd3dcd5886fb44e5614358e8f7cbb602be1 SHA512 4c8e83001fce6d4f1918e5205b36c92385049dc38a7fed1ece72d60a9d70c7945049f12eeb2444f38a4935408b4840ba6a9382d6b19c5290ed51c5795c7adafc WHIRLPOOL f7426d5654e6c7d7d6277e143eff1c873c724a7642ccd84fec3d276c38576e6684e1a352120ac3efd735f335b835d0c70579c276c4619e8b4220798428aa94e8
 EBUILD mandelbulber-1.12.1.ebuild 1080 SHA256 2fce93ecb9886b4fcc3760de837f2dd18b1a364d08457cc0e527f766bf1018d6 SHA512 2dd04c65135bac857349943b028ecd2d2aa26d81e38c41eafd1186d25a8120248b2d45409c858eceb60f0c932279d5a2cc86efd6614b496c0c07c0385bd4da5e WHIRLPOOL abf791187c2eba2861a235aa9e1e3a209b78b486e30ea533d7a1b311a7ce04ccda025ae3ff98af0cf087fbb89b2dcb889550eefd035dd1b0e02906c5ac21b37d
-MISC ChangeLog 2880 SHA256 7276ebe1c8fc73d568df0f03e7ba4a5f02b6c2372769054da901bfa4e7fa99c5 SHA512 399c79c09444c75e12ec8b8f97893d6dd6060aff30a96e07295dfb45f0191f89f913a6ddc59d78eebfe20a33d00f022ebfe1dea3165a0e0946ba1ee06d1445af WHIRLPOOL fc421f515fb69afa4916a2c1a44708ff23613eede37afc09f99e42cf0fc777ec2967b0fe20752e6c68b9a5eedde1fc9d873e80b3223e816240c7edda08d07e4e
+EBUILD mandelbulber-1.21.1.ebuild 1088 SHA256 a02deaa29bcb1c88ec33c550d4d4d15a62ed1e7459026621d4cb8952ac0ddd76 SHA512 6d36b1d30ef286c13f9301c17eddeb530309b0294be66a2831cf95c829626caa9d64a14814b88fe072663d11d8f4eba9dc33ac873269b0064b14c959d15a59aa WHIRLPOOL 72dc074bd5c83effa5c9f6c97c74fa868e48c46d8608ba5e662c4314982aa418529c79b2d01ec75fb332fbd7416540d3904c338930163e112c4d818a8df00d8c
+MISC ChangeLog 3086 SHA256 097742dafbb0feda2705db45e93048d090e41f7f7143c25af06ccefbc54e8b3a SHA512 202b1332b9dbee70c537852325810c10decb9a8ea36f9a00582578f4029afdd3789ea196a70e82c15d0b4ac52a343c03852e95774472ad4f9efdb6c5831f7a81 WHIRLPOOL 7bcb565d16f55a66c46bde2b3dbb28a2af901e91fe775de6c9e8bf62ba3a67a4d8cbafbf8aca5b75db11033f3ca00fdbe0571bf9c9275ce1e248a07667e8dfab
 MISC metadata.xml 434 SHA256 495c048b131523b62f8ac1992eb2aafb4af67e7f8ef09262de8dff6edd086505 SHA512 6c7eeac970dc1840cfa78e178c734a642d363e0e78e57378f71095e49c24ebb301dc16a0410a68358394f8b87a052983e1837078545b863edf88c92182c52782 WHIRLPOOL 7d7a15ca2f34558710e689c01d9ab7caf2916bfda23c88adb9f7d3838d4888b7ca5646d412065ca72bbbd627032e88058ca904c62c802597a12ce8df1e4231e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYtyrAAoJEEdUh39IaPFN/+UIAKOgnpS8gOAntq00+3S00+z0
-QlqEZyup1SLJNLI+qzN1hs4oCeXhcRyiOGMvoRa8fKBHfBZeKTz0PUH8areFaGTq
-O3DduPyVVzSAJf6AlqoqFah58vdWHtLUY0APXY+/3gTepfb5U6nSiQPAQpmlfozy
-k8ApQEEGp7eVwEvI7bTNgFj6CMY4C8BMLS6B/39Dzwk16fk2M6iuEZiz3pU2f/zE
-5F4sDWIcOhJREnAcU29Ply6T5SGmtGvY5xovNniMbTco653atuA5bf5kZQX+fuD1
-90X59K81CGz2irthDJyG43OdSygidC9El++e4pfK0T2qJE/6U2oQu8EY84dcQcM=
-=Axvq
+iQEcBAEBCAAGBQJS9drVAAoJEEqz6FtPBkyjNLkH/3vqa+VFnUFsSTNQz6/yi+vn
+SEcYke500sMr+L5tyZj6uMNRjmLjM7IDT7nVz+kYxk41SQIoT1ahxMENnp/IIULc
+uTZGF0MjULCxliMkveN4SiuU8ncotmgCKN8lyjLzSGim+lAjXHhccwWM4EsYWWhr
+PP5/jmvSfKDE3daUOSsPFM9PqYoLXjCYzhkMRKMOu9a83PD3ejUHA4qmKLJbWZ2/
+VINIyN/5yrU/g6OtbO+V/kjmKTyo53VUjddrkGuFxcJZZdtJLTkxiAgRJUes5oas
+VvpnOJKmqzz6Z/DTs/sCT98QbDSH8hqj/0/syG7qhHZOVSGCaoCjWtcpZV1h2Tk=
+=Ff3M
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch
new file mode 100644
index 000000000000..6fea9525cfe1
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.21.1-qa.patch
@@ -0,0 +1,30 @@
+--- mandelbulber1.21-1.orig/makefiles/makefile
++++ mandelbulber1.21-1.orig/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/ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(USER_OBJS) $(LIBS)
++	$(CXX) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(USER_OBJS) $(LIBS)
+ 	@echo 'Finished building target: $@'
+ 	@echo ' '
+ 
+--- mandelbulber1.21-1.orig/makefiles/src/subdir.mk
++++ mandelbulber1.21-1.orig/makefiles/src/subdir.mk
+@@ -71,7 +71,7 @@
+ src/%.o: ../src/%.cpp
+ 	@echo 'Building file: $<'
+ 	@echo 'Invoking: GCC C++ Compiler'
+-	g++ -O3 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) $(CPPFLAGS) -o"$@" "$<"
++	$(CXX) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" $(CXXFLAGS) $(CPPFLAGS) -o"$@" "$<"
+ 	@echo 'Finished building: $<'
+ 	@echo ' '
+ 
diff --git a/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild
new file mode 100644
index 000000000000..ba4a3c04abd2
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.21.1.ebuild,v 1.1 2014/02/08 07:20:50 radhermit Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs versionator
+
+MY_P=${PN}$(replace_version_separator 2 '-' ).orig
+
+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
+	dev-libs/glib:2
+	>=media-libs/libpng-1.4:0=
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	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/*
+	domenu ${PN}.desktop
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
+	fi
+}