[gentoo-commits] proj/sci:master commit in: sci-chemistry/nmrpipe/, sci-chemistry/nmrpipe/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     6f1eb5a6096997c71b82296f509d564c2e42c48f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 10:08:56 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 10:08:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6f1eb5a6

sci-chemistry/nmrpipe: Version Bump, bring x11-libs/xview back into the game

(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 sci-chemistry/nmrpipe/ChangeLog                    |   16 ++++++++++++++++
 ...1.33-lib.patch => 7.5.2012.204.11.07-lib.patch} |    0
 ...33.ebuild => nmrpipe-7.5.2012.204.11.07.ebuild} |    7 ++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 5e2b18b..87651f3 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch,
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch,
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
+*nmrpipe-7.5.2012.204.11.07 (31 Jul 2012)
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
   02 May 2012; Justin Lecher <jlec@gentoo.org>
   +files/7.3.2012.114.11.33-lib.patch, -files/7.1.2012.029.12.03-lib.patch,
   -nmrpipe-7.1.2012.029.12.03.ebuild, +nmrpipe-7.3.2012.114.11.33.ebuild:

diff --git a/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch b/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch
similarity index 100%
rename from sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch
rename to sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch

diff --git a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild
similarity index 98%
rename from sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild
rename to sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild
index 16a9988..7d84f8a 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild
@@ -4,7 +4,7 @@
 
 # Versioning is output of nmrPipe -help
 
-EAPI=3
+EAPI=4
 
 inherit eutils prefix virtualx
 
@@ -39,13 +39,14 @@ RDEPEND="${DEPEND}
 	sys-libs/ncurses
 	x11-apps/xset
 	x11-libs/libX11
+	x11-libs/xview
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs
 	)"
-#	x86? ( x11-libs/xview )"
 
 S="${WORKDIR}"
+
 NMRBASE="/opt/${PN}"
 ENMRBASE="${EPREFIX}/${NMRBASE}"
 
@@ -126,7 +127,7 @@ src_install() {
 		nmrbin.{linux,mac,sgi6x,sol,winxp} nmruser format \
 		|| die "Failed to remove unnecessary libraries."
 	# As long as xview is not fixed for amd64 we do this
-	#use amd64 || rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*}
+	rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} || die
 	# Remove the initialisation script generated during the installation.
 	# It contains incorrect hardcoded paths; only the "nmrInit.com" script
 	# should be used.