[sys-cluster/ofed] Crazy fix

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

3 files changed, 25 insertions, 30 deletions

diff --git a/sys-infiniband/ofed/ChangeLog b/sys-infiniband/ofed/ChangeLog
index bca1f92a930b..31cf709fab98 100644
--- a/sys-infiniband/ofed/ChangeLog
+++ b/sys-infiniband/ofed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-infiniband/ofed
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.10 2014/04/16 08:22:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ChangeLog,v 1.11 2014/04/16 10:11:04 alexxy Exp $
+
+  16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> ofed-3.12_rc1.ebuild:
+  [sys-cluster/ofed] Crazy fix
 
 *ofed-3.12_rc1 (16 Apr 2014)
 
diff --git a/sys-infiniband/ofed/Manifest b/sys-infiniband/ofed/Manifest
index 4d4c15f2b050..4a1bc6273937 100644
--- a/sys-infiniband/ofed/Manifest
+++ b/sys-infiniband/ofed/Manifest
@@ -8,24 +8,24 @@ AUX openib.env 19 SHA256 5f30d772b77fa4a5aaa1a4ff4188c0f38c0cf6c4138cb6597082c6d
 AUX openib.modprobe 350 SHA256 32054c7ee7caffc21ed320a9be5d0c2cd85e51295c0515521373d658f55ee68e SHA512 580fd9f53ecf4661181c3d423770e9db75bd767d2efc26115d418b032663f7397637fae5f736d3acc803152af76946b1851b1444da1c4472ca42ca32c84b5d1c WHIRLPOOL e35f1a9c809dbc4f608376a9d4508093c099213f59b34e00100732c2f84782016cf763df75bc8032fa5f1af37647ea38be6e92a1ee9ae3e2958812be42b9d1fe
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
 DIST OFED-3.5-rc2.tgz 18600237 SHA256 b267cea49bf72790843e6b08e26c10a6954d7736a8b93deed1e632772f4f5fff SHA512 deb83c3417ac60bd5d4c6ac1cadf93d6a34a55ca58365b54bb0c3a8230ba6a7f13e0257515dac0170cc4ab46b558519c86e6c01f7fa49550162feed0b0ea2e89 WHIRLPOOL e6843593fbe4937ffcf600be9cb3dee78e14cbeb4c411a4b64076b1194653cbcb9d4bc6cbd52ad77ac9c6b14d4dd2cdafa4364bfe6924b55896844042aa4d9cd
-EBUILD ofed-3.12_rc1.ebuild 5528 SHA256 c0dc49b5be6955958464864ab81509be0fd67e0ba6450e2d190c174fe23e4603 SHA512 2f7c2c5503762548fe83db63b7a41909cb2c28e60c58d9b830d7796309f5a913c9760a3e913199f64a3799a81e9afda83358b6365bd0659b2eda41a6a7ff8b0a WHIRLPOOL 584cb0eafe9db58ea4de21401178b4ed29677ddaa9bd52b402c5d07fc9b03c16bd77170ce1ecb34aa5e8c1554e9b0f4ac2c98d0f78252e0601381fd3450a6cb6
+EBUILD ofed-3.12_rc1.ebuild 5230 SHA256 7855a488adc55f1adf1278ee784c88b97058771c5cd45e6d78fd798a20fb36ff SHA512 2a1c108c5701165bc1e06899f8880e51c536b1af3e3aca3292b1feabca573b450f365544e0d19e8cdaf9027edb5bf30d04e3fb7ab0705fe6a9ee3ea21895aa1a WHIRLPOOL 68eaf602949cefcad48cf9207bbb1382169a4832dd7ae781b83105e1a831ebc76dbc387f59851729270a8e2cadf20bf00c07db504d0bfe6fae70ae6f8e191857
 EBUILD ofed-3.5.ebuild 5516 SHA256 430ebd099b1096701ba985e1b0c624c56bd81b9887ef83020322a31b106b10f5 SHA512 96b40b5e0f836deaaf5958d1f63a828f8d22546a128db47a97efe815ae3749487ddb587a4c07e8e737752bde7430be6a36beb0639bd7102ac77467a504b6e346 WHIRLPOOL 84d2c6c4a322d8675e757e4bcb441791270e3cf653b1e23cb111de7b675641e8af2a068ea597f14cb6e2f2c4c094fc29ba428aa041feae5210c100e5ada1ed2b
-MISC ChangeLog 1704 SHA256 a3ed92b5930fd11882182f0eb949248d385274998978d06f5e0d3668db70a438 SHA512 5a1f8bfbbc8babe5bdea5760a6828c0a4be0e2a4885eeff78381e81e96bab1f89ed98a962cee314108e4b7ce954c485b9f3074222064b827da66d9f91a892c9a WHIRLPOOL 18f1d9b85b23c71508a5149f437422db937642341f201ccb9ba72be3ca0714a9749276a5f465604171bf8b1104fb01782dae04822edb14114a7c07141d73bdb2
+MISC ChangeLog 1809 SHA256 e2f4bb8a3a67aee5fcf52c1a7558085218b6c811d275f35705a1ce7b84996bd3 SHA512 f52ffb96f262c65781d2913997903ae61ba45f1bfaea573b8569e7b4839417534de96c7373ddfced3f57fafc5cfe2384512669bac4ad8aa2c00241dfcb8c7116 WHIRLPOOL 1bbda798f8a90b894a844e452e76ae26138f007573fc95aa128afb1f75f0a332be29e18d93a9da59186dc53c8332d3082023e16439d84f763b5483b01e6e89ba
 MISC metadata.xml 857 SHA256 9f3450251c8ca48e6c13253be2fd74f2d22ab60f1c34b1302179ced9a6f9efad SHA512 c9b7762143acfc660cce9c0c53e3d1298eb89cc721b0a91437dc25f4f8d191e28a48dfdc2d165e13decc0714425d7ea482222b9a8b8c2a5caa11eb787a5ab399 WHIRLPOOL b27a0216119c8ed03de35cf48ee32cdf907ae330e4a4745f105a5ea0a72004e1a99204bf5a45a742b8654d21fd6762e9d57a71e45127735a7d7ba3b802fec8e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTTj3hAAoJEOf+E+/4L5LmLqMP/3Qi72XFFaf8WNJR/JP6TJ5q
-hfTLVfpoDX2svUo7WYeWdOQxGIH6YdjOQ24Y0afmOBykbhIU/dyazySmy4+pbifK
-PFn1s/EZVftAGSg7gs+9XoNhhLyNdUuJDwllqjRf1W+vapn8xZNdRVpZUeMmF2OE
-pSCvUnNm4KNvQe5tpORvO5uSAqWsECXveNtz8hdi1Rp+z6N0IE43ri8Rh2dm1bp/
-OtB4TmMfY/WbLdXA6nrDQ9J9GA/dY6wDxHOPXZx+YdsbkJrzudZKwR/qDyoUWIJu
-3DJR0zFGeJfWUvleHMNmYs49UOf7JVMEwUGu2Sj4ImZMTBP85TiggyQvNl2YNNF1
-IaF+rFhXxziDP64vC+hp09b8j/QEiIYcmGf2HQfrd8eTOCbNIPYIdY/OxYCUaeDx
-IovjEsG1DrRto+HTApU5sDuYHE7Ezw2O1o1tI/0SPqhbxBGmSckq9wcWrBHH9vro
-zAj4ggO+2pkW3ZoEUDs3ESWtWcYDZV7nySWh7zCJdlyHPi6wyBXuiVtEhDlPkYw+
-TujWxhuhzfZ1Zp0D5Js34qVijm8I9PjSoYJE4UZ7mBQ+QbS9QM58sZW6UpUdHv+q
-Qd8liO3PDJMIFCXD+s/b+irpIa/iV+9JjRc/ELQ0MwBc6812e3LiEl+EM4rw1z/X
-I7fBifGlj/iUs5PQEV4C
-=Hd5z
+iQIcBAEBCAAGBQJTTlc/AAoJEOf+E+/4L5Lmuh8QAKwE30bZKy+8SL+7CrHvBf5t
+caJK604VnFB3oEHGpRjv7bbOoE9X8vFMkaNZdtW7zGwwf6quGMwDKBgTJ9rzgZVN
+ws5RIifggYjWNWXGnH0hlRbqNUymKQ4604NT6VFEifcAu9TrPzNKFPvT540NhT3P
+fTKxbvh+5QxrV2xNmC/ubWIHKY+aZ9/HnkmlTOhRoti0eORyuNpihP9w+673vxir
+T45mH0936QHuBR3e3aGYnJRl9A1guNuvk5rjBhnVZL5+AEhNB7m+9B6z4ecQd4DJ
+46yvBe8WTfyGuBbT01diL+/SeROUCAtUoUIPUfvFbsJJU9AJDyKt8kj8NEueJXti
+5yGZ/sZgV4hbcchIfWXXjjoUum0zl+BvyBc6fg+irafVs8wDZXtb2SortMI5dQsB
+Y0be9gc1kye4jEW641sjm+DkB8d/NvllQCzsA8l3WOSYFVExW4w00+JGgNhPoNMg
+62gXXVRRSp0/bK45qEDGD8Ld9F+UdFFn4cnoVnKNkCIMLKGwOUEMCnIKqeNepdLx
+BxPQ1reJSUYoIJ9iqUrxqy+331dcIOzWdOXxASSZAoRuQBcnNLJNnrFWUVhMnRMP
+e8K1LdwZaf13kcNPDea+Wbb8yWRcbwokusar+flvqa8v8cFhQKBMzzxCfUwpRh+N
+s3Q4iQRNeOhSv1xT7yHm
+=C4N4
 -----END PGP SIGNATURE-----
diff --git a/sys-infiniband/ofed/ofed-3.12_rc1.ebuild b/sys-infiniband/ofed/ofed-3.12_rc1.ebuild
index 9de427337018..4ac5bc753e21 100644
--- a/sys-infiniband/ofed/ofed-3.12_rc1.ebuild
+++ b/sys-infiniband/ofed/ofed-3.12_rc1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ofed-3.12_rc1.ebuild,v 1.1 2014/04/16 08:22:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/ofed/ofed-3.12_rc1.ebuild,v 1.2 2014/04/16 10:11:04 alexxy Exp $
 
 EAPI="5"
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
-OFED_SUFFIX="1.gd250ad6"
-OFED_SNAPSHOT="1"
+OFED_SUFFIX="1.g8336567"
 
 IUSE_OFED_DRIVERS="
 		ofed_drivers_cxgb3
@@ -25,7 +24,6 @@ IUSE_OFED_DRIVERS="
 inherit openib udev toolchain-funcs
 
 DESCRIPTION="OpenIB system files"
-SCRIPTDIR="${S}/ofed_scripts"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="dapl +diags ibacm mstflint +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
 
@@ -58,6 +56,10 @@ RDEPEND="!sys-infiniband/openib
 DEPEND="${RDEPEND}
 		virtual/pkgconfig
 		"
+block_other_ofed_versions
+
+S="${WORKDIR}/${MY_PN}-${OFED_VER}"
+SCRIPTDIR="${S}/ofed_scripts"
 
 src_configure() { :; }
 src_compile() { :; }
@@ -130,21 +132,11 @@ src_install() {
 		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"
 }