Fixing file collision with sci-chemistry/psi, bug #249423.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-tuxonice i686

5 files changed, 12 insertions, 80 deletions

diff --git a/sci-visualization/extrema/ChangeLog b/sci-visualization/extrema/ChangeLog
index 88d594f3db12..ece989354bf0 100644
--- a/sci-visualization/extrema/ChangeLog
+++ b/sci-visualization/extrema/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/extrema
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/ChangeLog,v 1.4 2008/06/02 10:23:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/ChangeLog,v 1.5 2008/12/06 17:04:22 grozin Exp $
+
+  06 Dec 2008; Andrey Grozin <grozin@gentoo.org> -files/extrema-4.3.5.patch,
+  -extrema-4.3.5.ebuild, extrema-4.3.6.ebuild:
+  Fixing file collision with sci-chemistry/psi, bug #249423.
 
 *extrema-4.3.6 (02 Jun 2008)
 
diff --git a/sci-visualization/extrema/Manifest b/sci-visualization/extrema/Manifest
index 1bf05c8c7bf0..967999d73662 100644
--- a/sci-visualization/extrema/Manifest
+++ b/sci-visualization/extrema/Manifest
@@ -1,7 +1,4 @@
-AUX extrema-4.3.5.patch 451 RMD160 a5abb77650e5763157d0a42d55258b29f7befca3 SHA1 97e869c2992f409633d254c944d8237f3b6d92d9 SHA256 c2d701231c33be03e3ad43fd9114c4982259dd7bd568b053f80e59adc794ecec
-DIST extrema-4.3.5.tar.gz 6267856 RMD160 1a226a9e442f7c8007e7f9b7f8ec63e3919d2529 SHA1 ef1986293d530fc4372b32be3250e1538c2509ca SHA256 70a8db93e12c571724899f48abec5ecaf577fb039e7cb6360db0a93b7d64f433
 DIST extrema-4.3.6.tar.gz 6265714 RMD160 1572581812b5eb32c4cd328fff3f180648b125e6 SHA1 b5e55c686470dd20f26c30644def357b6d52dcb7 SHA256 5f420d9d1ba42796678a83e1a45b0285d1f383a81f27a91f2ae95f2ca97d6ba2
-EBUILD extrema-4.3.5.ebuild 1600 RMD160 188980bfba05e65bb1cd1738b8a793bea80cc137 SHA1 62f93cb1d5b6de7f277a30466223b56e45b78b7d SHA256 8fc3e57a2cb26a77fdbcb127c40ef90f58dbf725b000c88b1a33f985abd0ee84
-EBUILD extrema-4.3.6.ebuild 1526 RMD160 d220b72f272aaab52194b603afdfb6d06691a010 SHA1 ba77dca884b0cc807fe226e655fac3c02f18513d SHA256 faff878ef760b1d66d9107da3afc471fef28a1fac952e8a0031b071f79f492c9
-MISC ChangeLog 743 RMD160 6bab10ec82fa7788dd95916fdba6949685f7730f SHA1 ff45ef74fa8f41ffbb2269739255411391f4e373 SHA256 b1f39a327af754980e11457c6f722fe0f65b79cb240f66c3bcc9c7298787645f
+EBUILD extrema-4.3.6.ebuild 1558 RMD160 9a7a46d240c892e9721075993d03dc6e643cfdf1 SHA1 8b155722b3b407e3422beea3495115fe87c674a0 SHA256 abcaa90304a0dae586b8ee2036cdf763789ecf6cf9815d9346d15aa698371d90
+MISC ChangeLog 929 RMD160 65969c399971790ad10d4c390c76f1eaa8394fca SHA1 7ba1fae371e82e93d82fa8f621e7a619a1437ac4 SHA256 b1a7cc1458ec54b34bcd295e146a754359892b95e4532305215a6f8e8e2007cb
 MISC metadata.xml 575 RMD160 5caa41391cb1bc18964be1137955dfa8f78bcbc6 SHA1 4f26d103d5de06c43cf07cf2378830811d19437f SHA256 c32b9b72b2e710e3b6a23b15fd74ab5e9f2611762057425cd28ee5e4f1cc823e
diff --git a/sci-visualization/extrema/extrema-4.3.5.ebuild b/sci-visualization/extrema/extrema-4.3.5.ebuild
deleted file mode 100644
index b5fb114faea8..000000000000
--- a/sci-visualization/extrema/extrema-4.3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.3.5.ebuild,v 1.3 2008/05/15 12:21:37 rich0 Exp $
-
-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"
-DEPEND=">=x11-libs/wxGTK-2.8.7
-	dev-util/desktop-file-utils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_compile() {
-	# extrema cannot be compiled with versions of minuit
-	# available in portage
-	econf --enable-shared || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# The upstream Makefile is mostly OK, but for a few files
-	# cp to a hard-coded directory is used, ignoring $(DESTDIR)
-	# This problem is solved by einstall
-	einstall || die "einstall 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
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins Scripts/*.pcm Scripts/*.dat
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/extrema/extrema-4.3.6.ebuild b/sci-visualization/extrema/extrema-4.3.6.ebuild
index 096dab5b6a44..21cf27663019 100644
--- a/sci-visualization/extrema/extrema-4.3.6.ebuild
+++ b/sci-visualization/extrema/extrema-4.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.3.6.ebuild,v 1.1 2008/06/02 10:23:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/extrema/extrema-4.3.6.ebuild,v 1.2 2008/12/06 17:04:22 grozin Exp $
 
 WX_GTK_VER="2.8"
 inherit eutils fdo-mime wxwidgets
@@ -12,13 +12,15 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-DEPEND=">=x11-libs/wxGTK-2.8.7
+# File collision, see bug #249423
+DEPEND="!sci-chemistry/psi
+	>=x11-libs/wxGTK-2.8.7
 	dev-util/desktop-file-utils"
 
 src_compile() {
 	# extrema cannot be compiled with versions of minuit
 	# available in portage
-	econf --enable-shared || die "econf failed"
+	econf --enable-shared
 	emake || die "emake failed"
 }
 
diff --git a/sci-visualization/extrema/files/extrema-4.3.5.patch b/sci-visualization/extrema/files/extrema-4.3.5.patch
deleted file mode 100644
index dfed80a3011d..000000000000
--- a/sci-visualization/extrema/files/extrema-4.3.5.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -U2 -r extrema-4.3.5.orig/Scripts/waterpipes.pcm extrema-4.3.5/Scripts/waterpipes.pcm
---- extrema-4.3.5.orig/Scripts/waterpipes.pcm	2007-11-02 03:48:32.000000000 +0600
-+++ extrema-4.3.5/Scripts/waterpipes.pcm	2008-05-11 12:18:25.000000000 +0700
-@@ -24,5 +24,5 @@
- !
- !
--FILE = 'HOUSES.DAT'
-+FILE = 'houses.dat'
- LENGTH_GOAL = 5                       ! try to achieve this goal
- READ\-MESSAGES FILE X Y               ! read in the house positions