Ebuild cleanup, fix #387025, #387027 thanks to ago.

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

5 files changed, 26 insertions, 24 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 5552f3d3ecf9..9309452d3266 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.101 2011/10/18 17:27:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.102 2011/12/28 11:06:55 ultrabug Exp $
+
+  28 Dec 2011; Ultrabug <ultrabug@gentoo.org> files/3.0.4-fix_configure.patch,
+  heartbeat-3.0.5.ebuild, metadata.xml:
+  Ebuild cleanup, fix #387025, #387027 thanks to ago.
 
   18 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> -heartbeat-1.2.5.ebuild,
   -heartbeat-1.2.5-r1.ebuild, -heartbeat-2.0.7-r2.ebuild,
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 0b9723bf3832..279ca2f34b6e 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -2,27 +2,17 @@
 Hash: SHA256
 
 AUX 3.0.4-docs.patch 1727 RMD160 ec20f10c56ce13fa935818bd8dd3d7f528ad858b SHA1 b146ff45d6215973380766c8ea9a3bcaf1b97bd6 SHA256 68478a2cc1ca5a68a819ca88dcff64c9fd3d7dd34559f70507fed6ed985fc7f8
-AUX 3.0.4-fix_configure.patch 2996 RMD160 d142f1c0346ee25a0c1616db41f25ca35c7adb6e SHA1 92987cf7a938fcd6b64a9e599a89dd527bcd0264 SHA256 663ddbae715e8f0ba1926dcc5e0f67404b0b7d3cbe569f0253ac9eb5ca2ec3d1
+AUX 3.0.4-fix_configure.patch 3322 RMD160 d6ed81c6c896c56a3de7706278e6a771c024f908 SHA1 924073d87e3ebb802cd69836ae595763021003f7 SHA256 6740e254d13d63e9b242de3492bb799d5743f5b7e746e28c509440bc48fabbea
 AUX 3.0.4-python_tests.patch 464 RMD160 f89b045be69ade44f454330ec6940fdaa80b863d SHA1 3fbd36b9f433b1b2ae3f40e620bb7b2f8bab98d4 SHA256 4adecb3af45c651bd28bc315e1e8607c2a1829a7295b155e1ad61e65afe0efaf
 AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26
 DIST STABLE-3.0.5.tar.bz2 538986 RMD160 c2d29613e44c4fffc853db3aea0ca6d535723cf8 SHA1 8c13d83a54f2e2738cb93af37943449bcac4ab0f SHA256 fc7b11f9e1f16bc853434208a1ce86803acf1d0fb6f43715209a84c1c34661c3
-EBUILD heartbeat-3.0.5.ebuild 1960 RMD160 660d8fe1a9a3ccfd0b99f34c71f9ed543ef700c8 SHA1 c1dd9fe553ab56ae1cbd03e2b5ba4fe3ba1318df SHA256 7dd33b666445a35521e392035750849fd5e8f74f56ec92437a2bcadaad8a7cec
-MISC ChangeLog 16963 RMD160 273941ffbd290614b56ccaf9d5ed59c336b40e8c SHA1 f88d99ff97e6673d9213593c86f4cd8cc19eacfd SHA256 a2044cea322212dfb49424b17d7523a2b1f06f47d3be855c57c6c701953246e0
-MISC metadata.xml 459 RMD160 cef650d4af8ca48c3b73326cac202bc5475e036a SHA1 0a0cb879039ff023e83a5367ba656d83134de099 SHA256 a6f642dd6b76d6b97226688edd56d095aa97eb8ea76c273c7c321e1f9bfda6b8
+EBUILD heartbeat-3.0.5.ebuild 2032 RMD160 a9b6358145183f805f5440f4c971e503f2093756 SHA1 07f8bb98f8e920cc5f5e9d1616aa586db582ea87 SHA256 a2719244fae6db00e67605ba9f0260f6a60706270e6363621302e1aa7ea711b5
+MISC ChangeLog 17135 RMD160 3b0880960823fb97851a9137808e1f21a252341c SHA1 599ba08e29069d8aee795fad2c6f757ca964f3d3 SHA256 b7079476bf27121915a58457e39cdbcd0bf7d8ede4d27e5ec9f9b3b25cd3a81f
+MISC metadata.xml 272 RMD160 868ee60a671bc6262c57dfb9ecc30341354e3936 SHA1 097c1cb38fedb913617e0339aa476c21defd9fe5 SHA256 5e1fe1f75603b05ad8e099bd10e1a7b6894baa1a6562471da4e0c87e3c2d378d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOnbcjAAoJEF0huFKJUZL5MAwP/jzMMczDVcKggtwOVvqmEYs1
-TdzCtpqbKv9YWdgMXWC5o2KGpPudSJ+ehSzYCeS62ugSi+vg5KEbS+Hxo7+qod9k
-dM7dvOS/C12ETTq0DcY3VRnODfER/gZHfEL9ppIsO9Mr7z0Wni6Fta1nv9jETeTy
-eDnqhwb0GHsgucSfuj5GGHEiVP1TuhyO7bCZC6c9b8z6hARHiVCNzY6k96FGiM8H
-1EMSdgEe7V/sDkDBBCHiI/NTT3Xk1XkqB1H4hwrUZlx7bO9saBlCfpuBlad08ws3
-Jxi6Y1WOGmFDIouXwJWtn2kATg+b9/uVocD+1hKhdX8TEkjrlnBOLJdnH75lzhbT
-gyV4ibdboHgx/W4riwtNU/zk3Bz7IkSMlO5QTcri761uI3ZfSIRh1MNYZES2kFWC
-N+2GpKYv0FuPJt2zsjd4ob9CkIFzWOpUJ4MQHWwerXaUwysyvNpMZ/PvWr2feTeU
-nD6a78JS8PhAKOcCETHN/3YUS3Tx9d2mBY5ddESyjWRITHZuosEGm/AcCdoGYNUL
-jdZQ1G13SSo5S0L71ItdYdv3CB67d25GZkvjZpAAwpRPlWgOycWvx+GCZTNBNqKU
-H9AwLRjTDX6Y2xF2fZOGYxljyR8wg/9ajUKumz+ZmujUYiSImFcRMXD/OHHNx1u6
-3iQMMXXx940Iq/kLRYJC
-=gE/t
+iF4EAREIAAYFAk76+FgACgkQKiQSS7ZY+hN2ZAEAgdWvuWw38T2eiD/+RyLRrWPZ
+5z+0V+FdgZsWkC4jaiABAMGzE3I8FoVSDSLU/7NmXf7cn3dPw1RElnKp819Ojenz
+=tA5q
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
index 03db0ccc7f6d..c747592b7baa 100644
--- a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
+++ b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
@@ -97,3 +97,14 @@
  
  dnl *************************************************************************
  PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
+--- work/Heartbeat-3-0-STABLE-3.0.5/configure.in	2011-12-28 11:51:05.601673071 +0100
++++ work2/Heartbeat-3-0-STABLE-3.0.5/configure.in	2011-12-28 11:54:34.223094385 +0100
+@@ -2002,7 +2002,7 @@
+ fi
+ 
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -ggdb3"
++  CFLAGS="$CFLAGS"
+   if
+     cc_supports_flag -funsigned-char
+   then
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
index 91c020f4c3c0..f093c0419e04 100644
--- a/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-3.0.5.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/heartbeat/heartbeat-3.0.5.ebuild,v 1.5 2011/10/18 10:31:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild,v 1.6 2011/12/28 11:06:55 ultrabug Exp $
 
 EAPI="2"
 
@@ -78,6 +78,8 @@ src_install() {
 	# fix collisions
 	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h
 
+	use static-libs || find "${D}"/usr/$(get_libdir) -name "*.la" -delete
+
 	if use doc ; then
 		dodoc README doc/*.txt doc/AUTHORS  || die
 	fi
diff --git a/sys-cluster/heartbeat/metadata.xml b/sys-cluster/heartbeat/metadata.xml
index f07112b87f50..25095c392e31 100644
--- a/sys-cluster/heartbeat/metadata.xml
+++ b/sys-cluster/heartbeat/metadata.xml
@@ -6,9 +6,4 @@
   <longdescription>
     Heartbeat is a cluster manager to handle failover of 2 nodes.
   </longdescription>
-  <use>
-  	<flag name='ldirectord'>Adds support for ldiretord, use enabled because it
-	has a lot of deps</flag>
-  	<flag name='management'>Adds support for management GUI</flag>
-  </use>
 </pkgmetadata>