From c3cad13ce095c8e3867590d1d6a8fb19e72fa53c Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Thu, 3 Apr 2014 05:06:49 +0000 Subject: Fix bug #476952 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F82F92E6) --- sys-cluster/knem/ChangeLog | 11 +++++- sys-cluster/knem/knem-1.0.0.ebuild | 70 ----------------------------------- sys-cluster/knem/knem-1.1.1.ebuild | 76 ++++++++++++++++++++++++++++++++++++++ sys-cluster/knem/knem-9999.ebuild | 76 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 72 deletions(-) delete mode 100644 sys-cluster/knem/knem-1.0.0.ebuild create mode 100644 sys-cluster/knem/knem-1.1.1.ebuild create mode 100644 sys-cluster/knem/knem-9999.ebuild (limited to 'sys-cluster/knem') diff --git a/sys-cluster/knem/ChangeLog b/sys-cluster/knem/ChangeLog index 55bd4c113583..b2887fbb380e 100644 --- a/sys-cluster/knem/ChangeLog +++ b/sys-cluster/knem/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/knem -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/ChangeLog,v 1.6 2012/12/11 18:12:34 axs Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/ChangeLog,v 1.7 2014/04/03 05:06:49 alexxy Exp $ + +*knem-9999 (03 Apr 2014) +*knem-1.1.1 (03 Apr 2014) + + 03 Apr 2014; Alexey Shvetsov +knem-1.1.1.ebuild, + +knem-9999.ebuild, -knem-1.0.0.ebuild: + Fix bug #476952 11 Dec 2012; Ian Stakenvicius knem-1.0.0.ebuild: use udev.eclass to install udev rules to support virtual/udev diff --git a/sys-cluster/knem/knem-1.0.0.ebuild b/sys-cluster/knem/knem-1.0.0.ebuild deleted file mode 100644 index 15ab78e7ac0c..000000000000 --- a/sys-cluster/knem/knem-1.0.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-1.0.0.ebuild,v 1.2 2012/12/11 18:12:34 axs Exp $ - -EAPI=4 - -inherit autotools linux-mod linux-info toolchain-funcs udev multilib - -DESCRIPTION="High-Performance Intra-Node MPI Communication" -HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/" -SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug modules" - -DEPEND=" - sys-apps/hwloc - virtual/linux-sources" -RDEPEND=" - sys-apps/hwloc - virtual/modutils" - -MODULE_NAMES="knem(misc:${S}/driver/linux)" -BUILD_TARGETS="all" -BUILD_PARAMS="KDIR=${KERNEL_DIR}" - -pkg_setup() { - linux-info_pkg_setup - linux-mod_pkg_setup - ARCH="$(tc-arch-kernel)" - ABI="${KERNEL_ABI}" -} - -src_prepare() { - sed 's:driver/linux::g' -i Makefile.am - eautoreconf -} - -src_configure() { - econf \ - --enable-hwloc \ - --with-linux="${KERNEL_DIR}" \ - --with-linux-release=${KV_FULL} \ - $(use_enable debug) -} - -src_compile() { - default - if use modules; then - cd "${S}/driver/linux" - linux-mod_src_compile || die "failed to build driver" - fi -} - -src_install() { - default - if use modules; then - cd "${S}/driver/linux" - linux-mod_src_install || die "failed to install driver" - fi - - # Drop funny unneded stuff - rm "${ED}/usr/sbin/knem_local_install" || die - rmdir "${ED}/usr/sbin" || die - # install udev rules - udev_dorules "${FILESDIR}/45-knem.rules" - rm "${ED}/etc/10-knem.rules" || die -} diff --git a/sys-cluster/knem/knem-1.1.1.ebuild b/sys-cluster/knem/knem-1.1.1.ebuild new file mode 100644 index 000000000000..2d7c1b102554 --- /dev/null +++ b/sys-cluster/knem/knem-1.1.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-1.1.1.ebuild,v 1.1 2014/04/03 05:06:49 alexxy Exp $ + +EAPI=5 + +inherit autotools linux-mod linux-info toolchain-funcs udev multilib + +DESCRIPTION="High-Performance Intra-Node MPI Communication" +HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git" + inherit git-2 + KEYWORDS="" +else + SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="debug modules" + +DEPEND=" + sys-apps/hwloc + virtual/linux-sources" +RDEPEND=" + sys-apps/hwloc + virtual/modutils" + +MODULE_NAMES="knem(misc:${S}/driver/linux)" +BUILD_TARGETS="all" +BUILD_PARAMS="KDIR=${KERNEL_DIR}" + +pkg_setup() { + linux-info_pkg_setup + linux-mod_pkg_setup + ARCH="$(tc-arch-kernel)" + ABI="${KERNEL_ABI}" +} + +src_prepare() { + sed 's:driver/linux::g' -i Makefile.am + eautoreconf +} + +src_configure() { + econf \ + --enable-hwloc \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-release=${KV_FULL} \ + $(use_enable debug) +} + +src_compile() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_compile || die "failed to build driver" + fi +} + +src_install() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_install || die "failed to install driver" + fi + + # Drop funny unneded stuff + rm "${ED}/usr/sbin/knem_local_install" || die + rmdir "${ED}/usr/sbin" || die + # install udev rules + udev_dorules "${FILESDIR}/45-knem.rules" + rm "${ED}/etc/10-knem.rules" || die +} diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild new file mode 100644 index 000000000000..c7bb9b8157ea --- /dev/null +++ b/sys-cluster/knem/knem-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-9999.ebuild,v 1.1 2014/04/03 05:06:49 alexxy Exp $ + +EAPI=5 + +inherit autotools linux-mod linux-info toolchain-funcs udev multilib + +DESCRIPTION="High-Performance Intra-Node MPI Communication" +HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git" + inherit git-2 + KEYWORDS="" +else + SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="debug modules" + +DEPEND=" + sys-apps/hwloc + virtual/linux-sources" +RDEPEND=" + sys-apps/hwloc + virtual/modutils" + +MODULE_NAMES="knem(misc:${S}/driver/linux)" +BUILD_TARGETS="all" +BUILD_PARAMS="KDIR=${KERNEL_DIR}" + +pkg_setup() { + linux-info_pkg_setup + linux-mod_pkg_setup + ARCH="$(tc-arch-kernel)" + ABI="${KERNEL_ABI}" +} + +src_prepare() { + sed 's:driver/linux::g' -i Makefile.am + eautoreconf +} + +src_configure() { + econf \ + --enable-hwloc \ + --with-linux="${KERNEL_DIR}" \ + --with-linux-release=${KV_FULL} \ + $(use_enable debug) +} + +src_compile() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_compile || die "failed to build driver" + fi +} + +src_install() { + default + if use modules; then + cd "${S}/driver/linux" + linux-mod_src_install || die "failed to install driver" + fi + + # Drop funny unneded stuff + rm "${ED}/usr/sbin/knem_local_install" || die + rmdir "${ED}/usr/sbin" || die + # install udev rules + udev_dorules "${FILESDIR}/45-knem.rules" + rm "${ED}/etc/10-knem.rules" || die +} -- cgit v1.2.3-65-gdbad