[gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/

["Nicolas Bock" <nicolasbock@gmail.com>]

commit:     d0eb8bb2c6c6ef65e7cd1abaa80a5c55e68d4e0c
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 22:36:22 2014 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Sat Jan 25 22:36:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d0eb8bb2

sys-cluster/modules: EAPI bump of older packages.

I have also added a new version of files/modules.sh which fixes a problem with
/etc/init.d/xdm. The new file is not used yet in the ebuild, as I am waiting
for review.

Package-Manager: portage-2.2.7

---
 sys-cluster/modules/ChangeLog                | 8 +++++++-
 sys-cluster/modules/files/modules.new.sh.in  | 8 ++++++++
 sys-cluster/modules/modules-3.2.9c-r1.ebuild | 4 ++--
 sys-cluster/modules/modules-3.2.9c.ebuild    | 4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/modules/ChangeLog b/sys-cluster/modules/ChangeLog
index 02fb6c6..39178a5 100644
--- a/sys-cluster/modules/ChangeLog
+++ b/sys-cluster/modules/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sys-cluster/modules
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jan 2014; Nicolas Bock <nicolasbock@gentoo.org> +files/modules.new.sh.in,
+  modules-3.2.9c-r1.ebuild, modules-3.2.9c.ebuild:
+  sys-cluster/modules: EAPI bump of older packages.  I have also added a new
+  version of files/modules.sh which fixes a problem with /etc/init.d/xdm. The
+  new file is not used yet in the ebuild, as I am waiting for review.
+
   13 Dec 2013; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml:
   sys-cluster/modules: Updated maintainer email to gentoo.org
 

diff --git a/sys-cluster/modules/files/modules.new.sh.in b/sys-cluster/modules/files/modules.new.sh.in
new file mode 100644
index 0000000..aceb1ba
--- /dev/null
+++ b/sys-cluster/modules/files/modules.new.sh.in
@@ -0,0 +1,8 @@
+shell=$(basename $(ps -p $$ -ocomm=))
+if [ -f @EPREFIX@/usr/share/Modules/init/${shell} ]
+then
+  . @EPREFIX@/usr/share/Modules/init/${shell}
+elif [ -f @PREFIX@/usr/share/Modules/init/${shell} ]
+then
+  . @PREFIX@/usr/share/Modules/init/sh
+fi

diff --git a/sys-cluster/modules/modules-3.2.9c-r1.ebuild b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
index b063785..cb1d3e4 100644
--- a/sys-cluster/modules/modules-3.2.9c-r1.ebuild
+++ b/sys-cluster/modules/modules-3.2.9c-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit autotools-utils
 

diff --git a/sys-cluster/modules/modules-3.2.9c.ebuild b/sys-cluster/modules/modules-3.2.9c.ebuild
index 4afb57c..dddc4be 100644
--- a/sys-cluster/modules/modules-3.2.9c.ebuild
+++ b/sys-cluster/modules/modules-3.2.9c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit autotools-utils