| 1 |
commit: d0eb8bb2c6c6ef65e7cd1abaa80a5c55e68d4e0c |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 25 22:36:22 2014 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Jan 25 22:36:22 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d0eb8bb2 |
| 7 |
|
| 8 |
sys-cluster/modules: EAPI bump of older packages. |
| 9 |
|
| 10 |
I have also added a new version of files/modules.sh which fixes a problem with |
| 11 |
/etc/init.d/xdm. The new file is not used yet in the ebuild, as I am waiting |
| 12 |
for review. |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.7 |
| 15 |
|
| 16 |
--- |
| 17 |
sys-cluster/modules/ChangeLog | 8 +++++++- |
| 18 |
sys-cluster/modules/files/modules.new.sh.in | 8 ++++++++ |
| 19 |
sys-cluster/modules/modules-3.2.9c-r1.ebuild | 4 ++-- |
| 20 |
sys-cluster/modules/modules-3.2.9c.ebuild | 4 ++-- |
| 21 |
4 files changed, 19 insertions(+), 5 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-cluster/modules/ChangeLog b/sys-cluster/modules/ChangeLog |
| 24 |
index 02fb6c6..39178a5 100644 |
| 25 |
--- a/sys-cluster/modules/ChangeLog |
| 26 |
+++ b/sys-cluster/modules/ChangeLog |
| 27 |
@@ -1,7 +1,13 @@ |
| 28 |
# ChangeLog for sys-cluster/modules |
| 29 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
# $Header: $ |
| 32 |
|
| 33 |
+ 25 Jan 2014; Nicolas Bock <nicolasbock@g.o> +files/modules.new.sh.in, |
| 34 |
+ modules-3.2.9c-r1.ebuild, modules-3.2.9c.ebuild: |
| 35 |
+ sys-cluster/modules: EAPI bump of older packages. I have also added a new |
| 36 |
+ version of files/modules.sh which fixes a problem with /etc/init.d/xdm. The |
| 37 |
+ new file is not used yet in the ebuild, as I am waiting for review. |
| 38 |
+ |
| 39 |
13 Dec 2013; Nicolas Bock <nicolasbock@g.o> metadata.xml: |
| 40 |
sys-cluster/modules: Updated maintainer email to gentoo.org |
| 41 |
|
| 42 |
|
| 43 |
diff --git a/sys-cluster/modules/files/modules.new.sh.in b/sys-cluster/modules/files/modules.new.sh.in |
| 44 |
new file mode 100644 |
| 45 |
index 0000000..aceb1ba |
| 46 |
--- /dev/null |
| 47 |
+++ b/sys-cluster/modules/files/modules.new.sh.in |
| 48 |
@@ -0,0 +1,8 @@ |
| 49 |
+shell=$(basename $(ps -p $$ -ocomm=)) |
| 50 |
+if [ -f @EPREFIX@/usr/share/Modules/init/${shell} ] |
| 51 |
+then |
| 52 |
+ . @EPREFIX@/usr/share/Modules/init/${shell} |
| 53 |
+elif [ -f @PREFIX@/usr/share/Modules/init/${shell} ] |
| 54 |
+then |
| 55 |
+ . @PREFIX@/usr/share/Modules/init/sh |
| 56 |
+fi |
| 57 |
|
| 58 |
diff --git a/sys-cluster/modules/modules-3.2.9c-r1.ebuild b/sys-cluster/modules/modules-3.2.9c-r1.ebuild |
| 59 |
index b063785..cb1d3e4 100644 |
| 60 |
--- a/sys-cluster/modules/modules-3.2.9c-r1.ebuild |
| 61 |
+++ b/sys-cluster/modules/modules-3.2.9c-r1.ebuild |
| 62 |
@@ -1,8 +1,8 @@ |
| 63 |
-# Copyright 1999-2013 Gentoo Foundation |
| 64 |
+# Copyright 1999-2014 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
# $Header: $ |
| 67 |
|
| 68 |
-EAPI=4 |
| 69 |
+EAPI=5 |
| 70 |
|
| 71 |
inherit autotools-utils |
| 72 |
|
| 73 |
|
| 74 |
diff --git a/sys-cluster/modules/modules-3.2.9c.ebuild b/sys-cluster/modules/modules-3.2.9c.ebuild |
| 75 |
index 4afb57c..dddc4be 100644 |
| 76 |
--- a/sys-cluster/modules/modules-3.2.9c.ebuild |
| 77 |
+++ b/sys-cluster/modules/modules-3.2.9c.ebuild |
| 78 |
@@ -1,8 +1,8 @@ |
| 79 |
-# Copyright 1999-2012 Gentoo Foundation |
| 80 |
+# Copyright 1999-2014 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
# $Header: $ |
| 83 |
|
| 84 |
-EAPI=4 |
| 85 |
+EAPI=5 |
| 86 |
|
| 87 |
inherit autotools-utils |
Archives