[sys-cluster/slurm] Fix build if no previos slurm was insatlled

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index ac968dc5964b914220fa5ead3e23e0f8c8520838..434c2ab50559b1d368091a1bb44985593b0c5590 100644 (file)
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/slurm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.6 2011/10/26 14:05:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.7 2011/10/26 16:00:57 alexxy Exp $
+
+  26 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> slurm-2.2.7-r2.ebuild:
+  Fix build if no previos slurm was insatlled
 
 *slurm-2.2.7-r2 (26 Oct 2011)
 

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index ea4cb597533b8d1ba3eb55662860548066313dd4..6fc65b8399c7bfa92d99d5d06d23a33d5036f5ad 100644 (file)
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -7,23 +7,23 @@ AUX slurmd.initd 1125 RMD160 1b5f8a9a719ebfa05125c597cb5d3bf149e9a6e0 SHA1 08b82
 AUX slurmdbd.initd 1046 RMD160 dd897cbdc0a5e64a24ad43b76c2b85b8a7515824 SHA1 b7ba92782a5010e6bca4b5b4903e9f57f16ca921 SHA256 ddf8c11886a1bce77b7ce8e73f6b91ceb5a994fbb3665e9e3f51468eae02fe48
 DIST slurm-2.2.7.tar.bz2 4454740 RMD160 37ee3ef3382e3ca00cff99901020825bbf0c0b03 SHA1 b5e62504f31007f593d6ce6d90415579273a7b0f SHA256 8dfd8ec1b447caa1c8d83817a90414e19bc5b8cc9caf2c7ec4b6d2cb6bcd0a7e
 EBUILD slurm-2.2.7-r1.ebuild 3545 RMD160 1a3caa7458e44254cdef1b968b5a95d03045723a SHA1 1e6eaacb65c00a8041d4c5503ec93b35c594d8b2 SHA256 7d246aa7a8685a02b6cd3915a811020360b8b8893c054ee4cbc611de9faac063
-EBUILD slurm-2.2.7-r2.ebuild 4517 RMD160 6d480c28b8435586110d638e99a879dc2907e250 SHA1 45228dcaaa0982760e3d9148c0a19294efed454f SHA256 f8d31bdb7cc50dc0b97dc7c2a1d345ac96f1d76ca53b4b9b413e919c437b60be
-MISC ChangeLog 1125 RMD160 469e4ae9d6805a888c4bbc8865847f908df06080 SHA1 446f3f8c23cb2f46b6a4ad3224505998db1d22c6 SHA256 665fb86dd588cb3f3776a429b7d9167a435546c4cba88afd51359292b3ee2e99
+EBUILD slurm-2.2.7-r2.ebuild 4759 RMD160 4bdef83b56c928f76306ad4b5e8f3b5da9f6c3ee SHA1 98ea9cf3a27f6a9da78f82da1ee9df0cc85fabf1 SHA256 293090530af8db24db6192f1101f347e9088386b8f0e64d710eed74559f0fedd
+MISC ChangeLog 1246 RMD160 b33660133e6999448adf38d14bf89537e07ec01a SHA1 28534d2bc11b10e4ec1811dc87eb6e6bf9e33701 SHA256 684bc97d22be0fdae03b92c1eb06569d6eac66d14dd3d3164daed5d60981e38e
 MISC metadata.xml 443 RMD160 0a1990a76e09e35f4828dd4d354386fb0466f863 SHA1 18f4c31746d23a579bb56dbc0bd3a341cd3bc1b3 SHA256 d72c661300e641a22f67fed77fa1c9ffc8a4723222fd785df11a2ca1249e065a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOqBO6AAoJEOf+E+/4L5LmM9MQAIKNMaYNrtSZ2d+t7+rvirSz
-38Sgxi21oXn1IYYtg8LwAZlccWxk9POkTjt8dQ2VR12pOgdiqQk0KmoaW8MC/i0J
-Bcxm6KOEw5UQ+EC0uvoICHQxxk2Ur38cHpl/m4JjR4v+hdtO5ks02+sFW+7pTeJi
-1pjktXyT+dDVaXeuI4QLJUlyIxwVKrPdpesxxRpkjrWP9HxGgnaD+nMf2gDsiWBb
-0pb54NuD5IKWH1vmIsVCdppGwItcNGznS1R0ziB1eBJcnu/JIWP3tVcYPrG63l0e
-tjt+yfym4+w2wpRJttXzh95zSw+q4ARNDdDOVHRejSq3QHwrCsju4FWpvhHTLJgM
-GZRvB6xgr6e/j8e1wEZXQqdq7Iu7W+qAo4VbNybADwRBi1W6C4aOd6SqAR3nwLKO
-wiq2GHXVKpePiR2xVdvTbJxerZBfgLbLAFx5O41dBXMhElsupym3T9SG1GG9vxTj
-Li4Up5g+FQTeMc6ZsSlViDJmTe5SacswTLOfCe77oGpUIGAD2N2DeVm93rwaZz1i
-8FKTBS59vZiK/3qKh2YIij10hZEuMXx+ZH7ZpqfIF5vYkcNA9vdqn8zf94+3m6A8
-KUQUbq7UGZGtS+1VRtSfx2GSKTkmfDON34dc38yY9My+TVOMiTAyG2BgKVEjPuLh
-OTN9X0H3xcVpdg1L7FjR
-=zwD+
+iQIcBAEBCAAGBQJOqC7GAAoJEOf+E+/4L5LmYwcQAIOkcAGD2fGkX5N4ktbFYPz8
+RyXt8KxYUqm1d0h7IKVUqRThCgJRAKTLTl5ejZTFP95Ya47DhLxF2fH7AmpzLGj2
+Qt7ER0FSlrweH3ZUxD6oUpZdS0FxAOMwZa9Xm8xgb2Vks4pZ7tJ+2d7sqp0D6PET
+eHUE7XRpfoK/45b8zCKRywkJ7n3zrH4M8Ggb9Tf+f2weOuUPQwD24bFDWaZJmOzI
+nV8XilTt5jtiYdS+N2bX7YoVfymMFq2I8X3tRBtmHRchdlzxVRR+ZuPcXy/pW1Ny
+/FwoIOMojDEBUYVAttIqFc4BLFLA8QZXOQESC9GE3WyGovV12vvh6p3ZRvjkaqfK
+GSj9dg+Y4BYVeCGlZzcbjVxw1IuyEzTQoFyGfyU2ZODp6MQzJoxTcWmYb0ZppJBO
+B3n2ufV8HsYm1nu/4c2ScF/+rHXBgvJuguV/wnDZ/sL8Guh9DKPsafwu4oEZ8Kpo
+h6YimVJ1BUWpLUqoRZLzo13S2WPV+FeAyhuZlMsxAmKSkxi0sNw1C2zeuILEM37B
+tOI6v+0ifjyWMez/fxz+XJc2LK0r/R5yJiTNwBBbgbX8mrA71k3ZiAo0TNtAamvs
+030oUN7NpnB4ILnapI6b+2QKDjkWNvQLcGWo60JXrbuCZC2yj24xT8JA528K/snW
+3qyBsinT7DAtAzTpTptx
+=BSlT
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/slurm/slurm-2.2.7-r2.ebuild b/sys-cluster/slurm/slurm-2.2.7-r2.ebuild
index 99e0b007b51b16f3ae0248dfd0a0047800c9212c..e4d6c9968ea5d6263594e8a6eb20586acba16ae6 100644 (file)
--- a/sys-cluster/slurm/slurm-2.2.7-r2.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.2.7-r2.ebuild,v 1.1 2011/10/26 14:05:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.2.7-r2.ebuild,v 1.2 2011/10/26 16:00:57 alexxy Exp $
 
 EAPI=4
 
@@ -72,11 +72,17 @@ src_configure() {
                $(use_with munge) \
                $(use_enable static-libs static)
        if use perl ; then
+               # small hack to make it compile
+               mkdir -p "${S}/src/api/.libs"
+               mkdir -p "${S}/src/db_api/.libs"
+               touch "${S}/src/api/.libs/libslurm.so"
+               touch "${S}/src/db_api/.libs/libslurmdb.so"
                cd "${LIBSLURM_PERL_S}"
                S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
                cd "${LIBSLURMDB_PERL_S}"
                S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
                cd "${S}"
+               rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
        fi
 }