summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-09-26 20:43:43 +0000
committerChristoph Junghans <ottxor@gentoo.org>2014-09-26 20:43:43 +0000
commit3d2c1e0504bb90a2aa53b36ba782a746a0d97f88 (patch)
tree7414f5447ab38aa626dc136b0a05c0dd82c41fd6 /sys-cluster
parentVersion bump to 1.6.0. (diff)
downloadhistorical-3d2c1e0504bb90a2aa53b36ba782a746a0d97f88.tar.gz
historical-3d2c1e0504bb90a2aa53b36ba782a746a0d97f88.tar.bz2
historical-3d2c1e0504bb90a2aa53b36ba782a746a0d97f88.zip
clean up install
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charm/ChangeLog5
-rw-r--r--sys-cluster/charm/Manifest18
-rw-r--r--sys-cluster/charm/charm-6.6.0.ebuild20
3 files changed, 18 insertions, 25 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 5215b3cb5d4f..a329c0a0de5f 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/charm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.41 2014/09/26 19:04:03 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.42 2014/09/26 20:43:32 ottxor Exp $
+
+ 26 Sep 2014; Christoph Junghans <ottxor@gentoo.org> charm-6.6.0.ebuild:
+ clean up install
*charm-6.6.0 (26 Sep 2014)
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index d01973d02df4..0f7be0e43934 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -13,17 +13,17 @@ DIST charm-6.6.0.tar.gz 18779545 SHA256 c916010f2d4cc2c6bd30ea19764839d0298fb56d
EBUILD charm-6.5.1-r1.ebuild 5368 SHA256 07aeebc151441baa3aee6b3cddc6e36bf9ddaa516dc342c3478a6e95a3a17f7e SHA512 12d2afb4c88e900542e44d19c35fabe0502260e612b3da81fc60cca05ca3ddc652a1cce54960aa9a7bdd9b5f45986a13a2c911ae48307194f8f1ddaec845e218 WHIRLPOOL 1ecd4405bb5eaa962d1b3b56c32e8693cfd5ce06aa5874b07d9a89782f52313278fe61457b4a4f3c9a4a1122f02686ce0b3a72d68d8c67a7048024d606d0d9e1
EBUILD charm-6.5.1-r2.ebuild 5431 SHA256 e40245a09e9889a053fb4ebaaa9f6651218993af1c94ae3699e0cd0a15e74767 SHA512 d181c08a298d8733456facc532953c0f018e53a1a032da816e39d40a6a05a0ec4c8ec93dd7b5bbe197835dd36951708ccdeb4b9548e697dca349a75fbf7fc083 WHIRLPOOL 52a48f96bb73bcff41b3e27ff5f518ed573350b6821d1634e106788d49ffe2356a6e1621dca0787432359e034bbc7310e9e683e00669b7c57647f4599b284a9f
EBUILD charm-6.5.1-r3.ebuild 5496 SHA256 01488757549d007923056f62804e889987e11b8e1855c1114e04c0750f9cc1d9 SHA512 2a57c3dbfe4d6169df664b805edb373a389bccb34ea2945dd57bfdb4b6bc2689cbbdc54b01e96a3f4b77cf3fd4abe6939a8491dc1b091073787f60a43b4376a3 WHIRLPOOL c545712c7d8c711ad2997161afc43ad71493c10647811c21706b56ca71140ba706cddd51b5a3f91672821730e6e4ebf7baadb78b6e99e624ea775a7ca847eb04
-EBUILD charm-6.6.0.ebuild 5856 SHA256 2bfe41cade12d0fc501b83cb60a4bae396cf0643b2b75629062d5ecdd9afc8fc SHA512 6e893151b12917cb6ce829d861f85ef06413721fb7a5b790a2ccd2376dc830caac65d930878b50b40fda7d3492f166f9814ea523d4daa7b131f80e63ae23eba3 WHIRLPOOL 863afb3b2db6a42fc27eb1785b717198c9136f16b29c7face4100e399d31db0b298ce4d7cb690748a128532cab475aac63f3d101aa64b4a3521c4e25dac54586
-MISC ChangeLog 7163 SHA256 48fd90ab48a3d9879d644780c053192e486b72fa105bb29f3b93400bc986440e SHA512 6802855f0cf9b47c45402b9a61b40c9bbb4941b431080a6811f4e19ceb8c707a39292bdb151a0fc92aeac91944032f448e68338d8b8f9cca608bb63b53a65a2d WHIRLPOOL 5a4168dd68c58d1bd2854622c4a861f9421681254874c21a7078e93c72831f2c9474e55cdd5ff2eba0dc57fbb6a55d467f915d6ef69c354ef4ded5f3a98c310e
+EBUILD charm-6.6.0.ebuild 5730 SHA256 fd88ca16e7d783a54d1398a3dea386b948b4ba75a327601ecef10af3f2271eb5 SHA512 2710bcda025b277cddb60c7e7ba66568ce36aaac840ad207a7eac5e0f9acb1aa00578fe668be291527404cfdc35d7fb1e571f6f35d1119c6c8d07fe4dbb577e7 WHIRLPOOL ce12c546e4f1097e40c0d48fadab61b03648b354cf387d3f439a3f07b82ee4e2cfc6a05e2963d532dc63c0040139195c6f674d72267e547c90dd83d08508bfe9
+MISC ChangeLog 7257 SHA256 dad4fd24a777529224076f6818942055fec2d050737572d877b9d6470e8dbcb6 SHA512 5421e92611ce20235902c1adee7ec585215bf39349a9379e6c0eb00a9e2a07c9b1342d5c9958bc99e8c36dce105f6853bc4566e85dd0a3d9ca68dd1e46ad0781 WHIRLPOOL 14f3501a370a8ce5da41754f7af4d34c31317eb610ef5769aabf86f15e6cfd81625e38d2e0e66e63e9af682a98f383a494f24e54b3f30298072d042907ae3524
MISC metadata.xml 801 SHA256 4f15971f2c242322338a8c9a08d45707ce56a9a8d09e4e83a5808dd0754d21e4 SHA512 570f95d5d7609b34529524f7932327d1b1a9a3734211a14696fa8156475cc7a0d61a9fcf81f2732acd8f8ae61f88504635bd4278c061fe9e2ee6b796e9860ad5 WHIRLPOOL 70592d90dd5c757e5ec748b809e4dba8acd1f2900a83d639bd0d2f17bf99f957153d5a7664a8950167dc5b89331c2ea2e462afb592c1de57acf083e2e86e2f42
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUJbiqAAoJEOeBhlrCAAWG4YkH/3QtOpDJplZoR3aLn+xdtNYT
-Di0IeBHmHPh9lPUxl+0kjqMjVzC2kDPf2sDDsvuON3YVRpCOTtkLybKPQHCvgwhb
-r7Fm/qiW1dgwQe+6LfqfXvwOv3xnMb/9F8aQRkjrN/QPPYlTw6MRJycrBM1goyyV
-rJQbWZzKo8JaOt3SRLXNVHyxf2fzWvjoG0e5tdAoMBpBMpcx+GgnkAZskBGrs3Az
-OzHTlqJEcqwLDCn8xPtLtSa3bS1/ZXM+udZMllxK/yaG9/UX54Z/uhVFY6pMzGQ5
-gFOVNKjWWUnm7MG7umfxRB5bGFH0K9Ha5hjy4Htfn4kVrs/yLlRwqEpaNn6cYFE=
-=WUe1
+iQEcBAEBCAAGBQJUJc/6AAoJEOeBhlrCAAWG0cQH/3t8f9hZ3cg63eEvd9TZkGAp
+jtWSEUl/GcKvaepCCO5OQXhx2DpWPZXjy4s6J5JICiL3Tnu7Sx4YPbDuRNtARlv4
+rF+Jn60PK8a4L9haqbLc/gjTtPxiHM31XTJpa4fINjxpqQQb2fXtDucBDAWuj1/u
+lLqJZwzDUJXKOjtcJFDly6A10xxlM4V6JM3EwFd2G0B8Wp8dAdtv0vUTgU6vS0pY
+eR/g/nVLG6DUyJ9z3Q56UrcHk9Tb0iz8g07zhcLzuyOZZFw5YM0h/E/Zpp51D3bQ
+4uSx7JbgQ3RpcaV0ApljgXPn9hu9nsK1M/+Am6Dfrcm9/2RZpUX76NyHKE53hhE=
+=KA9X
-----END PGP SIGNATURE-----
diff --git a/sys-cluster/charm/charm-6.6.0.ebuild b/sys-cluster/charm/charm-6.6.0.ebuild
index a32f2c19f3eb..2a00ee3344e1 100644
--- a/sys-cluster/charm/charm-6.6.0.ebuild
+++ b/sys-cluster/charm/charm-6.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.1 2014/09/26 19:04:03 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.6.0.ebuild,v 1.2 2014/09/26 20:43:32 ottxor Exp $
EAPI=5
@@ -166,23 +166,13 @@ src_install() {
doins "${i}"
done
- # Install static libs. Charm has a lot of .o "libs" that it requires at
- # runtime.
- if use static-libs; then
- for i in lib/*.{a,o}; do
- if [[ -L ${i} ]]; then
- i=$(readlink -e "${i}") || die
- fi
- dolib "${i}"
- done
- fi
-
- # Install shared libs.
- for i in lib_so/*; do
+ # Install libs incl. charm objects
+ for i in lib*/*.{so,o,a}; do
+ [[ ${i} = *.a ]] && use !static-libs && continue
if [[ -L ${i} ]]; then
i=$(readlink -e "${i}") || die
fi
- dolib.so "${i}"
+ [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}"
done
# Basic docs.