From: Christian Zoffoli Date: Mon, 13 Mar 2006 02:02:37 +0000 (+0000) Subject: Version bump, ebuild cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ef0d8bd4bbfa7f53d6c1372a048f4a9a7f67d39;p=gentoo.git Version bump, ebuild cleanup. Package-Manager: portage-2.0.51.22-r3 --- diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index 10be82fc1b95..ccebd1bf35de 100644 --- a/sys-cluster/heartbeat/ChangeLog +++ b/sys-cluster/heartbeat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/heartbeat # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.42 2006/02/13 15:10:06 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.43 2006/03/13 02:02:37 xmerlin Exp $ + +*heartbeat-2.0.4 (13 Mar 2006) + + 13 Mar 2006; Christian Zoffoli + -heartbeat-2.0.2.ebuild, -heartbeat-2.0.2-r1.ebuild, + +heartbeat-2.0.4.ebuild: + Version bump, ebuild cleanup. 13 Feb 2006; Michael Cummings heartbeat-1.2.3.ebuild, heartbeat-1.2.3-r1.ebuild, diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest index 0d3bc7cbc7cc..c4b3707b3b18 100644 --- a/sys-cluster/heartbeat/Manifest +++ b/sys-cluster/heartbeat/Manifest @@ -1,25 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b1c75dc59be3b1722281324e450b3a0d ChangeLog 6927 +MD5 f9b07fc4b96c15ebbfc99af0eebd5533 ChangeLog 7126 +MD5 4a49236960a441f4fecb1530de623e76 heartbeat-1.2.3-r1.ebuild 2100 +MD5 f2b532351a9e4594ec5489b3855a2737 heartbeat-1.2.3-r2.ebuild 2154 +MD5 89f57373b255558325c63fbdd7f578f2 heartbeat-1.2.3.ebuild 1880 +MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339 +MD5 2392c4eca484ca478d939c50bf36a213 heartbeat-2.0.4.ebuild 2664 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68 -MD5 aaf8fa43df7ae5328ab7cce82d6a7547 files/digest-heartbeat-2.0.2 68 -MD5 aaf8fa43df7ae5328ab7cce82d6a7547 files/digest-heartbeat-2.0.2-r1 68 MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660 MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821 -MD5 4a49236960a441f4fecb1530de623e76 heartbeat-1.2.3-r1.ebuild 2100 -MD5 f2b532351a9e4594ec5489b3855a2737 heartbeat-1.2.3-r2.ebuild 2154 -MD5 89f57373b255558325c63fbdd7f578f2 heartbeat-1.2.3.ebuild 1880 -MD5 deafecdceb04f13e2f0fcc45d252a68c heartbeat-2.0.2-r1.ebuild 2600 -MD5 aafa134b6be2b54b02e79348f54e578d heartbeat-2.0.2.ebuild 2668 -MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339 +MD5 cae8a5342b1daa811a2421e405972387 files/digest-heartbeat-2.0.4 68 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFD8KFEtG5z4I8BtQoRAj1yAKCJ0zqgSwkEWteTvBXohFStB7UpSQCdFRPq -kxi/jBcYO44H7ERVr2CLlbU= -=jzRf +iD8DBQFEFOGRgMUyd/cdjWsRAoSZAKCQVQUT5UxBzH1FuWKqSdzv0KjEwgCfdFxF +IHqvIUDuDM2cyDIuMajmOLs= +=Hbyq -----END PGP SIGNATURE----- diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2 deleted file mode 100644 index 6e794ff34b1b..000000000000 --- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 097de2cc6d15f8f87ea39ab521f616d5 heartbeat-2.0.2.tar.gz 2189961 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1 deleted file mode 100644 index 6e794ff34b1b..000000000000 --- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 097de2cc6d15f8f87ea39ab521f616d5 heartbeat-2.0.2.tar.gz 2189961 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 new file mode 100644 index 000000000000..cc4914c94d4c --- /dev/null +++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 @@ -0,0 +1 @@ +MD5 659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz 2807110 diff --git a/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild deleted file mode 100644 index 3aba12dbcee2..000000000000 --- a/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild +++ /dev/null @@ -1,103 +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.2.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 doc" - -DEPEND=" - =dev-libs/glib-2* - net-libs/libnet - dev-util/pkgconfig - dev-lang/perl - net-misc/iputils - net-misc/openssh - ldirectord? ( sys-cluster/ipvsadm - dev-perl/Net-DNS - dev-perl/libwww-perl - dev-perl/perl-ldap - virtual/perl-libnet - dev-perl/Crypt-SSLeay - dev-perl/HTML-Parser - dev-perl/perl-ldap - dev-perl/Mail-IMAPClient - ) - net-misc/telnet-bsd -" - - -src_unpack() { - unpack ${A} - cd ${S} - #epatch ${FILESDIR}/heartbeat-1.2.3-misc_security_fixes.patch || die -} - -src_compile() { - append-ldflags $(bindnow-flags) - - ./configure --prefix=/usr \ - --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 \ - || 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="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 - 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 -} diff --git a/sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild similarity index 91% rename from sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild rename to sys-cluster/heartbeat/heartbeat-2.0.4.ebuild index 1f5d5fb7f6a5..88539f11e87c 100644 --- a/sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild +++ b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild @@ -1,6 +1,6 @@ # 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.2-r1.ebuild,v 1.2 2006/02/13 15:10:06 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild,v 1.1 2006/03/13 02:02:37 xmerlin Exp $ inherit flag-o-matic @@ -20,11 +20,12 @@ DEPEND=" dev-lang/perl net-misc/iputils net-misc/openssh + net-libs/gnutls ldirectord? ( sys-cluster/ipvsadm dev-perl/Net-DNS dev-perl/libwww-perl dev-perl/perl-ldap - virtual/perl-libnet + perl-core/libnet dev-perl/Crypt-SSLeay dev-perl/HTML-Parser dev-perl/perl-ldap @@ -32,6 +33,7 @@ DEPEND=" ) snmp? ( net-analyzer/net-snmp ) net-misc/telnet-bsd + dev-lang/swig " @@ -39,6 +41,7 @@ src_compile() { append-ldflags $(bindnow-flags) ./configure --prefix=/usr \ + --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ --with-group-name=cluster \ @@ -82,8 +85,8 @@ src_install() { 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/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