Fix bug #476952

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

4 files changed, 100 insertions, 20 deletions

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 <alexxy@gentoo.org> +knem-1.1.1.ebuild,
+  +knem-9999.ebuild, -knem-1.0.0.ebuild:
+  Fix bug #476952
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> knem-1.0.0.ebuild:
   use udev.eclass to install udev rules to support virtual/udev
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index 7832d824aa98..bc9e5aad7e49 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 45-knem.rules 28 SHA256 6087f4d9ae8e629f5440d94ae0359935a4222dafb091bcb7fa9efd7f2024e80d SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b WHIRLPOOL 06625f151fd4832d3a89ea65e8b648f4bfb10123dc8434ef0c8e0f7f546f77e222a5f52a9d8665a619e47ac5c4f0e129807eb3ccbee53e670a246e6508c9cdd2
-DIST knem-1.0.0.tar.gz 294866 SHA256 2aeb295e7f7925023df803af656399b10ff6d78594c686be24b65c2f46fb1942 SHA512 5cab1078075eae1899b60e30f24c8038f6815ff97da1cd53301a8ad495c3ca4eeb2dfc43b845f0780496732abd8722d0775e4802a101707d81fe9e25cad404a0 WHIRLPOOL 4d8d3a0018750f4135e91bf5b02f16d41a542a4cb48c5efab8629509aaca7d042b08d75d7730a13562b594900d8a523393b73079a8cf2db3d8baeb4fa3a07a84
-EBUILD knem-1.0.0.ebuild 1545 SHA256 93fe84eb2f51223714b1f92c7857357bb12f9fa542415e19ed2e8a3c7f8f84ea SHA512 bcff19cc6ca22d91499a517dae75a46a07bf0e408f457039aae0448a92a339b5db3108fa6c40d0ab4fb5235ca00754557c7a8859d13e8467f12b59b597f2b00c WHIRLPOOL 6f645c9302a3ef4c4a5ca913593df38bb631515151332e2f5beeb8bbb12464252aa2f345511fbfa8d97a740cb3e9df7fbb7be4eb4c667963219790536c86f4cf
-MISC ChangeLog 1072 SHA256 c34459fd7b6d49dce78cc9b25d8cd2b96838e9c7c5722bad8019909c4b7e0ab9 SHA512 97581489166f6f6a465abdc2f784c3eb52529073b748711e1030f14c17cdd8b9364d9a60ac7df41ffcdfd182b4f5bd93f714bd0a01abb458ebcda268e474aa3c WHIRLPOOL 4d5d283a9306ddf666a36e95fb19e1dcd54a1a6325ff04a7b6f2ca7c9ca94b09efa2bd97d817fd8979b3ee0f8baee1723e3ba22a4da157992510d2c3d43629d6
+DIST knem-1.1.1.tar.gz 321401 SHA256 4bfbb4c237022cfebbe6b80c9d181252ee3a09cd42bc9dd1e90a81575fbbbef6 SHA512 6b53748df8ffcfa400870657d5c121f51e132d2b724bca832b00d7c16c546299d1dd29739fe1d4b00cc33010558ae584e7c0078de2c56d8ea92ce7880b4bfedc WHIRLPOOL 74908664d734d880082e35ec5707887dd17745b0edc161926906fcab9767bdc59d98bd710463188a6d73da781265d8ab83a8dd15beae57058455e734480a46d5
+EBUILD knem-1.1.1.ebuild 1677 SHA256 73fd56c2026762455f17c909664ca697b37ef660b864da37c6a72f5dd2b6976d SHA512 f7ca9bd8805cea303b07394eddf92a4099543f19b6e51cdfd22357bb0f12ed8b26ec5ab80e94516618dde474c581c04d48c2fc50e294aa3eca5158bea2a48859 WHIRLPOOL 3077b13fd8befd9834a4d4a1fb9747c53fee6b1ed316da4712d2fc48c7649b2192c0af2a9f8eff81d0851a598f446a39f41e306e11b38ba7b942931a8d1b5d16
+EBUILD knem-9999.ebuild 1676 SHA256 7bce519cba19e7891dc9daa9723918b0eb4c77618ce58834652a95c34195e598 SHA512 f587823eea36ea331709322115b6855cc1154d317657d91f64b82d98bab1cd632b6f7f39ffa93d6817453544fbe6abffed645b0261808bc5b31ad4d29d02f5ac WHIRLPOOL e1ae198cd67322edff9567701cd36c5877caa5e7d462dbb82478d2d1b4dc6c1d4d15c44b6037bde9fa270cf7cf0337df33db822fad1cc0d74c9466ac316bb9dd
+MISC ChangeLog 1258 SHA256 6762dc38524d2644e602ffe7c99a9276629888ee51dd6d1f8ee81b582868e571 SHA512 6cc0160fe538d5bbb7164253fc5ee802fa64131f7677ae01028677f81322e07fcc4673f873f4b44c6e3f32193b0cbfa9207bec62c8865f0323117e040bfac14c WHIRLPOOL 5a60f245ed260ed5ba840c42d7604f82d1c2a61da2da9e885fd3174272b1b556bb601cc64217b00109ae4570fbbb39ecebf7a1b57dd76ffa6e15ca8ad60baf5a
 MISC metadata.xml 256 SHA256 c2578751d289276468e4ab84773d4bb935f059a2e0e6a3416e3d3ef311d206e6 SHA512 66aff02da29fccdac73f63c790cfdeb89d4b9f925934391b43631f0b61a339a356b89bb9e97373c72b6da56b612833ef087d3185b0dced088ef64372dc822b63 WHIRLPOOL 21c91590cfe5bac3ddbc3ee931ef11b81c350abfb0bc496f8605e86fe227d3b76aaa4c8c8793ae2a643b5d47627876c08cd7ab5249edfdfc39300022c1015272
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlDHd6EACgkQ2ugaI38ACPBz/AD/fd6pqY/pgdFFn/DBbXHm4Lyb
-1jtCButLZQE0vncOOcsA/2MXazXitKH9FWoYrWV5Id5Qi4F4yULScQoynG8+tX71
-=23bl
------END PGP SIGNATURE-----
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-1.0.0.ebuild b/sys-cluster/knem/knem-9999.ebuild
index 15ab78e7ac0c..c7bb9b8157ea 100644
--- a/sys-cluster/knem/knem-1.0.0.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.0.ebuild,v 1.2 2012/12/11 18:12:34 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-9999.ebuild,v 1.1 2014/04/03 05:06:49 alexxy Exp $
 
-EAPI=4
+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/"
-SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz"
+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"
-KEYWORDS="~amd64 ~x86"
 IUSE="debug modules"
 
 DEPEND="