punt old, still hardcoding /etc/udev as rules path

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 12 insertions, 167 deletions

diff --git a/sys-infiniband/ofed/ChangeLog b/sys-infiniband/ofed/ChangeLog
index 571d9bd92bd9..d173f631e267 100644
--- a/sys-infiniband/ofed/ChangeLog
+++ b/sys-infiniband/ofed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-infiniband/ofed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.8 2012/12/11 19:19:44 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.9 2012/12/11 21:36:58 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> -ofed-1.5.4.1.ebuild:
+  old
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> ofed-1.5.4.1-r1.ebuild,
   ofed-3.5.ebuild:
diff --git a/sys-infiniband/ofed/Manifest b/sys-infiniband/ofed/Manifest
index 7eb6027720da..c9b6e44e3278 100644
--- a/sys-infiniband/ofed/Manifest
+++ b/sys-infiniband/ofed/Manifest
@@ -9,14 +9,17 @@ AUX openib.modprobe 350 SHA256 32054c7ee7caffc21ed320a9be5d0c2cd85e51295c0515521
 DIST OFED-1.5.4.1.tgz 77942614 SHA256 aeeea9b1173bf7b35d70307467824252e09b2dbebbdada645e6350e2023fa753 SHA512 61995d5be87398080a6b1a7c639ede421850b58e876f8855d0e96e47e9f7748d45bd42e30303267617c0942775a751c822da9a3465a9a75115a409bb27b81c4e WHIRLPOOL 92b76f251b8a6d5e5c4637abad00ebad3cdf8c6e32f88d3727edceb90f5c5cbf2c6042b6382d9b5c3ce3ba134a953b2672d742dbaa53e5fb1937c8865240841d
 DIST OFED-3.5-rc2.tgz 18600237 SHA256 b267cea49bf72790843e6b08e26c10a6954d7736a8b93deed1e632772f4f5fff SHA512 deb83c3417ac60bd5d4c6ac1cadf93d6a34a55ca58365b54bb0c3a8230ba6a7f13e0257515dac0170cc4ab46b558519c86e6c01f7fa49550162feed0b0ea2e89 WHIRLPOOL e6843593fbe4937ffcf600be9cb3dee78e14cbeb4c411a4b64076b1194653cbcb9d4bc6cbd52ad77ac9c6b14d4dd2cdafa4364bfe6924b55896844042aa4d9cd
 EBUILD ofed-1.5.4.1-r1.ebuild 5540 SHA256 2bf2074f37e627ae05abe3892f9c2e7647d8a498f15d0872e536620135ceac5f SHA512 c481138bac265d82cf5449fbd7e18c4ecd0580f2d545d4b87e8664a3217d2e3898b14967741083fbe0fda54ecc30dc0a7712fb945c769909032bfc8cb3b2c7fc WHIRLPOOL b2b9aa78e2c9b3f0821f62b442f1685cbd27f160dad6db6a699f2b62bef7b342df2b414db7768c2afdda816d6177b4aa4f13ae576d97851f869d392d597c41c1
-EBUILD ofed-1.5.4.1.ebuild 5568 SHA256 451ce11c8cc2e834705085b5a27f1e1a7c08c73a40badc8a4d7d18f9c4ef5195 SHA512 9d26bfe2ead3091e395b228cbaa40ac0f2707a157090a6ea07be7215561eceed5a55159e40e6c8452c07ae80d93119821bee31d1524acac877b722839a510927 WHIRLPOOL 35a4a3c0f2f085059d73724ac81c30e2ac52a6654ed345403a4e6682e756258f51e29150cbc997494209e5590e945768b8653aec64ba06901b2027ba9ada882e
 EBUILD ofed-3.5.ebuild 5516 SHA256 430ebd099b1096701ba985e1b0c624c56bd81b9887ef83020322a31b106b10f5 SHA512 96b40b5e0f836deaaf5958d1f63a828f8d22546a128db47a97efe815ae3749487ddb587a4c07e8e737752bde7430be6a36beb0639bd7102ac77467a504b6e346 WHIRLPOOL 84d2c6c4a322d8675e757e4bcb441791270e3cf653b1e23cb111de7b675641e8af2a068ea597f14cb6e2f2c4c094fc29ba428aa041feae5210c100e5ada1ed2b
-MISC ChangeLog 1439 SHA256 f0a95b653df8f9cbcf1e9342cbefb9ba7f3fc2cd50bcba30726e3fe38c3d5f32 SHA512 68e11a729b869d9771b472bff3fb84fe1c351136a2650ec2c476c9503fd0bbad32a62274b1d8844ba8f3e1961aead8f50dfec064e0142da31f6dc5a0ff34a744 WHIRLPOOL 73d965dcadcbaac48904ec71e7b5ea45690c7649ba1c4711cc5ffe51edd6ba3a38d9d8fa794b09b19a80d529079ef62310a6983ffaeca62a3dabdabcd3117d57
+MISC ChangeLog 1528 SHA256 5eb214820cd8407c29e2b595e17fed1d21c45c8c598e2f5668bb8a03bb8afdb1 SHA512 00945a4356c8d816dbf580d378b3c57459b49509ab231a726b3ad95fbd2cab52a17b1b23bb2e316c65ec29bf70045b09269863c6a27f1a974609e4e54e9c0583 WHIRLPOOL 80d0ce1972cef107df5e86b6675c57e0d6f4df51cc8cec14a2de530e8567196dd0abb14c60ee7a889afa0ffa77d882ff6814e14ae808123f2386059a5b27142b
 MISC metadata.xml 814 SHA256 181824d9ec06da7097152f9961e072f3f764cdf02f4cb7073eb26476893f2e99 SHA512 e64ee1c85a9bee7375ed22193dc567013074308af93841f44e25b97ef878ee3a40755029c60fe449e0fcdb9e4a3eb70a6fe032de367cde4bcba7e6c7b34b5bd2 WHIRLPOOL aa6141bd2f0ed54fa2c460add8f42a4027656e41b7560d52acd026b9f2843c952ab59e7ed9ee25bfb835f8805c6fe99fc6f8b45c5e9ffbd018de05639ad74715
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHh18ACgkQ2ugaI38ACPB1IQD+Mq42tnIGPUBPWP2tmSnZusom
-u7vuY+2Cvo7hwOlWYFUA/jz7hX2sLT0l92ms2FJxXyf4EjIWmDLbnOUy4pJJ9gPq
-=yAZL
+iQEcBAEBCAAGBQJQx6d7AAoJEEdUh39IaPFNI7MH/RJVY2KD/1xeR0SMT7avsTqb
+mvGVGt+PX6yjdgVY+6DrLXhwcBMcX/I/Hwo1Fo0dlG4YcEzvlfwieQdbaO2dJQp1
+dst9PFd5LpatA2zkhnQWYDtbvOvyDY9xt9HruU+vC3S+k1QBcDFiIhbjB6q2XMpL
+Gcm/dg+cWh7mHXuFqMPbT5GbqN+XhpdZieIw05BdHjA1PwHZCKHgcpMt0UhGMNpJ
+2mygO9LgyhxUtfLEQjmGVe2h12TFD4gr/vYxAMLAG5ZVVx9RM//Y/cCYTpS2DtWd
+Ms7yFmeOwew3J5KMhuDu6MWfrybB3pYZ4HPJUA79PR1OKwmx5wuqEPute8taL10=
+=oYwV
 -----END PGP SIGNATURE-----
diff --git a/sys-infiniband/ofed/ofed-1.5.4.1.ebuild b/sys-infiniband/ofed/ofed-1.5.4.1.ebuild
deleted file mode 100644
index 768a286cbf72..000000000000
--- a/sys-infiniband/ofed/ofed-1.5.4.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ofed-1.5.4.1.ebuild,v 1.4 2012/04/29 13:03:20 alexxy Exp $
-
-EAPI="4"
-
-OFED_VER="1.5.4.1"
-OFED_SUFFIX="OFED.1.5.4.1"
-
-IUSE_OFED_DRIVERS="
-		ofed_drivers_cxgb3
-		ofed_drivers_cxgb4
-		ofed_drivers_ehca
-		ofed_drivers_ipath
-		ofed_drivers_mlx4
-		ofed_drivers_mthca
-		ofed_drivers_nes
-		ofed_drivers_psm"
-
-inherit openib
-
-DESCRIPTION="OpenIB system files"
-SCRIPTDIR="${S}/ofed_scripts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="compat-dapl dapl +diags ibacm mstflint +opensm perftest rds sdp srp ${IUSE_OFED_DRIVERS}"
-
-DEPEND="!sys-infiniband/openib
-		!sys-infiniband/openib-files
-		sys-infiniband/libibcm:${SLOT}
-		sys-infiniband/libibmad:${SLOT}
-		sys-infiniband/libibumad:${SLOT}
-		sys-infiniband/librdmacm:${SLOT}
-		compat-dapl? ( sys-infiniband/compat-dapl:${SLOT} )
-		dapl? ( sys-infiniband/dapl:${SLOT} )
-		diags? ( sys-infiniband/infiniband-diags:${SLOT} )
-		ibacm? ( sys-infiniband/ibacm:${SLOT} )
-		mstflint? ( sys-infiniband/mstflint:${SLOT} )
-		opensm? ( sys-infiniband/opensm:${SLOT} )
-		perftest? ( sys-infiniband/perftest:${SLOT} )
-		sdp? ( sys-infiniband/libsdp:${SLOT} )
-		srp? ( sys-infiniband/srptools:${SLOT} )
-		ofed_drivers_cxgb3? ( sys-infiniband/libcxgb3:${SLOT} )
-		ofed_drivers_cxgb4? ( sys-infiniband/libcxgb4:${SLOT} )
-		ofed_drivers_ehca? ( sys-infiniband/libehca:${SLOT} )
-		ofed_drivers_ipath? ( sys-infiniband/libipathverbs:${SLOT} )
-		ofed_drivers_mlx4? ( sys-infiniband/libmlx4:${SLOT} )
-		ofed_drivers_mthca? ( sys-infiniband/libmthca:${SLOT} )
-		ofed_drivers_nes? ( sys-infiniband/libnes:${SLOT} )
-		ofed_drivers_psm? ( sys-infiniband/infinipath-psm:${SLOT} )
-		"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	einfo "Nothing to configure"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	insinto /etc/udev/rules.d
-	newins "${SCRIPTDIR}/90-ib.rules" 40-ib.rules
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/openib.modprobe" openib.conf
-	newenvd "${FILESDIR}/openib.env" 02openib
-	insinto /etc/infiniband
-
-	doinitd "${FILESDIR}/openib"
-
-	# build openib.conf based on ofed_scripts/ofa_kernel.spec
-	build_ipoib=1
-	build_sdp=1
-	cp "${SCRIPTDIR}/openib.conf" "${T}"
-	IB_CONF_DIR=${T}
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "UCM_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_CM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_CM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load RDMA_UCM module" >> ${IB_CONF_DIR}/openib.conf
-	echo "RDMA_UCM_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Increase ib_mad thread priority" >> ${IB_CONF_DIR}/openib.conf
-	echo "RENICE_IB_MAD=no" >> ${IB_CONF_DIR}/openib.conf
-
-	echo >> ${IB_CONF_DIR}/openib.conf
-	echo "# Load MTHCA" >> ${IB_CONF_DIR}/openib.conf
-	echo "MTHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	if use ofed_drivers_ipath; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPATH" >> ${IB_CONF_DIR}/openib.conf
-		echo "IPATH_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use ofed_drivers_ehca; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load eHCA" >> ${IB_CONF_DIR}/openib.conf
-		echo "EHCA_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use ofed_drivers_mlx4; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load MLX4 modules" >> ${IB_CONF_DIR}/openib.conf
-		echo "MLX4_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_ipoib )); then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load IPoIB" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIB_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB Connected Mode" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SET_IPOIB_CM=yes" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable IPoIB High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#IPOIBHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-		echo "# PRIMARY_IPOIB_DEV=ib0" >> ${IB_CONF_DIR}/openib.conf
-		echo "# SECONDARY_IPOIB_DEV=ib1" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if (( build_sdp )); then
-		 echo >> ${IB_CONF_DIR}/openib.conf
-		 echo "# Load SDP module" >> ${IB_CONF_DIR}/openib.conf
-		 echo "#SDP_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use srp; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load SRP module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRP_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-		# from ofa_user.spec:
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Enable SRP High Availability daemon" >> ${IB_CONF_DIR}/openib.conf
-		echo "#SRPHA_ENABLE=no" >> ${IB_CONF_DIR}/openib.conf
-
-	fi
-	if use iser; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load ISER module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#ISER_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use rds; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load RDS module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#RDS_LOAD=no" >> ${IB_CONF_DIR}/openib.conf
-	fi
-	if use vnic; then
-		echo >> ${IB_CONF_DIR}/openib.conf
-		echo "# Load VNIC module" >> ${IB_CONF_DIR}/openib.conf
-		echo "#VNIC_LOAD=yes" >> ${IB_CONF_DIR}/openib.conf
-	fi
-
-	doins "${T}/openib.conf"
-}
-
-pkg_postinst() {
-	einfo "Configuration file installed in /etc/infiniband/openib.conf"
-	einfo "To automatically initialize infiniband on boot, add openib to your"
-	einfo "start-up scripts, like so:"
-	einfo "\`rc-update add openib default\`"
-
-}