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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 28 insertions, 65 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/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
+ {