Ebuild cleanup.

Package-Manager: portage-2.1-r1

7 files changed, 7 insertions, 480 deletions

diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index ac94e33297d6..d47f598ebce4 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,29 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX heartbeat-1.2.3-lvm.patch 1660 RMD160 51a306157b3b17deb5f54bf3a888a39058022c94 SHA1 5cf699b3e83c0d29ed001fbef0b1e81ea784ad9d SHA256 43b7751eae64fa2ec8dd4ed3c38c43acfff46a7d572fb5dd953f55719441ba4b
-MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660
-RMD160 51a306157b3b17deb5f54bf3a888a39058022c94 files/heartbeat-1.2.3-lvm.patch 1660
-SHA256 43b7751eae64fa2ec8dd4ed3c38c43acfff46a7d572fb5dd953f55719441ba4b files/heartbeat-1.2.3-lvm.patch 1660
-AUX heartbeat-1.2.3-misc_security_fixes.patch 7756 RMD160 373a1091443afdf6d2a376293b20b3e125aac982 SHA1 9da2d220e845dc85c9a75bfda0f94e63e86e249e SHA256 5c56152c7283f928eba5b39690bf198685447b54bcf66a25c8a9bd9543a37940
-MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756
-RMD160 373a1091443afdf6d2a376293b20b3e125aac982 files/heartbeat-1.2.3-misc_security_fixes.patch 7756
-SHA256 5c56152c7283f928eba5b39690bf198685447b54bcf66a25c8a9bd9543a37940 files/heartbeat-1.2.3-misc_security_fixes.patch 7756
 AUX heartbeat-init 1616 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f SHA1 9c20eff23ee59434b1d9f222adb587c1bc7a7e26 SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437
 MD5 74949e88062a20f9c6c20dd01c20533b files/heartbeat-init 1616
 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f files/heartbeat-init 1616
 SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437 files/heartbeat-init 1616
-DIST heartbeat-1.2.3.tar.gz 1772513 RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 SHA1 e3ea8f25e4d5d453f91a86ce5e4ac48e8d4e945e SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2
 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
-EBUILD heartbeat-1.2.3-r1.ebuild 2100 RMD160 ad770c6f19db4f66464fb9607cacac15be85993a SHA1 fe084e17812f5147a6ff6188fb4a95e5a901734f SHA256 4a9cd43da95d4acc27ef2052834455b7204478db711057f01ea704db2418a4b2
-MD5 4a49236960a441f4fecb1530de623e76 heartbeat-1.2.3-r1.ebuild 2100
-RMD160 ad770c6f19db4f66464fb9607cacac15be85993a heartbeat-1.2.3-r1.ebuild 2100
-SHA256 4a9cd43da95d4acc27ef2052834455b7204478db711057f01ea704db2418a4b2 heartbeat-1.2.3-r1.ebuild 2100
-EBUILD heartbeat-1.2.3-r2.ebuild 2154 RMD160 6d6d68390bcac5b14faf8d4d1fece1242e19382e SHA1 949bd104fb51b9ed7137aea863f4e4aea3d2438c SHA256 eaf875004987a4a2e8a66e075520376f24d49a12d62ab794a3cb73fac17647bc
-MD5 f2b532351a9e4594ec5489b3855a2737 heartbeat-1.2.3-r2.ebuild 2154
-RMD160 6d6d68390bcac5b14faf8d4d1fece1242e19382e heartbeat-1.2.3-r2.ebuild 2154
-SHA256 eaf875004987a4a2e8a66e075520376f24d49a12d62ab794a3cb73fac17647bc heartbeat-1.2.3-r2.ebuild 2154
 EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 b25871073d61edada88a167eaf37a4de2b552d6a SHA1 377835bafed1fd11cd8ca768b0b6ef12d8b125a7 SHA256 66e711596a2b2dad696930abe7ccde73340e6742a09499a65795236fa1e425c0
 MD5 f58c89bbad4b79cf45813b8425371891 heartbeat-1.2.5.ebuild 1986
 RMD160 b25871073d61edada88a167eaf37a4de2b552d6a heartbeat-1.2.5.ebuild 1986
@@ -32,20 +15,14 @@ EBUILD heartbeat-2.0.7-r1.ebuild 3081 RMD160 f37fb7fe0ec3f3756d5c1b91c8d4a8f5365
 MD5 2b6beb88a677967937913d0f90eb9e74 heartbeat-2.0.7-r1.ebuild 3081
 RMD160 f37fb7fe0ec3f3756d5c1b91c8d4a8f53659c510 heartbeat-2.0.7-r1.ebuild 3081
 SHA256 20c61c7ab58e280bccb43b38ae431c3f46fcec85ca979cfe5a9c83d5f61b7d28 heartbeat-2.0.7-r1.ebuild 3081
-MISC ChangeLog 9218 RMD160 cf2fc85ef7bb947b89605b57a176a987725acccb SHA1 d560c6af1ebf7670cde1c2b3e12db0130d23a87f SHA256 c4ff08d6c404376b88ab0f2f389aef1eba7322f7e4f082ff89bcda33cabcd6ee
-MD5 c40b887354a589f7f64fb7da2ea9e9ac ChangeLog 9218
-RMD160 cf2fc85ef7bb947b89605b57a176a987725acccb ChangeLog 9218
-SHA256 c4ff08d6c404376b88ab0f2f389aef1eba7322f7e4f082ff89bcda33cabcd6ee ChangeLog 9218
+MISC ChangeLog 9437 RMD160 986b84ce54968d901052b28d4ce0fd8153870b2f SHA1 3d98c996ca2f16e6de8a0b55abc44c9642f4308c SHA256 d3d80b55ae9ea88d0bcffdfa6771cbbee707a74e17278a8d008007cf2f71afbb
+MD5 607b972fcc2f07e5e10ccf40ee4a5b07 ChangeLog 9437
+RMD160 986b84ce54968d901052b28d4ce0fd8153870b2f ChangeLog 9437
+SHA256 d3d80b55ae9ea88d0bcffdfa6771cbbee707a74e17278a8d008007cf2f71afbb ChangeLog 9437
 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339
 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635 metadata.xml 339
-MD5 415608c317af65c870b640a0395a3cf6 files/digest-heartbeat-1.2.3-r1 250
-RMD160 84e81768fd2d08451886f4b940e30afe0f860780 files/digest-heartbeat-1.2.3-r1 250
-SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/digest-heartbeat-1.2.3-r1 250
-MD5 415608c317af65c870b640a0395a3cf6 files/digest-heartbeat-1.2.3-r2 250
-RMD160 84e81768fd2d08451886f4b940e30afe0f860780 files/digest-heartbeat-1.2.3-r2 250
-SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/digest-heartbeat-1.2.3-r2 250
 MD5 daf9681c106348445798e3a5ef2c244e files/digest-heartbeat-1.2.5 250
 RMD160 f4e5e39e26ea317e2573ad5b4060a7ea86db34c1 files/digest-heartbeat-1.2.5 250
 SHA256 931bb676e4aaa9426fadcc6cea6f67a3ea9f0d9d2737abb80e89eceb9bacca04 files/digest-heartbeat-1.2.5 250
@@ -55,7 +32,7 @@ SHA256 4e28f3c92fda41c864ef7aaa4d6b540a751f22135d21ae4be00a89cf5c57425d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE7eI4gMUyd/cdjWsRAq03AJ9nhq3YD4yWM+aYrCMAnqU+HlG2DQCgjqCp
-SPJp3COCBm8tSjcr4Z2WncY=
-=zjJx
+iD8DBQFFDd3QgMUyd/cdjWsRAhj4AJwIfrfxubF8r4BiT0ZQ+aRpW+/yNgCeO8L+
+HqsAloIZ2FciSBd/3amtK/E=
+=6jKf
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1
deleted file mode 100644
index 85ac88aebbda..000000000000
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
-RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513
-SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
deleted file mode 100644
index 85ac88aebbda..000000000000
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
-RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513
-SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch
deleted file mode 100644
index e81a6c289279..000000000000
--- a/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/heartbeat/resource.d/LVM.in	20 Apr 2004 05:05:29 -0000	1.2.4.1
-+++ b/heartbeat/resource.d/LVM.in	10 Jun 2005 07:46:28 -0000
-@@ -102,8 +102,15 @@ LVM_methods() {
- #
- LVM_status() {
- 
--  vgdisplay $1 | grep -i 'Status.*available' >/dev/null
--  
-+  if 
-+    [ "$LVM_VERSION" -gt "200" ]
-+  then
-+  	vgdisplay -v $1 | grep -i 'Status[ \t]*available' &>/dev/null
-+	return $?
-+  else
-+  	vgdisplay $1 | grep -i 'Status.*available' >/dev/null
-+	return $?
-+  fi
- }
- 
- #
-@@ -111,15 +118,27 @@ LVM_status() {
- #
- LVM_report_status() {
- 
--  VGOUT=`vgdisplay $1 2>&1`
-+  if 
-+    [ "$LVM_VERSION" -gt "200" ]
-+  then
-+  	VGOUT=`vgdisplay -v $1 2>&1`
-+	echo "$VGOUT" | grep -i 'Status[ \t]*available' >/dev/null
-+	rc=$?
-+  else
-+  	VGOUT=`vgdisplay $1 2>&1`
-+  	echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
-+	rc=$?
-+  fi
-+
-   if
--    echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
-+    [ $rc -eq 0 ]
-   then
-     : Volume $1 is available
-   else
-     echo "LVM Volume $1 is not available (stopped)"
-     return 1
-   fi
-+
-   if
-     echo "$VGOUT" | grep -i 'Access.*read/write' >/dev/null
-   then
-@@ -155,7 +174,15 @@ LVM_monitor() {
- LVM_start() {
- 
-   ha_log "Activating volume group $1"
--  run vgscan $1
-+
-+  if 
-+    [ "$LVM_VERSION" -gt "200" ]
-+  then
-+  	run vgscan
-+  else
-+  	run vgscan $1
-+  fi
-+
-   run vgchange -a y $1 || return 1
- 
-   if
-@@ -196,6 +223,15 @@ if
- then
-   LVM_methods
-   exit $?
-+fi
-+
-+LVM_VERSION=`LVM_VERSION=`/sbin/lvm version 2> /dev/null | awk '/LVM/ {print $3}' | awk -F"." '{print $1$2}'`
-+rc=$?
-+if 
-+  [ $rc -ne 0 ]
-+then
-+  ha_log "ERROR: LVM: $1 could not determine LVM version"
-+  return  $rc
- fi
- 
- VOLUME=$1
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch
deleted file mode 100644
index 14a9f7466452..000000000000
--- a/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch
+++ /dev/null
@@ -1,202 +0,0 @@
---- heartbeat-1.2.3.orig/heartbeat/lib/BasicSanityCheck.in	2004-09-17 08:36:27.000000000 +0200
-+++ heartbeat-1.2.3/heartbeat/lib/BasicSanityCheck.in	2005-07-13 21:20:57.000000000 +0200
-@@ -43,7 +43,8 @@ DEFAULTINTERFACE=eth0	# But we really gu
- IDENTSTRING="Linux-HA TEST configuration file - REMOVEME!!"
- DUMMYNODE=ImAlwaysDead.com
- LOCALNODE=`uname -n`
--LOGFILE=/tmp/linux-ha.testlog
-+LOGFILE=`tempfile -p l-ha. -s testlog`
-+TMPFILE=`tempfile -p l-ha.`
- RSCDIR=$HADIR/resource.d
- errcount=0
- 
-@@ -228,9 +229,9 @@ else print $0 ; next } \
- if (done ==1 || $1 == "#" || $1 == " ") next; \
- if ($1 == "auth") {method = $2; next} \
- if ($1 !=  method) {done=1; method =$1;  pass=2; nextfile}}' \
--$HADIR/authkeys $HADIR/authkeys >/tmp/tmpfile
-+$HADIR/authkeys $HADIR/authkeys >$TMPFILE
- 
--mv /tmp/tmpfile  $HADIR/authkeys
-+mv $TMPFILE  $HADIR/authkeys
- chmod 600 $HADIR/authkeys
- }
- #	Check for the given count of the given string
-@@ -532,7 +533,7 @@ StonithCheck() {
- 
- 
- AppHBCheck() {
--	CFFILE=/tmp/$$.apphbd.cf
-+	CFFILE=`tempfile`
- 	clientcount=5
- 	cat <<-! >$CFFILE
- 		realtime yes
---- heartbeat-1.2.3.orig/heartbeat/resource.d/WAS.in	2002-03-24 00:39:42.000000000 +0100
-+++ heartbeat-1.2.3/heartbeat/resource.d/WAS.in	2005-07-13 21:26:00.000000000 +0200
-@@ -302,7 +302,7 @@ WAS_report_status() {
- #	This is actually faster than WAS_status above...
- #
- WAS_monitor() {
--  tmpfile=/tmp/$$.was-mon
-+  tmpfile=`tempfile`
-   SnoopPort=`GetWASSnoopPort $1`
-   output=`$WGET -nv -O$tmpfile  http://localhost:$SnoopPort/servlet/snoop 2>&1`
-   rc=$?
---- heartbeat-1.2.3.orig/lib/plugins/stonith/meatware.c	2004-04-20 10:50:06.000000000 +0200
-+++ heartbeat-1.2.3/lib/plugins/stonith/meatware.c	2005-07-13 21:13:06.000000000 +0200
-@@ -308,7 +308,7 @@ static int
- meatware_reset_req(Stonith * s, int request, const char * host)
- {
- 	int fd, rc;
--	const char *	meatpipe_pr = "/tmp/.meatware"; /* if you intend to
-+	const char *	meatpipe_pr = "/var/run/meatware"; /* if you intend to
- 							change this, modify
- 							meatclient.c as well */
- 
---- heartbeat-1.2.3.orig/lib/stonith/meatclient.c	2004-04-20 11:08:51.000000000 +0200
-+++ heartbeat-1.2.3/lib/stonith/meatclient.c	2005-07-13 21:12:35.000000000 +0200
-@@ -55,7 +55,7 @@ int
- main(int argc, char** argv)
- {
- 	char *		cmdname;
--	const char *	meatpipe_pr = "/tmp/.meatware";	/* if you intend to
-+	const char *	meatpipe_pr = "/var/run/meatware";	/* if you intend to
- 							 change this, modify
- 							 meatware.c as well */
- 	char *		opthost = NULL;
---- heartbeat-1.2.3.orig/cts/CM_hb.py.in
-+++ heartbeat-1.2.3/cts/CM_hb.py.in
-@@ -57,7 +57,7 @@
-             "StartDRBDCmd"   : "@sysconfdir@/init.d/drbd start >/dev/null 2>&1",
-             "StopDRBDCmd"    : "@sysconfdir@/init.d/drbd stop",
-             "StatusDRBDCmd"  : "@sysconfdir@/init.d/drbd status",
--            "DRBDCheckconf"  : "@sysconfdir@/init.d/drbd checkconfig >/tmp/drbdconf 2>&1",
-+            "DRBDCheckconf"  : "@sysconfdir@/init.d/drbd checkconfig >/var/run/drbdconf 2>&1",
-             "BreakCommCmd"   : "@libdir@/heartbeat/TestHeartbeatComm break-communication >/dev/null 2>&1",
-             "FixCommCmd"     : "@libdir@/heartbeat/TestHeartbeatComm fix-communication >/dev/null 2>&1",
-             "IPaddrCmd"      : "@sysconfdir@/ha.d/resource.d/IPaddr %s status",
-only in patch2:
-unchanged:
---- heartbeat-1.2.3.orig/cts/CTStests.py.in
-+++ heartbeat-1.2.3/cts/CTStests.py.in
-@@ -870,7 +870,7 @@
-             time.sleep(5)  # We get extra messages right after startup.
- 
- 
--        fstmpfile = "/tmp/band_estimate"
-+        fstmpfile = "/var/run/band_estimate"
-         dumpcmd = "tcpdump -p -n -c 102 -i any udp port %d > %s 2>&1" \
- 	%		(port, fstmpfile);
-  
-@@ -1073,9 +1073,9 @@
-         while 1:
-             if (time.time()>done):
-                 return self.failure("the drbd could't sync")
--            self.CM.rsh(node,"cp /proc/drbd /tmp >/dev/null 2>&1")
--            if self.CM.rsh.cp("%s:/tmp/drbd" % node,"/tmp"):
--                line = open("/tmp/drbd").readlines()[2]
-+            self.CM.rsh(node,"cp /proc/drbd /var/run >/dev/null 2>&1")
-+            if self.CM.rsh.cp("%s:/var/run/drbd" % node,"/var/run"):
-+                line = open("/tmp/var/run").readlines()[2]
-                 p = line.find("Primary")
-                 s1 = line.find("Secondary")
-                 s2 = line.rfind("Secondary")
-@@ -1111,8 +1111,8 @@
-     def getdevice(self,node):
-         device=None
-         if self.CM.rsh(node,self.CM["DRBDCheckconf"])==0:
--            self.CM.rsh.cp("%s:/tmp/drbdconf" % node, "/tmp")
--            lines=open("/tmp/drbdconf","r")
-+            self.CM.rsh.cp("%s:/var/run/drbdconf" % node, "/var/run")
-+            lines=open("/var/run/drbdconf","r")
-             for line in lines:
-                 if line.find("%s:device" % node)!=-1:
-                     device=string.split(line," ")[8]
---- a/heartbeat/resource.d/IPaddr.in	12 Sep 2004 00:06:10 -0000	1.52.2.7
-+++ b/heartbeat/resource.d/IPaddr.in	16 Jul 2005 14:46:19 -0000
-@@ -24,7 +24,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- HA_D=@sysconfdir@/ha.d
--CONF_D=@sysconfdir@/ha.d/conf
- . ${HA_D}/shellfuncs
- 
- IFCONFIG=@IFCONFIG@
-@@ -564,8 +563,8 @@
- 
-   ha_log "info: Sending Gratuitous Arp for $BASEIP on $IF [$TARGET_INTERFACE]"
- 
--  [ -r ${CONF_D}/arp_config ] && . ${CONF_D}/arp_config
--  [ -r "${CONF_D}/arp_config:${TARGET_INTERFACE}" ] && . "${CONF_D}/arp_config:${TARGET_INTERFACE}"
-+  [ -r ${HA_CONFDIR}/arp_config ] && . ${HA_CONFDIR}/arp_config
-+  [ -r "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}" ] && . "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}"
- 
-   # Set default values (can be overridden as described above)
- 
---- a/heartbeat/resource.d/IPaddr2.in	4 Apr 2005 08:28:09 -0000	1.8.2.6
-+++ b/heartbeat/resource.d/IPaddr2.in	16 Jul 2005 14:46:19 -0000
-@@ -254,10 +254,10 @@
-     #
-     # Run send_arp to note peers about new mac address
-     #
--    [ -r ${CONF_D}/arp_config ] && . ${CONF_D}/arp_config
--    if [ -r "${CONF_D}/arp_config:${TARGET_INTERFACE}" ]
-+    [ -r ${HA_CONFDIR}/arp_config ] && . ${HA_CONFDIR}/arp_config
-+    if [ -r "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}" ]
-     then
--	. "${CONF_D}/arp_config:${TARGET_INTERFACE}"
-+	. "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}"
-     fi
- 
-     # Set default values (can be overridden as described above)
---- a/heartbeat/resource.d/SendArp.in	20 Apr 2004 05:05:29 -0000	1.1.2.1
-+++ b/heartbeat/resource.d/SendArp.in	16 Jul 2005 14:46:19 -0000
-@@ -70,10 +70,10 @@
- 	    ;;
-     esac
- 
--    [ -r ${CONF_D}/arp_config ] && . ${CONF_D}/arp_config
--    if [ -r "${CONF_D}/arp_config:${TARGET_INTERFACE}" ]
-+    [ -r ${HA_CONFDIR}/arp_config ] && . ${HA_CONFDIR}/arp_config
-+    if [ -r "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}" ]
-     then
--	. "${CONF_D}/arp_config:${TARGET_INTERFACE}"
-+	. "${HA_CONFDIR}/arp_config:${TARGET_INTERFACE}"
-     fi
- 
-     # Set default values
---- a/heartbeat/shellfuncs.in	24 Jun 2003 07:18:20 -0000	1.6
-+++ b/heartbeat/shellfuncs.in	16 Jul 2005 14:46:19 -0000
-@@ -6,6 +6,7 @@
- exec_prefix=@exec_prefix@
- : ${HA_DIR=@sysconfdir@/ha.d}
- : ${HA_RCDIR=$HA_DIR/rc.d}
-+: ${HA_CONFDIR=$HA_DIR/conf}
- : ${HA_CF=$HA_DIR/ha.cf}
- : ${HA_VARLIB=@localstatedir@/lib/heartbeat}
- : ${HA_RSCTMP=@localstatedir@/lib/heartbeat/rsctmp}
---- a/heartbeat/resource.d/IPaddr2.in	30 Aug 2004 09:08:24 -0000	1.8.2.5
-+++ b/heartbeat/resource.d/IPaddr2.in	4 Apr 2005 08:28:09 -0000	1.8.2.6
-@@ -356,12 +356,16 @@
- 	esac
-     fi
- 
--    if
--	[ -z "$IF" ]
--    then
--	: Requested interface not in use
--	exit 0
--    fi
-+    #
-+    #	Do we already service this IP address?
-+    #
-+    case `status $1` in
-+	stopped|loopback)
-+	    : Requested interface not in use
-+	    exit 0
-+	    ;;
-+    esac
-+
- 
-     #
-     #	If there is local_giveip script, run it.
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
deleted file mode 100644
index 661d1898365b..000000000000
--- a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.6 2006/02/13 15:10:06 mcummings Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org"
-SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -mips ~ppc ~amd64"
-IUSE="ldirectord"
-
-DEPEND="dev-libs/popt
-	=dev-libs/glib-1.2*
-	net-libs/libnet
-	ldirectord? (	sys-cluster/ipvsadm
-			dev-perl/libwww-perl
-			dev-perl/perl-ldap
-			virtual/perl-libnet )"
-
-# need to add dev-perl/Mail-IMAPClient inside ldirectord above
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/heartbeat-1.2.3-misc_security_fixes.patch || die
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-group-name=cluster \
-		--with-group-id=65 \
-		--with-ccmuser-name=cluster \
-		--with-ccmuser-id=65 || die
-	emake -j 1 || die "compile problem"
-}
-
-pkg_preinst() {
-	# check for cluster group, if it doesn't exist make it
-	if ! grep -q cluster.*65 /etc/group ; then
-		groupadd -g 65 cluster
-	fi
-	# check for cluster user, if it doesn't exist make it
-	if ! grep -q cluster.*65 /etc/passwd ; then
-		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# heartbeat modules need these dirs
-	keepdir /var/lib/heartbeat/ckpt /var/lib/heartbeat/ccm /var/lib/heartbeat
-
-	keepdir /etc/ha.d/conf
-
-	dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die
-
-	# if ! USE="ldirectord" then don't install it
-	if ! use ldirectord ; then
-		rm ${D}/etc/init.d/ldirectord
-		rm ${D}/etc/logrotate.d/ldirectord
-		rm ${D}/usr/man/man8/supervise-ldirectord-config.8
-		rm ${D}/usr/man/man8/ldirectord.8
-		rm ${D}/usr/sbin/ldirectord
-		rm ${D}/usr/sbin/supervise-ldirectord-config
-		rm ${D}/etc/ha.d/resource.d/ldirectord
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
-}
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
deleted file mode 100644
index 72f226172560..000000000000
--- a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild,v 1.5 2006/02/13 15:10:06 mcummings Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org"
-SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -mips ~ppc ~amd64"
-IUSE="ldirectord"
-
-DEPEND="dev-libs/popt
-	=dev-libs/glib-1.2*
-	net-libs/libnet
-	ldirectord? (	sys-cluster/ipvsadm
-			dev-perl/libwww-perl
-			dev-perl/perl-ldap
-			virtual/perl-libnet )"
-
-# need to add dev-perl/Mail-IMAPClient inside ldirectord above
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/heartbeat-1.2.3-misc_security_fixes.patch || die
-	epatch ${FILESDIR}/heartbeat-1.2.3-lvm.patch || die
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-group-name=cluster \
-		--with-group-id=65 \
-		--with-ccmuser-name=cluster \
-		--with-ccmuser-id=65 || die
-	emake -j 1 || die "compile problem"
-}
-
-pkg_preinst() {
-	# check for cluster group, if it doesn't exist make it
-	if ! grep -q cluster.*65 /etc/group ; then
-		groupadd -g 65 cluster
-	fi
-	# check for cluster user, if it doesn't exist make it
-	if ! grep -q cluster.*65 /etc/passwd ; then
-		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# heartbeat modules need these dirs
-	keepdir /var/lib/heartbeat/ckpt /var/lib/heartbeat/ccm /var/lib/heartbeat
-
-	keepdir /etc/ha.d/conf
-
-	dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die
-
-	# if ! USE="ldirectord" then don't install it
-	if ! use ldirectord ; then
-		rm ${D}/etc/init.d/ldirectord
-		rm ${D}/etc/logrotate.d/ldirectord
-		rm ${D}/usr/man/man8/supervise-ldirectord-config.8
-		rm ${D}/usr/man/man8/ldirectord.8
-		rm ${D}/usr/sbin/ldirectord
-		rm ${D}/usr/sbin/supervise-ldirectord-config
-		rm ${D}/etc/ha.d/resource.d/ldirectord
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
-}