Version bump, drop old unstable.

(Portage version: 2.1.9.39/cvs/Linux x86_64)

5 files changed, 24 insertions, 18 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/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) \