summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-02-17 13:42:31 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-02-17 13:42:31 +0000
commit6636e5e24d518f56c616005e2ce3a7152fbf030e (patch)
treedc3136740963e2419c08222b51218d0c762e1481
parentStable for amd64, wrt bug #404159 (diff)
downloadhistorical-6636e5e24d518f56c616005e2ce3a7152fbf030e.tar.gz
historical-6636e5e24d518f56c616005e2ce3a7152fbf030e.tar.bz2
historical-6636e5e24d518f56c616005e2ce3a7152fbf030e.zip
Version bump, drop old
Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
-rw-r--r--media-gfx/mandelbulber/ChangeLog9
-rw-r--r--media-gfx/mandelbulber/Manifest34
-rw-r--r--media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch22
-rw-r--r--media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch37
-rw-r--r--media-gfx/mandelbulber/mandelbulber-1.11.ebuild (renamed from media-gfx/mandelbulber/mandelbulber-1.08.ebuild)5
5 files changed, 64 insertions, 43 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/Manifest b/media-gfx/mandelbulber/Manifest
index 69ff73ee4278..59fab57cf9f1 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,28 +1,28 @@
-----BEGIN PGP SIGNED MESSAGE-----
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
+AUX mandelbulber-1.11-qa.patch 1313 RMD160 b4770a895ffae352d9a0ea4d955944bda6f632df SHA1 f8587fb536319e0293527df027713958459cee0d SHA256 ab6cd3852408b7e3e8034f194562e3cd82742749cff120c3cc2ead79c70998d7
DIST mandelbulber1.10.tar.gz 1167848 RMD160 c1ed996c24831380fba6c09e9c499f74c94f58b3 SHA1 8d2bbd03fc134ebcaf467748ec8ef56100ab3250 SHA256 f6a027f6db5f73dd1b6bf58660fbbc3baa973fbbd465c73f2e2e46ce891920fd
-EBUILD mandelbulber-1.08.ebuild 1068 RMD160 7168bc4a2216e8c43542e62d32870a9a49c1bd48 SHA1 fe6d1149a4d0b8680431aaba822893459680e4c7 SHA256 dbdd80866195f1311b14df4fef73da7f4e64f259673f952f027207d0a4755da6
+DIST mandelbulber1.11.tar.gz 1176248 RMD160 24615a66a1d744e89577f1346d8b8760a1e596ea SHA1 82d5621d09b0c273bda0f00ba7e91d78a5757cc5 SHA256 3f57a23f91c3d88f1e28cba29e4f076e03c9bcb97ce7ecdd0cd713687cab714e
EBUILD mandelbulber-1.10.ebuild 1068 RMD160 e164346e52bc890cd94d3f9c923ff686f1470a48 SHA1 6ffa9ae18bf730708ed3fda5f372a342bb96c0c0 SHA256 e63bf714246343c7eabc69c427945744c9bce7356b5fab6b766c0868b218132e
-MISC ChangeLog 1887 RMD160 80e3ddded96611cc9fe75906280e7d3587abcc45 SHA1 92ae83a720f32b0d1ff30e05598ba9dd8a6eea95 SHA256 12ab6a5d1035ce76bd6b27d146b3e1b967380c4949ebbc7fb80ff01d317af6d3
+EBUILD mandelbulber-1.11.ebuild 979 RMD160 0b6b421ced1a85605ab0010c9d8dd51b562c1756 SHA1 b98b6f45ca74dd02aedc45ce76c6b912a85d85ff SHA256 f926538b75610d6cba0357819f225334831564368d2254f86ca119724ae4bd29
+MISC ChangeLog 2129 RMD160 e1c1815c3c916b3ed0b14b73a49eadc4a04b1524 SHA1 6cd504ff72dcb08d4b225921159a06e87967134e SHA256 64087698d8ae0e21656734d0cf9c0ea7c5eb7e2db8f62d4501f9f57ff2d0c03f
MISC metadata.xml 532 RMD160 c5c0f33f73c2c7fb6687f340914847f6b395b0c2 SHA1 67e92912a3050780a9d2355afd510d2b627e374d SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-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
+iQIcBAEBCAAGBQJPPllyAAoJEF0huFKJUZL5viAP/2UTR1LNrvSuqlzi0jJuEjAb
+KCkyHuhpQ1w9MAMa3VKsEzFq39d6RknwVqZgZi2R6K+4qgLtEYAn04QvfbLEB64t
+DONLRnYDUvlpD+pVi7zB6OKNFMFINj5fu3R9tlTmz4MNTyR6NShhpkUKx0FtZmqW
+Dm/vsEaMkITQnIo+9amc2XUEHN1bGycBdT/lLxIO7N2OXXbRRRfWSBYArFsrHa9B
+/vJdA/rpSShqEiIjdNt+wY/rqK2DLTzbx3WTEoqDkTa91cBHlvvlzv6UHIJyKuuz
+c5/XKCdE0GE50/0U2mQcHoUm1rjXAi0vpgsmfBH16v6fiKE01b3wAjDba6ksznWy
+7aW51QEv79DDejJV1R1wUEhM3GRvhEfUiJq+Na/ZX84F45O2y6/9gUTQTAYPoLGe
+90lmidQG0kkyo4pXp8FMzMKQJLX2IU0pD5s8UM06Gp/ydYsp1+SJ1TBh3PpeFsIK
+jo1qJk930HGHbpl8/KzmWfhJwLJzisrf5Nu55Cq7dmILtz7o1NRVZo33X4Z4nLa4
+m5ALl11UU9clR9geQm/+8PeaS881EJ4RKPDjApBItvNVhurL1RQzIFNZClBqYJ+s
+bWGAOxbMmFxMuBsKR5/XunI7id4QsXm7vZJr+OAChytdXm3mI+B01NYWBF45F3S2
+QnxUYIYl6jb9G7VTzKbR
+=VCOB
-----END PGP SIGNATURE-----
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
}