From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 83EE0138B38 for ; Sun, 26 Jan 2014 22:52:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 713C0E0B6C; Sun, 26 Jan 2014 22:52:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8885E0B3B for ; Sun, 26 Jan 2014 22:52:25 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C41C233F65A for ; Sun, 26 Jan 2014 22:52:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8A62918096 for ; Sun, 26 Jan 2014 22:52:23 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1390689382.d0eb8bb2c6c6ef65e7cd1abaa80a5c55e68d4e0c.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/modules/ChangeLog sys-cluster/modules/files/modules.new.sh.in sys-cluster/modules/modules-3.2.9c-r1.ebuild sys-cluster/modules/modules-3.2.9c.ebuild X-VCS-Directories: sys-cluster/modules/files/ sys-cluster/modules/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: d0eb8bb2c6c6ef65e7cd1abaa80a5c55e68d4e0c X-VCS-Branch: master Date: Sun, 26 Jan 2014 22:52:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5e3bf05-3019-47ec-b9a4-1ada5029f641 X-Archives-Hash: 6a7cb9edb1075b1b702dbc79860721cb commit: d0eb8bb2c6c6ef65e7cd1abaa80a5c55e68d4e0c Author: Nicolas Bock gmail com> AuthorDate: Sat Jan 25 22:36:22 2014 +0000 Commit: Nicolas Bock gmail 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 +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 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