From: Christian Zoffoli <xmerlin@gentoo.org>
Date: Wed, 28 Feb 2007 17:48:39 +0000 (+0000)
Subject: Ebuild cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ca49bf39be6d7ed5009b88f5141528b4c7fdedf;p=gentoo.git

Ebuild cleanup.
Package-Manager: portage-2.1.2-r9
---

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index ddd2aeee3ef1..3dcd95af8ea9 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.61 2007/02/28 17:35:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.62 2007/02/28 17:48:39 xmerlin Exp $
+
+  28 Feb 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  -heartbeat-2.0.7-r1.ebuild:
+  Ebuild cleanup.
 
 *heartbeat-2.0.8 (28 Feb 2007)
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 28524413d9e3..ec6d76861f13 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -24,10 +24,6 @@ EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 b25871073d61edada88a167eaf37a4de2b552d
 MD5 f58c89bbad4b79cf45813b8425371891 heartbeat-1.2.5.ebuild 1986
 RMD160 b25871073d61edada88a167eaf37a4de2b552d6a heartbeat-1.2.5.ebuild 1986
 SHA256 66e711596a2b2dad696930abe7ccde73340e6742a09499a65795236fa1e425c0 heartbeat-1.2.5.ebuild 1986
-EBUILD heartbeat-2.0.7-r1.ebuild 2974 RMD160 fd1d23ef5ffd94be642569fb8daaaa8b327ab2c6 SHA1 fb459abad2b5d90abf25462d5b59484f3570ba5b SHA256 b15613b71a255ca99355549332fefb53faac9ade794de2e4fb15d31ece6bcb13
-MD5 ad8ef101825b35126e9f8db18c85d747 heartbeat-2.0.7-r1.ebuild 2974
-RMD160 fd1d23ef5ffd94be642569fb8daaaa8b327ab2c6 heartbeat-2.0.7-r1.ebuild 2974
-SHA256 b15613b71a255ca99355549332fefb53faac9ade794de2e4fb15d31ece6bcb13 heartbeat-2.0.7-r1.ebuild 2974
 EBUILD heartbeat-2.0.7-r2.ebuild 3128 RMD160 a3dde1723ded736bbe654141e0a57a053eed9c55 SHA1 61a1656262f8a412015660d6c08a2534716ab0b8 SHA256 1086614c3b0f08b100521264328366be495226837b71c091f640bff28dc2e2a6
 MD5 5e7cc1f69f30bb0cf9b8b3f36c6f407e heartbeat-2.0.7-r2.ebuild 3128
 RMD160 a3dde1723ded736bbe654141e0a57a053eed9c55 heartbeat-2.0.7-r2.ebuild 3128
@@ -36,10 +32,10 @@ EBUILD heartbeat-2.0.8.ebuild 3126 RMD160 00786494cedfdf61997603335ac337eac335bc
 MD5 b270e315f83bacf3ac8339429b03b61c heartbeat-2.0.8.ebuild 3126
 RMD160 00786494cedfdf61997603335ac337eac335bcc2 heartbeat-2.0.8.ebuild 3126
 SHA256 8ec998f6b663ca229e8ffd47eead5a44a350a6adb30ad9fb298ef732630d31f9 heartbeat-2.0.8.ebuild 3126
-MISC ChangeLog 10198 RMD160 d9dae3aadff0da3d8907e8cbe9b4ea0656b7088e SHA1 567fd304f92d7a2186a1885b7c7800dfe906d101 SHA256 4c6d7036e099d06ed02c5153e8a46d8c7e8fb36d95def3cad4f81e4635cc7cce
-MD5 d02d1740dfacf9a0df9b0f45363e63f9 ChangeLog 10198
-RMD160 d9dae3aadff0da3d8907e8cbe9b4ea0656b7088e ChangeLog 10198
-SHA256 4c6d7036e099d06ed02c5153e8a46d8c7e8fb36d95def3cad4f81e4635cc7cce ChangeLog 10198
+MISC ChangeLog 10301 RMD160 d8087763130f961e573b065a47b6788682a8ae81 SHA1 6dc6c01b591c25ce662837829dbc1223ecc60a23 SHA256 12e973ecee315867d11a48c7cf6cee049833d3a553376a40878773a5cf95b6e0
+MD5 ebd58155a6583da9b53cf50c6f8ce869 ChangeLog 10301
+RMD160 d8087763130f961e573b065a47b6788682a8ae81 ChangeLog 10301
+SHA256 12e973ecee315867d11a48c7cf6cee049833d3a553376a40878773a5cf95b6e0 ChangeLog 10301
 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339
@@ -50,9 +46,6 @@ SHA256 931bb676e4aaa9426fadcc6cea6f67a3ea9f0d9d2737abb80e89eceb9bacca04 files/di
 MD5 daf9681c106348445798e3a5ef2c244e files/digest-heartbeat-1.2.5-r1 250
 RMD160 f4e5e39e26ea317e2573ad5b4060a7ea86db34c1 files/digest-heartbeat-1.2.5-r1 250
 SHA256 931bb676e4aaa9426fadcc6cea6f67a3ea9f0d9d2737abb80e89eceb9bacca04 files/digest-heartbeat-1.2.5-r1 250
-MD5 730e170420e55cc6abbb746fb0f0ae14 files/digest-heartbeat-2.0.7-r1 250
-RMD160 c33c56e13bd882781b92ac96f8a8d4fff191208e files/digest-heartbeat-2.0.7-r1 250
-SHA256 4e28f3c92fda41c864ef7aaa4d6b540a751f22135d21ae4be00a89cf5c57425d files/digest-heartbeat-2.0.7-r1 250
 MD5 730e170420e55cc6abbb746fb0f0ae14 files/digest-heartbeat-2.0.7-r2 250
 RMD160 c33c56e13bd882781b92ac96f8a8d4fff191208e files/digest-heartbeat-2.0.7-r2 250
 SHA256 4e28f3c92fda41c864ef7aaa4d6b540a751f22135d21ae4be00a89cf5c57425d files/digest-heartbeat-2.0.7-r2 250
@@ -62,7 +55,7 @@ SHA256 0564a282436fc080d1109032099efc547911dfc0f572e61e64d78c9c163f493d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF5b2LgMUyd/cdjWsRAgbmAJ90A+une3oBowkBW5te3f8MTwUM8gCgiS9w
-T3z9nC+7Jkc6B/WwSpBSvNA=
-=myRt
+iD8DBQFF5cDKgMUyd/cdjWsRArp/AJ9/0mszPNwk75jTsD9fTL6lGu3/cwCdHjr8
+Ggg+bT43bmBZ9tgca68+7Ts=
+=x5p/
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7-r1
deleted file mode 100644
index 8ff7ae56cec2..000000000000
--- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 41233e5097c42341bf2162806d4cb99c heartbeat-2.0.7.tar.gz 3327126
-RMD160 8fe70e64fc6714fef4e501ae0b240d870a51cf75 heartbeat-2.0.7.tar.gz 3327126
-SHA256 008214f51fd0c49e168d1bb262cb5c967bc166f99d0c8ff3a2623c8ba51a0ab3 heartbeat-2.0.7.tar.gz 3327126
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.7-r1.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.7-r1.ebuild
deleted file mode 100644
index 8290397ae031..000000000000
--- a/sys-cluster/heartbeat/heartbeat-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,113 +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-2.0.7-r1.ebuild,v 1.2 2006/09/17 22:48:05 xmerlin Exp $
-
-inherit flag-o-matic eutils
-
-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="~amd64 -mips ~ppc -s390 x86"
-IUSE="ldirectord doc snmp management"
-
-DEPEND="
-	=dev-libs/glib-2*
-	net-libs/libnet
-	dev-util/pkgconfig
-	>=dev-lang/perl-5.8.8
-	net-misc/iputils
-	virtual/ssh
-	net-libs/gnutls
-	ldirectord? (	sys-cluster/ipvsadm
-			dev-perl/Net-DNS
-			dev-perl/libwww-perl
-			dev-perl/perl-ldap
-			perl-core/libnet
-			dev-perl/Crypt-SSLeay
-			dev-perl/HTML-Parser
-			dev-perl/perl-ldap
-			dev-perl/Mail-IMAPClient
-			dev-perl/Mail-POP3Client
-			dev-perl/MailTools
-	)
-	snmp? ( net-analyzer/net-snmp )
-	net-misc/telnet-bsd
-	dev-lang/swig
-	management? (
-		>=dev-lang/python-2.4
-		>=dev-python/pygtk-2.4
-		>=sys-libs/pam-0.78-r3
-	)
-	"
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-group-name=cluster \
-		--with-group-id=65 \
-		--with-ccmuser-name=cluster \
-		--with-ccmuser-id=65 \
-		--enable-checkpointd \
-		--enable-crm \
-		--enable-lrm \
-		$(use_enable management mgmt) \
-		|| 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 /var/lib/heartbeat/crm /var/lib/heartbeat/lrm /var/lib/heartbeat/fencing
-	keepdir /var/lib/heartbeat/cores/cluster /var/lib/heartbeat/cores/root /var/lib/heartbeat/cores/nobody
-
-	keepdir /var/run/heartbeat/ccm /var/run/heartbeat/crm
-
-	keepdir /etc/ha.d/conf
-
-	dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die
-
-	if use management ; then
-		keepdir /var/lib/heartbeat/mgmt
-	fi
-
-	# 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}/etc/ha.d/resource.d/ldirectord
-		rm ${D}/usr/share/man/man8/supervise-ldirectord-config.8
-		rm ${D}/usr/share/man/man8/ldirectord.8
-		rm ${D}/usr/sbin/ldirectord
-		rm ${D}/usr/sbin/supervise-ldirectord-config
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
-
-	dodoc ldirectord/ldirectord.cf doc/*.cf doc/haresources doc/authkeys || die
-	if use doc ; then
-		dodoc README doc/*.txt doc/AUTHORS doc/COPYING  || die
-	fi
-}