Version bump, drop old unstable.

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

6 files changed, 30 insertions, 24 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index a00f305d3bee..c7d690b07cdb 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,15 @@
 # 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.87 2010/10/06 09:25:37 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.88 2011/02/11 11:04:47 ultrabug Exp $
+
+*heartbeat-3.0.4 (11 Feb 2011)
+
+  11 Feb 2011; Ultrabug <ultrabug@gentoo.org> +files/3.0.4-docs.patch,
+  +files/3.0.4-fix_configure.patch, +files/3.0.4-python_tests.patch,
+  -files/3.0.3-docs.patch, -files/3.0.3-fix_configure.patch,
+  -heartbeat-3.0.3-r2.ebuild, -files/3.0.3-python_tests.patch,
+  +heartbeat-3.0.4.ebuild:
+  Version bump, drop old unstable.
 
 *heartbeat-3.0.3-r2 (06 Oct 2010)
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 5554e21a2ccc..657ebc156df9 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,6 +1,6 @@
-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
+AUX 3.0.4-docs.patch 1728 RMD160 95e043df6208ce0899e5473e5e34d63cf49face6 SHA1 46a19d06b9cf06f72a3f5292c2083ff21cbec69b SHA256 035698b8a53e7a59a29a1bf81e64f96c56f6b231d195da85d107985303fe0fe0
+AUX 3.0.4-fix_configure.patch 2996 RMD160 d142f1c0346ee25a0c1616db41f25ca35c7adb6e SHA1 92987cf7a938fcd6b64a9e599a89dd527bcd0264 SHA256 663ddbae715e8f0ba1926dcc5e0f67404b0b7d3cbe569f0253ac9eb5ca2ec3d1
+AUX 3.0.4-python_tests.patch 464 RMD160 f89b045be69ade44f454330ec6940fdaa80b863d SHA1 3fbd36b9f433b1b2ae3f40e620bb7b2f8bab98d4 SHA256 4adecb3af45c651bd28bc315e1e8607c2a1829a7295b155e1ad61e65afe0efaf
 AUX heartbeat-2.0.7-update-resources-failcount.patch 6648 RMD160 71e59accbad7883af4dae8d129ff15cdb59105fc SHA1 cc644a7d69c3d999bc440083723951cce1011b67 SHA256 0a08f4e45037724a3cc0877a16452d351535cee2d43dcb4a4bbd47c6c9ab7f3f
 AUX heartbeat-2.0.8-asneeded.patch 2605 RMD160 ba2280ad11d37d123d1a7310cb23e55911aa14b1 SHA1 a864ead82e18c9a7722aa5021e11b7c951abebd0 SHA256 669b0b63c7f5b53671f110d33a0922e1b89fa3ceb6ae1fb44f4a674375778231
 AUX heartbeat-2.0.8-crm-assert.patch 453 RMD160 fff65950d3e1a683cff3f7d45e2e61cd2a71e2b3 SHA1 c48bb81671892e4609d5c35f09cdd6784fb81c1b SHA256 73040b24a3014f736f39ce4f804c9a4be1825aceefb85150c8182056024fedc3
@@ -9,7 +9,7 @@ AUX heartbeat-2.0.8-delay.patch 328 RMD160 fa5b28027ee1ddaed4b3938326bf33ea156b1
 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 STABLE-3.0.4.tar.bz2 537449 RMD160 849fd1ca46bb247b3115fea978bb6e639f8a2718 SHA1 41920cebc9e260d5ac43be742c74c5e3998ef571 SHA256 8f6997acd673d7ffef9f5946fa507d78b5c81dd0941e998c71cd72dd61a39784
 DIST heartbeat-1.2.5.tar.gz 2107371 RMD160 0e94fa64339b9b77e11ffe92cffa66fef4f4f2b0 SHA1 eeea454bcf0e12dd1135f6544c95584fa2e66770 SHA256 46f88a69324012317a4426dc93654ab28947b77675826686624d15cd5a4e357f
 DIST heartbeat-2.0.7.tar.gz 3327126 RMD160 8fe70e64fc6714fef4e501ae0b240d870a51cf75 SHA1 c0caf848b90d2fc76e0a390aaf59352d580d714a SHA256 008214f51fd0c49e168d1bb262cb5c967bc166f99d0c8ff3a2623c8ba51a0ab3
 DIST heartbeat-2.0.8.tar.gz 3502095 RMD160 76f3a56cbbafac8c35a87266b73d46a86de86feb SHA1 1805fc4c6218f05006c506d532728c6664d5a35c SHA256 b8425098e1243976f1e9deedfbf763fd42f0461bdd8933b0b8a94f0626912c91
@@ -17,6 +17,6 @@ EBUILD heartbeat-1.2.5-r1.ebuild 2036 RMD160 336e598ab184b9c95b24e245335f953c165
 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 4035 RMD160 1828b6c0de4e1fda13f037b6d86792c0485154d1 SHA1 e4e5a1ad935ea53aff839ea9193ca7446928c5b2 SHA256 8a97133b27731a90d55d436dc7c260ec5b2b51910c5e1ae7de7bdbbd51c1628e
-EBUILD heartbeat-3.0.3-r2.ebuild 1843 RMD160 3ad89ddf29ec76b2523ea3d2f7106b320dfee41f SHA1 9c5bd9e6fc1c1a4632d10194e11403f1c8681572 SHA256 5ce5c9348712794b2ba7a02049c580798d5bf983e48b5672281f04577a4acffc
-MISC ChangeLog 14356 RMD160 469d3f9e0bd92329227e195d403b135a6e71533d SHA1 1cad96d50f1b054b2b704a650392a150fedc643a SHA256 1d7713b67845e9c2d23f63461d50b212bda28b2bfc4b83249751b003f1e3a303
+EBUILD heartbeat-3.0.4.ebuild 1819 RMD160 e1385b137de86a2100b9dc04cb9d5a6741b83258 SHA1 419d1a201f0408be551e1575b0b117fa19052a25 SHA256 2be0c098b015ca1aea220f644e2ccc28e64f5403dc64616045636458abfec203
+MISC ChangeLog 14713 RMD160 343454f4fad2864ace0ed44bffca0e3eb94a4026 SHA1 b5c6367bff111d67acde9b838f8fbe0c30a8fb44 SHA256 e0ae77effe64e6bdbbf82c48be32bcba2f3e96af3776d21d2495cd0734d1ecaf
 MISC metadata.xml 515 RMD160 da301d1cae0399b79bb38822ad9637f6c8029a90 SHA1 a883f5f9f4f5a1d70ab7dba7c6846ad13b12b031 SHA256 b944e73c810b448940f997ac1cd393bb75d7c6b68d03231c34754e9bf6878ca5
diff --git a/sys-cluster/heartbeat/files/3.0.3-docs.patch b/sys-cluster/heartbeat/files/3.0.4-docs.patch
index 3fdcfbda58ff..3fdcfbda58ff 100644
--- a/sys-cluster/heartbeat/files/3.0.3-docs.patch
+++ b/sys-cluster/heartbeat/files/3.0.4-docs.patch
diff --git a/sys-cluster/heartbeat/files/3.0.3-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
index 3b41c83f5991..03db0ccc7f6d 100644
--- a/sys-cluster/heartbeat/files/3.0.3-fix_configure.patch
+++ b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
@@ -1,21 +1,19 @@
---- configure.in
-+++ configure.in
-@@ -243,11 +243,9 @@
+--- work/Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-09 21:09:47.000000000 +0100
++++ work2/Heartbeat-3-0-STABLE-3.0.4/configure.in	2010-12-28 17:37:45.080773140 +0100
+@@ -243,9 +243,9 @@
  mandir=`var "$mandir" "$exec_prefix/man"`
  dnl docdir is available in autoconf 2.60+, for older versions preseed
  dnl with the same value that 2.60+ uses
 -docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
--stdocdir="${docdir}/stonith"
 -libdir=`var "$libdir" "$exec_prefix/lib"`
 -libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
--noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
 +dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-+dnl stdocdir="${docdir}/stonith"
++dnl libdir=`var "$libdir" "$exec_prefix/lib"`
 +dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
+ noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
  
  
- 
-@@ -285,60 +283,11 @@
+@@ -284,59 +284,11 @@
    LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
    LibCdir=`dirname $LIBC`
    dirlist=`echo $LibCdir | tr '/' ' '`
@@ -72,11 +70,10 @@
 -	libexecdir=`dirname $libexecdir`/$LibDirSuffix
 -	AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
 -esac
--
+ 
  for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
  	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
- do 
-@@ -387,7 +336,6 @@
+@@ -386,7 +338,6 @@
  fi
  
  AC_CHECK_HEADERS(heartbeat/glue_config.h)
@@ -84,7 +81,7 @@
  if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
     GLUE_HEADER=heartbeat/glue_config.h
  else
-@@ -454,15 +402,6 @@
+@@ -453,15 +404,6 @@
  
  dnl	We use this in the RPM specfile...
  AC_SUBST(ac_configure_args)
diff --git a/sys-cluster/heartbeat/files/3.0.3-python_tests.patch b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
index a91c7ec3fe2a..a91c7ec3fe2a 100644
--- a/sys-cluster/heartbeat/files/3.0.3-python_tests.patch
+++ b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild
index 538f72285956..0354c72a88c3 100644
--- a/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3-r2.ebuild,v 1.1 2010/10/06 09:25:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild,v 1.1 2011/02/11 11:04:47 ultrabug Exp $
 
 EAPI="2"
 
@@ -21,7 +21,8 @@ RDEPEND="sys-cluster/cluster-glue
 	virtual/ssh
 	net-libs/gnutls
 	ipmi? ( sys-libs/openipmi )
-	snmp? ( net-analyzer/net-snmp )	"
+	snmp? ( net-analyzer/net-snmp )
+	"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/swig"
@@ -59,7 +60,6 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable doc) \
 		--disable-tipc \
-		--enable-libnet \
 		$(use_enable ipmi ipmilan) \
 		--enable-dopd \
 		--libdir=/usr/$(get_libdir) \