Version bump. Fix building with gcc-4.6 wrt #363467 by Diego Elio Pettenò <flameeyes@gentoo.org>. Drop old.

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

5 files changed, 44 insertions, 70 deletions

diff --git a/sci-visualization/extrema/ChangeLog b/sci-visualization/extrema/ChangeLog
index 0c7e3191109e..decdd47d06fc 100644
--- a/sci-visualization/extrema/ChangeLog
+++ b/sci-visualization/extrema/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/extrema
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/ChangeLog,v 1.8 2010/02/10 16:50:34 grozin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/ChangeLog,v 1.9 2011/04/13 12:24:06 xarthisius Exp $
+
+*extrema-4.4.5 (13 Apr 2011)
+
+  13 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> -extrema-4.4.2.ebuild,
+  -extrema-4.4.3.ebuild, +extrema-4.4.5.ebuild,
+  +files/extrema-4.4.5-gcc46.patch:
+  Version bump. Fix building with gcc-4.6 wrt #363467 by Diego Elio Pettenò
+  <flameeyes@gentoo.org>. Drop old.
 
 *extrema-4.4.3 (10 Feb 2010)
 
diff --git a/sci-visualization/extrema/Manifest b/sci-visualization/extrema/Manifest
index 338f2549a292..d0f72b001429 100644
--- a/sci-visualization/extrema/Manifest
+++ b/sci-visualization/extrema/Manifest
@@ -1,6 +1,17 @@
-DIST extrema-4.4.2.tar.gz 6296570 RMD160 2121cf3f3229929556d367ba91f0e8d5db8212bf SHA1 19e0e340d622dd1cc29d6d0677f9afa3144bebd1 SHA256 5321df338e4fa604b1e1f8ac59bb6998858ae9ec7f2afac17bed65fdee02a108
-DIST extrema-4.4.3.tar.gz 6314563 RMD160 5d0c7a5637a478931d9e8fcc58d223a315790e51 SHA1 adc66b7383f170ae7f2c02f11ffb12a908b240c8 SHA256 931eba6913486adee53341eb326bae4579d38d90e06436cd18ca740602cc2f1e
-EBUILD extrema-4.4.2.ebuild 1510 RMD160 2cc86c3b4850f786b63e801c290ba26baf37d6c0 SHA1 711dca7ca0e6276cb8a2480ab9b5820922ff42d1 SHA256 978d63544cdf6320358043a7560b555ce53c083e3c3b3f81ecb205b84597d056
-EBUILD extrema-4.4.3.ebuild 1508 RMD160 04065d9240aa83db417cabd0b314911c642f2f99 SHA1 864d91153782ac531ee6ebd282643d86991eda06 SHA256 806e39d2aaef62c44831432334b2c6a4e2b25172e3a01650b3ea590a17977102
-MISC ChangeLog 1325 RMD160 5e34f74b0c235fc881b4e853669bf0bb7a24fec9 SHA1 62afd9a0b2dc58e02ca54028792acaa482ca0372 SHA256 3dbdbc4fe365e32ec05d6229c28601b934dc87cb1a3319e664ea2073bf6b7556
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX extrema-4.4.5-gcc46.patch 357 RMD160 f913f082ce19c262caabdecb0a67891c92330658 SHA1 05ae932db019f91357de54f2bed6c385986050b1 SHA256 f0ea5a6da50f1e4b9f6d2a553ab17608aaed6a623efff88c38f4f45304bad125
+DIST extrema-4.4.5.tar.gz 6536157 RMD160 80aac9925fb9a8ce8d68ad2712f14435bc463b89 SHA1 2048df89f5c4282b2ff3cdab33293aed546f711a SHA256 ce648d6531c3d55501078073e08a18d70e880b6329b5b168a59db5213d048491
+EBUILD extrema-4.4.5.ebuild 1551 RMD160 d80aa6c726a2e1e0755227e9692999c751b9c020 SHA1 6348526512342a4cfb7c957e44821fd246b9a2ee SHA256 39b42ee25c3a4349dced1e0d3e515f765f52fe1ee096fa9f0417fd5c2a60d7aa
+MISC ChangeLog 1634 RMD160 88737e3dcd29a320ee461cd22cb65ec5c13e15f9 SHA1 68ac9ed5bc3d851a648de3ea31cdf5f35e3a2d7c SHA256 1de40d95ecd6ec84c37d1f1c9f9cda0f03b74bd43a6a061f91039c77d522e61e
 MISC metadata.xml 575 RMD160 5caa41391cb1bc18964be1137955dfa8f78bcbc6 SHA1 4f26d103d5de06c43cf07cf2378830811d19437f SHA256 c32b9b72b2e710e3b6a23b15fd74ab5e9f2611762057425cd28ee5e4f1cc823e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk2llewACgkQIiMqcbOVdxQDugP/dL5njd0v/fsIjikDFpUHRLZx
+/ZCWE6UaBXx03lsw8G4QQZ0tk4sQn+mCIQjtX9/1jZWOhegwKwiUpgrycn/GdPCm
+VMsEUZK3D6kQ5svnxDehOXVXDmNNLt1blrbFKSPqTgyqvmrpywAsN4Ly2TwdQOPY
+prBRTc/qWZuLhyrNNRU=
+=pz1/
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/extrema/extrema-4.4.3.ebuild b/sci-visualization/extrema/extrema-4.4.3.ebuild
deleted file mode 100644
index 266b6cefa728..000000000000
--- a/sci-visualization/extrema/extrema-4.4.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.4.3.ebuild,v 1.1 2010/02/10 16:50:34 grozin Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-inherit eutils fdo-mime wxwidgets
-
-DESCRIPTION="Interactive data analysis and visualization tool"
-HOMEPAGE="http://exsitewebware.com/extrema/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-# File collision, see bug #249423
-RDEPEND="!sci-chemistry/psi
-	>=x11-libs/wxGTK-2.8.7
-	dev-util/desktop-file-utils"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's/$(pkgdatadir)/$(DESTDIR)$(pkgdatadir)/g' \
-		src/Makefile.in || die
-}
-
-src_configure() {
-	# extrema cannot be compiled with versions of minuit
-	# available in portage
-	econf --enable-shared
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	make_desktop_entry ${PN}
-	dodir /usr/share/icons/hicolor
-	tar xjf extrema_icons.tar.bz2 -C "${D}usr/share/icons/hicolor"
-	dosym /usr/share/icons/hicolor/48x48/apps/extrema.png /usr/share/pixmaps/extrema.png
-
-	dodoc AUTHORS ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins Scripts/*.pcm Scripts/*.dat || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/extrema/extrema-4.4.2.ebuild b/sci-visualization/extrema/extrema-4.4.5.ebuild
index 11f97cf92613..9b2f6edff10f 100644
--- a/sci-visualization/extrema/extrema-4.4.2.ebuild
+++ b/sci-visualization/extrema/extrema-4.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.4.2.ebuild,v 1.2 2010/01/07 02:06:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.4.5.ebuild,v 1.1 2011/04/13 12:24:06 xarthisius Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
@@ -24,6 +24,7 @@ src_prepare() {
 	sed -i \
 		-e 's/$(pkgdatadir)/$(DESTDIR)$(pkgdatadir)/g' \
 		src/Makefile.in || die
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_configure() {
diff --git a/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch b/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch
new file mode 100644
index 000000000000..45a80429264b
--- /dev/null
+++ b/sci-visualization/extrema/files/extrema-4.4.5-gcc46.patch
@@ -0,0 +1,15 @@
+Fix building with gcc-4.6
+
+https://bugs.gentoo.org/show_bug.cgi?id=363467
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/src/Graphics/GRA_thiessenTriangulation.h
++++ b/src/Graphics/GRA_thiessenTriangulation.h
+@@ -19,6 +19,7 @@
+ #define GRA_THIESSENTRIANGULATION
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class GRA_thiessenTriangulation
+ {