From c7d3f350e7c621183cbc30de7114c7afd65ea31b Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 4 Sep 2011 10:45:05 +0000 Subject: [PATCH] Version bump wrt #380327 by Tim Harder , drop old Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- media-gfx/mandelbulber/ChangeLog | 11 ++++- media-gfx/mandelbulber/Manifest | 26 +++++----- .../files/mandelbulber-1.00-gcc46.patch | 12 ----- .../files/mandelbulber-1.05-overflow.patch | 11 ----- ...00-qa.patch => mandelbulber-1.08-qa.patch} | 16 +++---- .../mandelbulber/mandelbulber-1.00.ebuild | 47 ------------------- ...r-1.05.ebuild => mandelbulber-1.08.ebuild} | 8 ++-- 7 files changed, 30 insertions(+), 101 deletions(-) delete mode 100644 media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch delete mode 100644 media-gfx/mandelbulber/files/mandelbulber-1.05-overflow.patch rename media-gfx/mandelbulber/files/{mandelbulber-1.00-qa.patch => mandelbulber-1.08-qa.patch} (57%) delete mode 100644 media-gfx/mandelbulber/mandelbulber-1.00.ebuild rename media-gfx/mandelbulber/{mandelbulber-1.05.ebuild => mandelbulber-1.08.ebuild} (76%) diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog index a2cba0f4b391..900a54c8dd5d 100644 --- a/media-gfx/mandelbulber/ChangeLog +++ b/media-gfx/mandelbulber/ChangeLog @@ -1,6 +1,15 @@ # 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.4 2011/07/16 09:27:41 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.5 2011/09/04 10:45:04 xarthisius Exp $ + +*mandelbulber-1.08 (04 Sep 2011) + + 04 Sep 2011; Kacper Kowalik + -mandelbulber-1.00.ebuild, -files/mandelbulber-1.00-gcc46.patch, + -files/mandelbulber-1.00-qa.patch, -mandelbulber-1.05.ebuild, + -files/mandelbulber-1.05-overflow.patch, +mandelbulber-1.08.ebuild, + +files/mandelbulber-1.08-qa.patch: + Version bump wrt #380327 by Tim Harder , drop old *mandelbulber-1.05 (16 Jul 2011) diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index 3f7960559ca4..2be1c0f0930c 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,21 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX mandelbulber-1.00-gcc46.patch 194 RMD160 7453bc283e05072abfdbd9b5fc1a8043eaac98c9 SHA1 ee02cd52d051d9deff9a3d9c4973f47e666743b5 SHA256 39b13b0d1428369258ae3aa29aa8200dc2c962e4bf798578b14d631ed191716f -AUX mandelbulber-1.00-qa.patch 1042 RMD160 2aa5c994fc734dfab2c5cd6bfcee1d306fb7cd9c SHA1 c60ca978d2fff94c6233b7084dd9066af6e7563e SHA256 f3ffffb1ee4f898f53a3830bb4226565ad7e7d8ec953aa658fd3518bbec24d74 -AUX mandelbulber-1.05-overflow.patch 260 RMD160 06031c415202a41c4a64288ebd72aaaa533feaf0 SHA1 5ba2c371bd4aded93400e1e85b4ffc2635974472 SHA256 1fe3661c65e8f66f751c5af921cf5f8dc099c2e38333250ab9f7bb815e461540 -DIST mandelbulber1.00.tar.gz 1313544 RMD160 a67c3a9f048411578b41fb2478ae6e1a223bf0a9 SHA1 09daadbbbe23a7dfe03668d1b31d8e974e7f88bc SHA256 b2b7cdb693050f49d1220846b21cc8c14ca2d96453061534e3a870d74e834394 -DIST mandelbulber1.05.tar.gz 916129 RMD160 cc6503f5a8867bad4e60ad9a1e4a6f4becca82bb SHA1 ca05dcdd39007aca2250e8dac6fec77d9aa77445 SHA256 c30d903a54dee1ba2b3124bc595d115e673c097f7c7b29df9dcd8c5432cebc1c -EBUILD mandelbulber-1.00.ebuild 1039 RMD160 e850c41d755fc16fa6774a19014149ee33819c74 SHA1 da8f6a2817468e20179cdf0231a00c5164361004 SHA256 a59cb0aec62504501a0777f364ad7d1478f19e098b450381b4bfae15418ab1c6 -EBUILD mandelbulber-1.05.ebuild 1208 RMD160 ba2c85ed723e39ec464c23a00fe027af977eae3c SHA1 a165cccb55bc44f03a050e03a1453163869d6d24 SHA256 f6060affdc987ac7522e41e268f616431a695d6aed27e9e8cd03f799d05077b9 -MISC ChangeLog 1318 RMD160 e97c0410845e7656f6d44139fd7aa9ed6415091d SHA1 08a0a7ada35891d64b0af1f6d60df597753f0d45 SHA256 f909b86cb7f880402961d5a3cdd4e6ca9e3cbd55cc45be1e985f12fce805d331 +AUX mandelbulber-1.08-qa.patch 1081 RMD160 b15a09ee2e27e4af0442881b7b8604b3cb3f1586 SHA1 ddf7de264d35928d51c5f62de9e98ae38a5b5ae2 SHA256 da8b129c0277d8a76cee767b4c8d8bd5f49ebb2ea3e383a959d945347d214cde +DIST mandelbulber1.08.tar.gz 1145324 RMD160 ca9652fe160901af9895973744a0214bf72d7c87 SHA1 f3a02939607379534bdc65c023fd7806ff8deb00 SHA256 642b376120bd5da3c87ff185949a666eb2e01ee18b1206ceb47ac92c5cb5e364 +EBUILD mandelbulber-1.08.ebuild 1068 RMD160 7168bc4a2216e8c43542e62d32870a9a49c1bd48 SHA1 fe6d1149a4d0b8680431aaba822893459680e4c7 SHA256 dbdd80866195f1311b14df4fef73da7f4e64f259673f952f027207d0a4755da6 +MISC ChangeLog 1719 RMD160 306e1fd993535ffdbab22499102834165ed5d140 SHA1 8118028f4f581a39f6f84694df143420589ee9e6 SHA256 b4b9ed0b1984fa53d3318c575903981216ca24f4fdc852e5b1bc332676932c76 MISC metadata.xml 532 RMD160 c5c0f33f73c2c7fb6687f340914847f6b395b0c2 SHA1 67e92912a3050780a9d2355afd510d2b627e374d SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk4hWZYACgkQIiMqcbOVdxQAvAP+PPP8bEz721NmLI6bgRb4tgag -2znfATFCniEh34X1ydWL787FcZM8j3sqcAKaUmj+KxPpUmliE/ExxGpupohxNJKe -KhPhTMRraHX7f1Syauu1yq1jq4KrGDSz8kEKEBe7ph6TN6jmAeiaFulyS4YHpOmo -PuYrkxi3eeKj6WvBRR0= -=ZFMf +iJwEAQEIAAYFAk5jVrsACgkQIiMqcbOVdxS7JAQAjODeLHa2pNHO+n/onhtYzi6x +hyBe+XiI0FV+qCnRH9ErGKrd0s4snX4Hs0i0c2SjIytpX3GOa0z2XVtdle8eMzEH +j2M02UEK4BoqqWNAHFEvlCftChTK2jdga6CC/cDqV5A2Z4uq7jnO0dmlyIZrooY7 +avJZ6uHEGn92FY0pMXI= +=oZ6H -----END PGP SIGNATURE----- diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch b/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch deleted file mode 100644 index 2a4e6657864e..000000000000 --- a/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix building with GCC 4.6 - ---- src/fractal.h -+++ src/fractal.h -@@ -9,6 +9,7 @@ - #define FRACTAL_H_ - - #include -+#include - #include "common_math.h" - #include "fractparams.h" - diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.05-overflow.patch b/media-gfx/mandelbulber/files/mandelbulber-1.05-overflow.patch deleted file mode 100644 index af4170fa65a2..000000000000 --- a/media-gfx/mandelbulber/files/mandelbulber-1.05-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/callbacks.cpp -+++ src/callbacks.cpp -@@ -1663,7 +1663,7 @@ - { - const char *filename = gtk_file_chooser_get_preview_filename(file_chooser); - -- char string[12]; -+ char string[13]; - - FILE *fileSettings = fopen(filename, "r"); - if (fileSettings) diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch b/media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch similarity index 57% rename from media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch rename to media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch index 447bea5fdad8..e94c97fbbd32 100644 --- a/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch +++ b/media-gfx/mandelbulber/files/mandelbulber-1.08-qa.patch @@ -1,20 +1,16 @@ -Respect CXX,CXXFLAGS, fix as-needed - -Patch written by Kacper Kowalik - ---- a/makefiles/makefile -+++ b/makefiles/makefile +--- 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 "mandelbulber" $(OBJS) $(USER_OBJS) `pkg-config --libs gtk+-2.0 gthread-2.0` $(LIBS) +- 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 ' ' ---- a/makefiles/src/subdir.mk -+++ b/makefiles/src/subdir.mk +--- 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: $<' diff --git a/media-gfx/mandelbulber/mandelbulber-1.00.ebuild b/media-gfx/mandelbulber/mandelbulber-1.00.ebuild deleted file mode 100644 index 7359403094a8..000000000000 --- a/media-gfx/mandelbulber/mandelbulber-1.00.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.00.ebuild,v 1.1 2011/04/27 20:19:08 xarthisius Exp $ - -EAPI=3 - -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() { - epatch "${FILESDIR}"/${P}-qa.patch \ - "${FILESDIR}"/${P}-gcc46.patch -} - -src_compile() { - emake CXX="$(tc-getCXX)" -C makefiles all || die -} - -src_install() { - dobin makefiles/${PN} || die - dodoc README NEWS || die - insinto /usr/share/${PN} - doins -r .${PN}/* || die -} - -pkg_postinst() { - elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}" -} diff --git a/media-gfx/mandelbulber/mandelbulber-1.05.ebuild b/media-gfx/mandelbulber/mandelbulber-1.08.ebuild similarity index 76% rename from media-gfx/mandelbulber/mandelbulber-1.05.ebuild rename to media-gfx/mandelbulber/mandelbulber-1.08.ebuild index 859633c3c720..f9de8de4b3c6 100644 --- a/media-gfx/mandelbulber/mandelbulber-1.05.ebuild +++ b/media-gfx/mandelbulber/mandelbulber-1.08.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.05.ebuild,v 1.1 2011/07/16 09:27:41 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.08.ebuild,v 1.1 2011/09/04 10:45:04 xarthisius Exp $ EAPI=4 @@ -28,13 +28,11 @@ S=${WORKDIR}/${MY_P} src_prepare() { # https://sourceforge.net/tracker/?func=detail&aid=3368617&group_id=303080&atid=1277701 - # https://sourceforge.net/tracker/?func=detail&aid=3368618&group_id=303080&atid=1277701 - epatch "${FILESDIR}"/${PN}-1.00-qa.patch \ - "${FILESDIR}"/${P}-overflow.patch + epatch "${FILESDIR}"/${P}-qa.patch } src_compile() { - emake CXX="$(tc-getCXX)" -C makefiles all || die + emake CXX="$(tc-getCXX)" -C makefiles all } src_install() { -- 2.26.2