| 1 |
commit: 6f1eb5a6096997c71b82296f509d564c2e42c48f |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 31 10:08:56 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 31 10:08:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6f1eb5a6 |
| 7 |
|
| 8 |
sci-chemistry/nmrpipe: Version Bump, bring x11-libs/xview back into the game |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/nmrpipe/ChangeLog | 16 ++++++++++++++++ |
| 14 |
...1.33-lib.patch => 7.5.2012.204.11.07-lib.patch} | 0 |
| 15 |
...33.ebuild => nmrpipe-7.5.2012.204.11.07.ebuild} | 7 ++++--- |
| 16 |
3 files changed, 20 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog |
| 19 |
index 5e2b18b..87651f3 100644 |
| 20 |
--- a/sci-chemistry/nmrpipe/ChangeLog |
| 21 |
+++ b/sci-chemistry/nmrpipe/ChangeLog |
| 22 |
@@ -2,6 +2,22 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 31 Jul 2012; Justin Lecher <jlec@g.o> |
| 27 |
+ +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch, |
| 28 |
+ -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: |
| 29 |
+ Version Bump, bring x11-libs/xview back into the game |
| 30 |
+ |
| 31 |
+ 31 Jul 2012; Justin Lecher <jlec@g.o> |
| 32 |
+ +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch, |
| 33 |
+ -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: |
| 34 |
+ Version Bump, bring x11-libs/xview back into the game |
| 35 |
+ |
| 36 |
+*nmrpipe-7.5.2012.204.11.07 (31 Jul 2012) |
| 37 |
+ |
| 38 |
+ 31 Jul 2012; Justin Lecher <jlec@g.o> |
| 39 |
+ -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild: |
| 40 |
+ Version Bump, bring x11-libs/xview back into the game |
| 41 |
+ |
| 42 |
02 May 2012; Justin Lecher <jlec@g.o> |
| 43 |
+files/7.3.2012.114.11.33-lib.patch, -files/7.1.2012.029.12.03-lib.patch, |
| 44 |
-nmrpipe-7.1.2012.029.12.03.ebuild, +nmrpipe-7.3.2012.114.11.33.ebuild: |
| 45 |
|
| 46 |
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 |
| 47 |
similarity index 100% |
| 48 |
rename from sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch |
| 49 |
rename to sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch |
| 50 |
|
| 51 |
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 |
| 52 |
similarity index 98% |
| 53 |
rename from sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild |
| 54 |
rename to sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild |
| 55 |
index 16a9988..7d84f8a 100644 |
| 56 |
--- a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild |
| 57 |
+++ b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild |
| 58 |
@@ -4,7 +4,7 @@ |
| 59 |
|
| 60 |
# Versioning is output of nmrPipe -help |
| 61 |
|
| 62 |
-EAPI=3 |
| 63 |
+EAPI=4 |
| 64 |
|
| 65 |
inherit eutils prefix virtualx |
| 66 |
|
| 67 |
@@ -39,13 +39,14 @@ RDEPEND="${DEPEND} |
| 68 |
sys-libs/ncurses |
| 69 |
x11-apps/xset |
| 70 |
x11-libs/libX11 |
| 71 |
+ x11-libs/xview |
| 72 |
amd64? ( |
| 73 |
app-emulation/emul-linux-x86-baselibs |
| 74 |
app-emulation/emul-linux-x86-xlibs |
| 75 |
)" |
| 76 |
-# x86? ( x11-libs/xview )" |
| 77 |
|
| 78 |
S="${WORKDIR}" |
| 79 |
+ |
| 80 |
NMRBASE="/opt/${PN}" |
| 81 |
ENMRBASE="${EPREFIX}/${NMRBASE}" |
| 82 |
|
| 83 |
@@ -126,7 +127,7 @@ src_install() { |
| 84 |
nmrbin.{linux,mac,sgi6x,sol,winxp} nmruser format \ |
| 85 |
|| die "Failed to remove unnecessary libraries." |
| 86 |
# As long as xview is not fixed for amd64 we do this |
| 87 |
- #use amd64 || rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} |
| 88 |
+ rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} || die |
| 89 |
# Remove the initialisation script generated during the installation. |
| 90 |
# It contains incorrect hardcoded paths; only the "nmrInit.com" script |
| 91 |
# should be used. |
Archives