Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mandelbulber/, media-gfx/mandelbulber/files/
Date: Wed, 07 Feb 2018 22:48:55
Message-Id: 1518043723.3d873d090769de6ad0516512589922455c02bd17.asturm@gentoo
1 commit: 3d873d090769de6ad0516512589922455c02bd17
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 7 22:47:58 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 22:48:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d873d09
7
8 media-gfx/mandelbulber: Drop old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-gfx/mandelbulber/Manifest | 2 -
13 .../mandelbulber/files/mandelbulber-1.11-qa.patch | 37 -----------------
14 .../mandelbulber-1.12.1-memcpy_and_memset.patch | 22 -----------
15 media-gfx/mandelbulber/mandelbulber-1.11.ebuild | 45 ---------------------
16 media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild | 46 ----------------------
17 5 files changed, 152 deletions(-)
18
19 diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
20 index 95a8c017df0..bbd387ba6e9 100644
21 --- a/media-gfx/mandelbulber/Manifest
22 +++ b/media-gfx/mandelbulber/Manifest
23 @@ -1,3 +1 @@
24 -DIST mandelbulber1.11.tar.gz 1176248 BLAKE2B 6a5eb1391aa94630ba2b24e1f811202c2e1b642a6b5122c43dd8352d339286a4f0c894fb83870be5472ed542b510475dca4ba8cad298fb4be7db24c716c3c80e SHA512 fddd351fd235e42899b5dbf26099cb5c315539b1352f1c4dad7a59e39fe34a07aba41140349e1bfd8dddd69ef4f39c39ca017285b3726557e52fb9ec4f82291b
25 -DIST mandelbulber1.12-1.tar.gz 1179684 BLAKE2B 726315b34e0785846e0184fa2702a27329d4f61a9674e08626a2059dd9c6c418a0d9f83c0e225be09ce321fa76e0f957cd7e6c73aabfe53c9c3cdd5d38901778 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512
26 DIST mandelbulber1.21-1.orig.tar.gz 1076836 BLAKE2B 6cb17351d8070abb092faa48a2254c76af40cd95942e8ecb46f3fd651423b5e8be8555906c946fb5b28024f23015680abce2f92adc33a742fadea8c0e10c6fac SHA512 caaa27a4aa67e83045e9cfc84593770d26d0b12d44e6f37f1f37e04eb62f7d2038c07d82541eca2ef8c64c787bae2fac9c487f69c98936310946f27c07760ce3
27
28 diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
29 deleted file mode 100644
30 index f457c1902c8..00000000000
31 --- a/media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch
32 +++ /dev/null
33 @@ -1,37 +0,0 @@
34 ---- a/makefiles/makefile
35 -+++ b/makefiles/makefile
36 -@@ -5,6 +5,7 @@
37 - -include ../makefile.init
38 -
39 - RM := rm -rf
40 -+CXX ?= g++
41 -
42 - # All of the sources participating in the build are defined here
43 - -include sources.mk
44 -@@ -44,7 +45,7 @@
45 - mandelbulber: $(OBJS) $(USER_OBJS)
46 - @echo 'Building target: $@'
47 - @echo 'Invoking: GCC C++ Linker'
48 -- g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0`
49 -+ $(CXX) $(LDFLAGS) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS) `pkg-config --libs gtk+-2.0 gthread-2.0`
50 - @echo 'Finished building target: $@'
51 - @echo ' '
52 -
53 ---- a/makefiles/src/subdir.mk
54 -+++ b/makefiles/src/subdir.mk
55 -@@ -63,12 +63,14 @@
56 - ./src/undo.d \
57 - ./src/cl_support.d
58 -
59 -+CXX ?= g++
60 -+CXXFLAGS ?= -O2 -fast-math
61 -
62 - # Each subdirectory must supply rules for building sources it contributes
63 - src/%.o: ../src/%.cpp
64 - @echo 'Building file: $<'
65 - @echo 'Invoking: GCC C++ Compiler'
66 -- 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"$@" "$<"
67 -+ $(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"$@" "$<"
68 - @echo 'Finished building: $<'
69 - @echo ' '
70 -
71
72 diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
73 deleted file mode 100644
74 index 43fb0b982db..00000000000
75 --- a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
76 +++ /dev/null
77 @@ -1,22 +0,0 @@
78 -http://bugs.gentoo.org/464972
79 -
80 ---- src/texture.cpp
81 -+++ src/texture.cpp
82 -@@ -5,6 +5,7 @@
83 - * Author: krzysztof
84 - */
85 - #include <stdio.h>
86 -+#include <string.h>
87 - #include "texture.hpp"
88 - #include "files.h"
89 -
90 ---- src/timeline.cpp
91 -+++ src/timeline.cpp
92 -@@ -6,6 +6,7 @@
93 - */
94 -
95 - #include <cstdlib>
96 -+#include <cstring>
97 -
98 - #include "timeline.hpp"
99 - #include "files.h"
100
101 diff --git a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild b/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
102 deleted file mode 100644
103 index e3761ae9b17..00000000000
104 --- a/media-gfx/mandelbulber/mandelbulber-1.11.ebuild
105 +++ /dev/null
106 @@ -1,45 +0,0 @@
107 -# Copyright 1999-2012 Gentoo Foundation
108 -# Distributed under the terms of the GNU General Public License v2
109 -
110 -EAPI=4
111 -
112 -inherit eutils toolchain-funcs
113 -
114 -MY_P=${PN}${PV}
115 -
116 -DESCRIPTION="Tool to render 3D fractals"
117 -HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
118 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
119 -
120 -LICENSE="GPL-3"
121 -SLOT="0"
122 -KEYWORDS="~amd64 ~x86"
123 -IUSE=""
124 -
125 -RDEPEND="x11-libs/gtk+:2
126 - >=media-libs/libsndfile-1
127 - >=media-libs/libpng-1.4
128 - virtual/jpeg"
129 -DEPEND="${RDEPEND}
130 - virtual/pkgconfig"
131 -
132 -S=${WORKDIR}/${MY_P}
133 -
134 -src_prepare() {
135 - epatch "${FILESDIR}"/${P}-qa.patch
136 -}
137 -
138 -src_compile() {
139 - emake CXX="$(tc-getCXX)" -C makefiles all
140 -}
141 -
142 -src_install() {
143 - dobin makefiles/${PN}
144 - dodoc README NEWS
145 - insinto /usr/share/${PN}
146 - doins -r usr/share/*
147 -}
148 -
149 -pkg_postinst() {
150 - elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
151 -}
152
153 diff --git a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
154 deleted file mode 100644
155 index cfeefff2b52..00000000000
156 --- a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
157 +++ /dev/null
158 @@ -1,46 +0,0 @@
159 -# Copyright 1999-2013 Gentoo Foundation
160 -# Distributed under the terms of the GNU General Public License v2
161 -
162 -EAPI=5
163 -inherit eutils toolchain-funcs versionator
164 -
165 -MY_P=${PN}$(replace_version_separator 2 '-' )
166 -
167 -DESCRIPTION="Tool to render 3D fractals"
168 -HOMEPAGE="https://sites.google.com/site/mandelbulber/home"
169 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
170 -
171 -LICENSE="GPL-3"
172 -SLOT="0"
173 -KEYWORDS="~amd64 ~x86"
174 -IUSE=""
175 -
176 -RDEPEND="x11-libs/gtk+:2
177 - >=media-libs/libsndfile-1
178 - >=media-libs/libpng-1.4:0=
179 - virtual/jpeg"
180 -DEPEND="${RDEPEND}
181 - virtual/pkgconfig"
182 -
183 -S=${WORKDIR}/${MY_P}
184 -
185 -src_prepare() {
186 - epatch \
187 - "${FILESDIR}"/${PN}-1.11-qa.patch \
188 - "${FILESDIR}"/${P}-memcpy_and_memset.patch
189 -}
190 -
191 -src_compile() {
192 - emake CXX="$(tc-getCXX)" -C makefiles all
193 -}
194 -
195 -src_install() {
196 - dobin makefiles/${PN}
197 - dodoc README NEWS
198 - insinto /usr/share/${PN}
199 - doins -r usr/share/*
200 -}
201 -
202 -pkg_postinst() {
203 - elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
204 -}
Report Message
Find on MARC Find on Google Groups