Fix install wrt bug 323413. Thanks to Slipeer <Slipeer@mail.ru> for patch.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index f5dce8791cf8f586bab25214fcf88e1aeaede98a..de3b9ea1381c7d59fd1f53c30e542b371766e15e 100644 (file)
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.82 2010/06/21 14:35:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.83 2010/06/30 10:58:41 xarthisius Exp $
+
+  30 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-install_fix.patch:
+  Fix install wrt bug 323413. Thanks to Slipeer <Slipeer@mail.ru> for patch.
 
 *heartbeat-3.0.3 (21 Jun 2010)
 

diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 98b4ebcb761dd7ca41e51beb5972b1eaed84c2f9..6e546703742dbc493831fcc3b86a82f5129d571f 100644 (file)
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.0.3-docs.patch 1728 RMD160 95e043df6208ce0899e5473e5e34d63cf49face6 SHA1 46a19d06b9cf06f72a3f5292c2083ff21cbec69b SHA256 035698b8a53e7a59a29a1bf81e64f96c56f6b231d195da85d107985303fe0fe0
 AUX 3.0.3-fix_configure.patch 2884 RMD160 5e89cbcd5e5231fc45e1d408239147d3282f819c SHA1 1663dd485d14d87459b93911b0ce7a9ac2f9a248 SHA256 cd24c4cfe0a5905837e9daf5643456caba46a53872fce8cfa566608c37403ad8
 AUX 3.0.3-python_tests.patch 464 RMD160 f89b045be69ade44f454330ec6940fdaa80b863d SHA1 3fbd36b9f433b1b2ae3f40e620bb7b2f8bab98d4 SHA256 4adecb3af45c651bd28bc315e1e8607c2a1829a7295b155e1ad61e65afe0efaf
@@ -9,6 +6,7 @@ AUX heartbeat-2.0.8-asneeded.patch 2605 RMD160 ba2280ad11d37d123d1a7310cb23e5591
 AUX heartbeat-2.0.8-crm-leaks.patch 16011 RMD160 f5cd30e246a36329d2fb81d798c0c07b21a71645 SHA1 583882aa32fe4168392699dfefc03557a11af5da SHA256 559d192f47de95288d7a09c4d669801b623ab47b1ad39104ddde6d2d86b9bba0
 AUX heartbeat-2.0.8-delay.patch 328 RMD160 fa5b28027ee1ddaed4b3938326bf33ea156b1b6e SHA1 ec5f8f59390644e12c6f1f93e96871a6887f1596 SHA256 65afacc1a2b73170cd0167cee14eb280128de1dbcb5c59249d40be81737c024c
 AUX heartbeat-2.0.8-glibc.patch 532 RMD160 16e4fff7ccb75ac06c804998a8e92d4576dfee50 SHA1 183a7018eeef4c08187b9e858bda20f5312180de SHA256 786b9e86d7f6917f11bcbe0ee2a18a908ee2bae70fd3276c39540992677227ca
+AUX heartbeat-2.0.8-install_fix.patch 300 RMD160 8fbf8b5f741d434976dbcfd16d5c6f3d0f93aa2b SHA1 4c66495d491c76f1005a0054cad1eefda0cdb917 SHA256 8c51a07100d7e15b6961c01e05f542bb2501e053e38fb5d8c684bb573770fdc2
 AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26
 DIST STABLE-3.0.3.tar.bz2 536734 RMD160 5a63e8de46fc080b9b891d1f8cad4631340dd641 SHA1 3b21e28b7c957226db01539cde30bb3f29869aaf SHA256 d31473ae0e2be22410d594d6286a26d630195b9467810b97975b077be189a9a8
 DIST heartbeat-1.2.5.tar.gz 2107371 RMD160 0e94fa64339b9b77e11ffe92cffa66fef4f4f2b0 SHA1 eeea454bcf0e12dd1135f6544c95584fa2e66770 SHA256 46f88a69324012317a4426dc93654ab28947b77675826686624d15cd5a4e357f
@@ -17,16 +15,7 @@ DIST heartbeat-2.0.8.tar.gz 3502095 RMD160 76f3a56cbbafac8c35a87266b73d46a86de86
 EBUILD heartbeat-1.2.5-r1.ebuild 2036 RMD160 336e598ab184b9c95b24e245335f953c165bf7f7 SHA1 cb2764a5835505ba5ad98e34cb491a5c301d491d SHA256 51904a81903cccdefb8f1f53ead233ebdb71f15d1251b60b5fc5dd266606fb90
 EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 c42f9d01c43438c765bf4ef878d15cd1bbc39e0f SHA1 51b01db70e00ff119522f98df1548ef2045729e1 SHA256 0e8cf23a0b470931879f48ec67f30a4b36dd51802165f2e868cbcbd2bf56dcde
 EBUILD heartbeat-2.0.7-r2.ebuild 3565 RMD160 2275d514ffee4b55d200316f5dcb67221f11061c SHA1 d728b403714f8344a8e4b87eff07865563b75aba SHA256 6f8523742df6c27727fc36965e5a174ccb9a7c190f524aae37f40426f58bf6a3
-EBUILD heartbeat-2.0.8.ebuild 3971 RMD160 3403af471ac7da9a9656ad77faa9064c70b91190 SHA1 07ffcba570f0bf7dc4909477da0296880c4c82f4 SHA256 afc6d36d4503dd5bcc1a0c26522ad6bb3337d3e91eadf52c0761c5e53191f90c
+EBUILD heartbeat-2.0.8.ebuild 4002 RMD160 d20b765b6bd260a62fd9007a6a1b44ceed2479fa SHA1 4bcf65193f7f576c2d772b088772ef338f150f10 SHA256 27deb7609175fcb7a9ceface3654fb433724829782279da7cf97d4c49df0c21b
 EBUILD heartbeat-3.0.3.ebuild 1808 RMD160 f4fa7decc2289138961e329d218df7947803d369 SHA1 a048baa137ef40d4c150413f5bed954d9f2a0e55 SHA256 a798be23bf38f6eee832468c923cccff2a57519966b504618779225eb78624f7
-MISC ChangeLog 13323 RMD160 4080854bb9ea13d8b4f303a9672b7d90d83c9f1b SHA1 b72e3189f56a832dee70e950a6ea663497e7c285 SHA256 acda575d992a8d1d834ae6b5323fd67213faff6985db4d4a22907ce215a95a3d
+MISC ChangeLog 13523 RMD160 7b2ac2e6e50c858c57dbbf60831d955c44fc8365 SHA1 1822a9e0d1feb4e1662dd50b53d5c8dbdf83ae1f SHA256 72781d9e9ed3d3dda3387c2fcec3153efd48f66475458b27efe64a5d677be9ec
 MISC metadata.xml 533 RMD160 7e69dc1ae8397093dcc3ae717e578ae1cb0b522d SHA1 cf5d6f65fc453d8f99951cb853c1783ca22c62ee SHA256 8d29fb1d7f036f812707240c5d68cda93a2ccc6bf59c70625a7685597e1325ae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iJwEAQECAAYFAkwfeL8ACgkQIiMqcbOVdxTYzwP+K2jZe/3SNLpF+5dFlaLwP6ht
-f+sZcMJw6zzyeJLx0KTDdujQ/hO7Qem+YEQRmCsQU1xUjGvsdEWrJslNqHYt2VnD
-pjw/E/U3KEU8mp5J6VdMEdotAh7ei058sQq5LNCjEbLlcntM8SBKGJ1o2xVtR6Tt
-7UhdtVwolY/F4MqhNIc=
-=uXyv
------END PGP SIGNATURE-----

diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch
new file mode 100644 (file)
index 0000000..7b34f98
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-install_fix.patch
@@ -0,0 +1,15 @@
+Fix install
+
+http://bugs.gentoo.org/show_bug.cgi?id=323413
+
+Patch written by Slipeer <Slipeer@mail.ru>
+--- resources/OCF/Makefile.am
++++ resources/OCF/Makefile.am
+@@ -44,7 +44,6 @@
+                       Dummy           \
+                       IPaddr          \
+                       IPaddr2         \
+-                      drbd            \
+                       apache          \
+                       AudibleAlarm    \
+                       db2             \

diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
index c0c19179498948b0ae53674c5248e43d7885cfd6..091673d64785a4b8aa2b4fbeee7ff4196caa07e2 100644 (file)
--- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.17 2009/11/18 17:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.18 2010/06/30 10:58:41 xarthisius Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -48,10 +48,12 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        #epatch "${FILESDIR}"/${P}-update-resources-failcount.patch
-       epatch "${FILESDIR}"/${P}-crm-leaks.patch
-       epatch "${FILESDIR}"/${P}-delay.patch
-       epatch "${FILESDIR}"/${P}-glibc.patch
-       epatch "${FILESDIR}"/${P}-asneeded.patch
+       epatch "${FILESDIR}"/${P}-crm-leaks.patch \
+               "${FILESDIR}"/${P}-delay.patch \
+               "${FILESDIR}"/${P}-glibc.patch \
+               "${FILESDIR}"/${P}-asneeded.patch \
+               "${FILESDIR}"/${P}-install_fix.patch
+
        sed -i \
                -e 's:libgnutls-config:pkg-config gnutls:g' \
                lib/mgmt/Makefile.am \