version bump, cleaned up a few older versions and their associated files

6 files changed, 16 insertions, 55 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index b28955cebb77..2e5f99d14432 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.26 2004/09/19 20:12:37 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.27 2004/10/02 05:50:17 iggy Exp $
 
   19 Sep 2004; Michael Imhof <tantive@gentoo.org> -heartbeat-1.0.4.ebuild,
   -heartbeat-1.1.5.ebuild:
   Cleaned out old ebuilds.
 
+*heartbeat-1.2.3 (02 Oct 2004)
+
+  02 Oct 2004; <iggy@gentoo.org> -files/heartbeat-1.2.0-failbackfix.patch,
+  -heartbeat-1.2.0-r2.ebuild, +heartbeat-1.2.3.ebuild:
+  version bump, cleaned up a few older versions and their associated files
+
   03 Sep 2004; David Holm <dholm@gentoo.org> heartbeat-1.2.2.ebuild:
   Added to ~ppc.
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index c1a99882135f..23971fac6f4d 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
-MD5 a6ab023bb0b5ef5c719b3abcc887b300 ChangeLog 4152
 MD5 2477e9eb5555d14680475e629f2c62f1 heartbeat-1.2.2.ebuild 1670
-MD5 28532eb785836c7bfb7bb8f26db0f60a heartbeat-1.2.0-r2.ebuild 2224
+MD5 2ad851cf8a2d874b290427fe95313c30 heartbeat-1.2.3.ebuild 1671
+MD5 5d9950d2a58fae288e05b41e7388c963 ChangeLog 4390
+MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 MD5 e3895cdfd71fec4131de1c12a1a1c6bb files/digest-heartbeat-1.2.2 68
+MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68
 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821
-MD5 9fc3b9c04b508118400377fabd75be92 files/heartbeat-1.2.0-failbackfix.patch 486
-MD5 5a2e512ad67f6469362d57745be05d42 files/digest-heartbeat-1.2.0-r2 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBTehCKtJO8LeSoosRAu0hAJ9mtYQujCMCUY50eoIuEnW/cfLfAACaAvZ0
-tVCaTeY3C5PfWfjV0xdSMNo=
-=PFQ+
------END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r2
deleted file mode 100644
index 46bc5b362cbe..000000000000
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b31e3f91c76fe006d2af94a868445293 heartbeat-1.2.0.tar.gz 1668142
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3
new file mode 100644
index 000000000000..1db4b5d1aa0a
--- /dev/null
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3
@@ -0,0 +1 @@
+MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch
deleted file mode 100644
index 127bf56cbc30..000000000000
--- a/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur heartbeat-1.2.0/heartbeat/hb_resource.c heartbeat-1.2.0.new/heartbeat/hb_resource.c
---- heartbeat-1.2.0/heartbeat/hb_resource.c	2004-02-13 18:57:31.000000000 +0100
-+++ heartbeat-1.2.0.new/heartbeat/hb_resource.c	2004-03-26 08:22:00.000000000 +0100
-@@ -825,6 +825,7 @@
- 					/* FYI: This also got noted earlier */
- 					procinfo->i_hold_resources
- 					|=	HB_FOREIGN_RSC;
-+					rsc_needs_failback = TRUE;
- 					other_is_stable = 1;
- 					if (ANYDEBUG) {
- 						ha_log(LOG_DEBUG
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild
index 326dc5178ebf..12581e52337a 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild,v 1.5 2004/08/25 15:11:21 tantive Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild,v 1.1 2004/10/02 05:50:17 iggy Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -10,7 +8,7 @@ SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -mips"
+KEYWORDS="~x86 -mips ~ppc"
 IUSE="ldirectord"
 
 DEPEND="dev-libs/popt
@@ -19,31 +17,10 @@ DEPEND="dev-libs/popt
 	ldirectord? (	sys-cluster/ipvsadm
 			dev-perl/libwww-perl
 			dev-perl/perl-ldap
-			dev-perl/libnet )
-	>=sys-devel/libtool-1.5.2-r5"
+			dev-perl/libnet )"
 
 # need to add dev-perl/Mail-IMAPClient inside ldirectord above
 
-fix_makefiles() {
-	einfo "fixing up the Makefiles"
-	sed -i -e 's:mkdir -p $(ckptvarlibdir):mkdir -p $(DESTDIR)$(ckptvarlibdir):' ${S}/telecom/checkpointd/Makefile* || die "failed to sed Makefiles"
-	aclocal
-	autoheader
-	libtoolize --ltdl --force --copy
-	automake --add-missing --include-deps
-	autoconf
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv ltmain.sh ltmain.orig
-	echo "export _POSIX2_VERSION=199209" > ltmain.sh
-	cat ltmain.orig >> ltmain.sh
-	epatch ${FILESDIR}/${P}-failbackfix.patch
-	fix_makefiles
-}
-
 src_compile() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -52,7 +29,7 @@ src_compile() {
 		--with-group-id=65 \
 		--with-ccmuser-name=cluster \
 		--with-ccmuser-id=65 || die
-	emake -j1 || die "compile problem"
+	emake -j 1 || die "compile problem"
 }
 
 pkg_preinst() {