3 files changed, 17 insertions, 75 deletions
diff --git a/sys-cluster/knem/ChangeLog b/sys-cluster/knem/ChangeLog
index 2f87cc0e9446..ad56d7705fde 100644
--- a/sys-cluster/knem/ChangeLog
+++ b/sys-cluster/knem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2012/04/29 13:00:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/ChangeLog,v 1.5 2012/10/12 10:44:12 alexxy Exp $
+
+*knem-1.0.0 (12 Oct 2012)
+
+  12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> +knem-1.0.0.ebuild,
+  -knem-0.9.7.ebuild, -knem-0.9.8.ebuild:
+  [sys-cluster/knem] Version bump
 
 *knem-0.9.8 (29 Apr 2012)
 
@@ -18,4 +24,3 @@
   20 Jan 2012; Alexey Shvetsov <alexxy@gentoo.org> +files/45-knem.rules,
   +knem-0.9.7.ebuild, +metadata.xml:
   Initial import
-
diff --git a/sys-cluster/knem/knem-0.9.8.ebuild b/sys-cluster/knem/knem-0.9.8.ebuild
deleted file mode 100644
index 0b2544d7bbde..000000000000
--- a/sys-cluster/knem/knem-0.9.8.ebuild
+++ /dev/null
@@ -1,69 +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-0.9.8.ebuild,v 1.1 2012/04/29 13:00:11 alexxy Exp $
-
-EAPI=4
-
-inherit autotools linux-mod 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-mod_pkg_setup
-}
-
-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
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	doins "${FILESDIR}/45-knem.rules" || die
-	rm "${ED}/etc/10-knem.rules" || die
-}
diff --git a/sys-cluster/knem/knem-0.9.7.ebuild b/sys-cluster/knem/knem-1.0.0.ebuild
index 6f8660ccfe9b..309721d8572a 100644
--- a/sys-cluster/knem/knem-0.9.7.ebuild
+++ b/sys-cluster/knem/knem-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # 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-0.9.7.ebuild,v 1.2 2012/02/25 06:29:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/knem/knem-1.0.0.ebuild,v 1.1 2012/10/12 10:44:12 alexxy Exp $
 
 EAPI=4
 
-inherit autotools linux-mod multilib
+inherit autotools linux-mod linux-info toolchain-funcs multilib
 
 DESCRIPTION="High-Performance Intra-Node MPI Communication"
 HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/"
@@ -27,7 +27,10 @@ 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() {
@@ -62,8 +65,11 @@ src_install() {
 	rm "${ED}/usr/sbin/knem_local_install" || die
 	rmdir "${ED}/usr/sbin" || die
 	# install udev rules
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
+	local udevdir=/lib/udev
+	if has_version sys-fs/udev ; then
+		udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	fi
+	insinto "${udevdir}/rules.d"
 	doins "${FILESDIR}/45-knem.rules" || die
 	rm "${ED}/etc/10-knem.rules" || die
 }