Version bump.

(Portage version: 2.1.2-r9)

6 files changed, 59 insertions, 13 deletions

diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index 6e07070809be..4a70feb5fa46 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/dlm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.26 2006/10/14 17:55:35 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.27 2007/03/09 11:11:59 xmerlin Exp $
+
+*dlm-1.04.00 (03 Mar 2007)
+
+  03 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org> files/dlm.rc,
+  +dlm-1.04.00.ebuild:
+  Version bump.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org> -dlm-1.01.00.ebuild,
   -dlm-1.02.00.ebuild, dlm-1.02.00-r1.ebuild, dlm-1.03.00.ebuild:
diff --git a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
index 7a089b4bec37..546b3e1955b8 100644
--- a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
+++ b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.02.00-r1.ebuild,v 1.4 2006/10/14 17:55:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.02.00-r1.ebuild,v 1.5 2007/03/09 11:11:59 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,7 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86"
 
-DEPEND=">=sys-cluster/dlm-headers-1.02.00-r1"
+DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -26,8 +27,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR=${D} install || die "install problem"
+	rm -f ${D}/usr/include/libdlm.h
 
 	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
-
 	dodoc doc/*.txt
 }
diff --git a/sys-cluster/dlm/dlm-1.03.00.ebuild b/sys-cluster/dlm/dlm-1.03.00.ebuild
index 7f4b2b502eec..cf26aa3062e3 100644
--- a/sys-cluster/dlm/dlm-1.03.00.ebuild
+++ b/sys-cluster/dlm/dlm-1.03.00.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.03.00.ebuild,v 1.2 2006/10/14 17:55:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.03.00.ebuild,v 1.3 2007/03/09 11:11:59 xmerlin Exp $
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="General-purpose Distributed Lock Manager"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -14,7 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
-DEPEND=">=sys-cluster/dlm-headers-1.03.00"
+DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -26,6 +27,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR=${D} install || die "install problem"
+	rm -f ${D}/usr/include/libdlm.h
 
 	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
 	dodoc doc/*.txt
diff --git a/sys-cluster/dlm/dlm-1.04.00.ebuild b/sys-cluster/dlm/dlm-1.04.00.ebuild
new file mode 100644
index 000000000000..140f67660377
--- /dev/null
+++ b/sys-cluster/dlm/dlm-1.04.00.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.04.00.ebuild,v 1.1 2007/03/09 11:11:59 xmerlin Exp $
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="General-purpose Distributed Lock Manager"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+IUSE=""
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="=sys-cluster/dlm-headers-${CLUSTER_RELEASE}*"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_compile() {
+	./configure || die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install problem"
+	rm -f ${D}/usr/include/libdlm.h
+
+	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	dodoc doc/*.txt
+}
diff --git a/sys-cluster/dlm/files/digest-dlm-1.04.00 b/sys-cluster/dlm/files/digest-dlm-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/dlm/files/digest-dlm-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798
diff --git a/sys-cluster/dlm/files/dlm.rc b/sys-cluster/dlm/files/dlm.rc
index 36f4750c9d49..e1d07c7f3fc0 100755
--- a/sys-cluster/dlm/files/dlm.rc
+++ b/sys-cluster/dlm/files/dlm.rc
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.3 2005/03/25 02:14:00 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/files/dlm.rc,v 1.4 2007/03/09 11:11:59 xmerlin Exp $
 
 depend() {
 	use net
-	need cman
+	need cluster-manager
 	provide cluster-locking-manager
 }