Version bump, drop old

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

4 files changed, 39 insertions, 55 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index 204e5b403fa8..bc846dad39e6 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.8 2012/05/05 07:00:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.9 2012/08/03 08:35:39 xarthisius Exp $
+
+*mandelbulber-1.12.1 (03 Aug 2012)
+
+  03 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +mandelbulber-1.12.1.ebuild, -files/mandelbulber-1.10-qa.patch,
+  -mandelbulber-1.10.ebuild:
+  Version bump, drop old
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> mandelbulber-1.10.ebuild,
   mandelbulber-1.11.ebuild:
@@ -56,4 +63,3 @@
   30 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   +mandelbulber-0.97.ebuild, +files/mandelbulber-0.97-qa.patch, +metadata.xml:
   Initial import. Ebuild written by me.
-
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index 18804e714f17..bdee4ece1ed6 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,8 +1,27 @@
-AUX mandelbulber-1.10-qa.patch 1391 RMD160 19fe8a6c69b277d84966279436146ce785c049ef SHA1 1c800b2db05ebf82e71cdb559e9073f8805851e5 SHA256 92d1fccc6d269ef12a2d188677f2961a870791c2e4a477e2f0e33987f41dc5dc
-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
-DIST mandelbulber1.11.tar.gz 1176248 RMD160 24615a66a1d744e89577f1346d8b8760a1e596ea SHA1 82d5621d09b0c273bda0f00ba7e91d78a5757cc5 SHA256 3f57a23f91c3d88f1e28cba29e4f076e03c9bcb97ce7ecdd0cd713687cab714e
-EBUILD mandelbulber-1.10.ebuild 1063 RMD160 08b36c1f64471de1c2dfaafd4571be6a0b27a80f SHA1 26f6ea5950fbb7570b97965c0ac71d121aa5b692 SHA256 b455713f054159fbfaebe3daffef19dcfbd5f418199a5d6c38c463a652c61d53
-EBUILD mandelbulber-1.11.ebuild 974 RMD160 d4c5915cb17b6daec7b92c50745582358033065a SHA1 2ca47f8ddae0396b0e0af7c639e4bef12eedf8bc SHA256 693e9915b32438390dfb4775fadf7bd3dcd5886fb44e5614358e8f7cbb602be1
-MISC ChangeLog 2271 RMD160 a76116acaad4ffb09e45bf05aed569f4f19fd350 SHA1 e8541e858509c7c2281f1de64748ec396ac3a765 SHA256 489d750cdac93b03b0246b8699fd6344861d2216af18e294605460f030e3a275
-MISC metadata.xml 532 RMD160 c5c0f33f73c2c7fb6687f340914847f6b395b0c2 SHA1 67e92912a3050780a9d2355afd510d2b627e374d SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mandelbulber-1.11-qa.patch 1313 SHA256 ab6cd3852408b7e3e8034f194562e3cd82742749cff120c3cc2ead79c70998d7 SHA512 d4ec5a1e6f475a518414a402942240b5679b0eae15d1ac83cb73148759ade31e69cb5bf61081ec9a9e9349697ed4eccd61f180b67588937d84cc990202393770 WHIRLPOOL a4dec86e4e3038ecfadb561e07c5720d1f45e9ffe44847d50880dcd0c071d2118fc7fbf7473129537beac9584ac6f02f30d05f3d072cea51362f2748daaea594
+DIST mandelbulber1.11.tar.gz 1176248 SHA256 3f57a23f91c3d88f1e28cba29e4f076e03c9bcb97ce7ecdd0cd713687cab714e
+DIST mandelbulber1.12-1.tar.gz 1179684 SHA256 75376616b52cb8dac7c7f358f4eb26f9d2fb171b9b0a54dbb25eeb57e494d382 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512 WHIRLPOOL 7b5113bc81913607a544d19e9d16f53ec8888f97584110d0b8ad545b4603582f88fdfab4260d9fc74feaaae815739ac14f4b42e045fa1d6ae86d0e72e52f77fa
+EBUILD mandelbulber-1.11.ebuild 974 SHA256 693e9915b32438390dfb4775fadf7bd3dcd5886fb44e5614358e8f7cbb602be1 SHA512 4c8e83001fce6d4f1918e5205b36c92385049dc38a7fed1ece72d60a9d70c7945049f12eeb2444f38a4935408b4840ba6a9382d6b19c5290ed51c5795c7adafc WHIRLPOOL f7426d5654e6c7d7d6277e143eff1c873c724a7642ccd84fec3d276c38576e6684e1a352120ac3efd735f335b835d0c70579c276c4619e8b4220798428aa94e8
+EBUILD mandelbulber-1.12.1.ebuild 1028 SHA256 34cf2cb673ab30dc8cd6c1baf4ea7627575d3e6efa5cf051265a645df9207662 SHA512 7efe21583ad253393121ce31f719a037da1e511227fd3d0b85616b9182f03ea7753810da9eab3efe81c7dfea307aeeef4ea5fe5ebc42bad803ff5fafb92c43f6 WHIRLPOOL a4d59268dc1a884a81d0f7b07b97c0a274506671f41b51f2124ecc22f2af29855cc5090e3d6e0f3c9bb76df627469afafe6309420563dc4f4249d5c278465907
+MISC ChangeLog 2485 SHA256 1bdcefea505970b6e921e2adc56a2f4580a956fc01c14f117227e57f49890246 SHA512 87ced8ecde86f7cd7a20087a85f5a3fb2fd390575b9d1371433b677f16275db2efb87ca2c6c14864bb55a7bc0574a0212482ad2df6704fbfe917293c206a4679 WHIRLPOOL 877f948ddcfe6692c3ad154236d02115c604cf1bf9dc7da81224f711639684fba51baaed2cdad8211f057dfd452011bac497ce9d15e5534ff33374fdce34f89a
+MISC metadata.xml 532 SHA256 945e1273aab04d3eea469cfe008697cdb27dfae1b393f02a0d2deae9011a1528 SHA512 b2f60890161612bc10cb417862fcacb23295c075f1486a3b33af5b807a7b4ac234a9a51d226bdb8e985cddd2718bd644db1d54ca942a5d7e7ce5f4dc993c5471 WHIRLPOOL 6e344ebd04c22a7996eae0a0e4ea8cc07dcdb8fcae1acfc4aa9686187136f03081b39a68f7f1e783e20260f3289644b2175cf5acc8aa54f452f96322e6a365e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQG41vAAoJEF0huFKJUZL5X7kP/ipgZ3JmtC7u0EiBpipNPu4A
+p8WBaFo6Wv4T0nFL/+MIwEEj/p0TZipBMpdNzMjhVCwAg90+rzDDUwspUMcL6gHY
+TuMZhkbzKhWpARWbdqDFeMpITS61QssZ1OyeTdWyIbOrC39YgwI0JEBhxF6D4pWA
+4z1BHFQFyfRc+6RygdBXJE+qtc4zC6uVbNWJfsV66UmCO0Ka6rr4UCfVr6sQ/sxJ
+ppg7kCPGSv6wmVhm0etOr1R0LqAcyQANojzQSsTL5mfn3rpyLPOaYX63B7y3EX5B
+50vC2BiKzb+AhRwYkwfEhN3iefGUM41Eqs9jklPkfyMeSg1pazfWeRFrlwi8FbF4
+dbkk1t2vC4GM12a69zt3f4sOtApZ8R0vmPEBlvBQGZM69gOPXyDqntS1P9hai4rt
+YGSZpzbjqVmYW7ceTZZY3kp0nYKDKoMsCqRAnfaEK7Jp10ILQ4PL7S7asU2NgApx
+/Sb1zd5JxJgiBiOXH3aO+CeeuCR2621nn7lyW++VgmVTvhggacPqv4obbgkWSErg
+gcrDJqrQ8v+ar8YPOctftyJg/V1AE3liOVLrSiyamWL8Gv5WTaehySNjXcHaFOYA
+KY2781W5ayZ7jA7ZDfuJVhJGOkMmwfnLgs3VOrBxTKejq6zHqi/u3w9tZXxkv4Fu
+BKWI9nwnDLA05FrrbLAp
+=GhUJ
+-----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
deleted file mode 100644
index 036d24539e9c..000000000000
--- a/media-gfx/mandelbulber/files/mandelbulber-1.10-qa.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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.12.1.ebuild
index f681c34db7e5..bd1fe357c33b 100644
--- a/media-gfx/mandelbulber/mandelbulber-1.10.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2012/05/05 07:00:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.1 2012/08/03 08:35:39 xarthisius Exp $
 
 EAPI=4
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs versionator
 
-MY_P=${PN}${PV}
+MY_P=${PN}$(replace_version_separator 2 '-' )
 
 DESCRIPTION="Tool to render 3D fractals"
 HOMEPAGE="http://sites.google.com/site/mandelbulber/home"
@@ -27,8 +27,7 @@ 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
+	epatch "${FILESDIR}"/${PN}-1.11-qa.patch
 }
 
 src_compile() {