Version bump. 1.0x.00 is scheduled to be removed soon.

(Portage version: 2.1.4.4)

6 files changed, 113 insertions, 17 deletions

diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index 0a5c5639b61c..9c9849f58217 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.30 2007/10/15 14:57:41 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.31 2008/03/17 16:43:31 xmerlin Exp $
+
+*dlm-2.02.00 (17 Mar 2008)
+
+  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/dlm-2.02.00-include.patch, dlm-1.02.00-r1.ebuild,
+  dlm-1.03.00.ebuild, dlm-1.04.00.ebuild, +dlm-2.02.00.ebuild:
+  Version bump. 1.0x.00 is scheduled to be removed soon.
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> dlm-1.03.00.ebuild:
   Stable on ppc64
diff --git a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
index 546b3e1955b8..b836ea0ce9fc 100644
--- a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
+++ b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5 2007/03/09 11:11:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.02.00-r1.ebuild,v 1.6 2008/03/17 16:43:31 xmerlin Exp $
 
 CLUSTER_RELEASE="1.02.00"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -26,9 +26,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
-	rm -f ${D}/usr/include/libdlm.h
+	emake DESTDIR="${D}" install || die "install problem"
+	rm -f "${D}"/usr/include/libdlm.h
 
-	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	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 8b3616acafe5..ff683f757f8c 100644
--- a/sys-cluster/dlm/dlm-1.03.00.ebuild
+++ b/sys-cluster/dlm/dlm-1.03.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5 2007/10/15 14:57:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.03.00.ebuild,v 1.6 2008/03/17 16:43:31 xmerlin Exp $
 
 CLUSTER_RELEASE="1.03.00"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -26,9 +26,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
-	rm -f ${D}/usr/include/libdlm.h
+	emake DESTDIR="${D}" install || die "install problem"
+	rm -f "${D}"/usr/include/libdlm.h
 
-	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	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
index 140f67660377..a5ad4a29e267 100644
--- a/sys-cluster/dlm/dlm-1.04.00.ebuild
+++ b/sys-cluster/dlm/dlm-1.04.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-1.04.00.ebuild,v 1.2 2008/03/17 16:43:31 xmerlin Exp $
 
 CLUSTER_RELEASE="1.04.00"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -26,9 +26,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
-	rm -f ${D}/usr/include/libdlm.h
+	emake DESTDIR="${D}" install || die "install problem"
+	rm -f "${D}"/usr/include/libdlm.h
 
-	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.rc ${PN} || die
 	dodoc doc/*.txt
 }
diff --git a/sys-cluster/dlm/dlm-2.02.00.ebuild b/sys-cluster/dlm/dlm-2.02.00.ebuild
new file mode 100644
index 000000000000..a6ecf339b4c1
--- /dev/null
+++ b/sys-cluster/dlm/dlm-2.02.00.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-2.02.00.ebuild,v 1.1 2008/03/17 16:43:31 xmerlin Exp $
+
+inherit eutils versionator
+
+CLUSTER_RELEASE="${PV}"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-kernel/linux-headers-2.6.23
+	!sys-cluster/dlm-headers
+	!sys-cluster/dlm-kernel
+	"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix the manual pages have executable bit
+	sed -i -e '
+		/\tinstall -d/s/install/& -m 0755/; t
+		/\tinstall/s/install/& -m 0644/' \
+		man/Makefile || die "failed patching man pages permission"
+
+	epatch "${FILESDIR}"/${P}-include.patch || die
+}
+
+src_compile() {
+	(cd "${WORKDIR}"/${MY_P};
+		./configure \
+			--cc=$(tc-getCC) \
+			--cflags="-Wall" \
+			--disable_kernel_check \
+			--release_major="$MAJ_PV" \
+			--release_minor="$MIN_PV" \
+			--cmanlibdir=/usr/lib \
+			--dlmlibdir=/usr/lib \
+			--dlmincdir=/usr/include \
+	) || die "configure problem"
+
+	emake clean || die "clean problem"
+	for i in tool man; do
+		emake -C $i || die "compile problem"
+	done
+}
+
+src_install() {
+	for i in tool man; do
+		emake DESTDIR="${D}" -C $i install || die "install problem"
+	done
+
+	dodoc doc/*.txt
+}
diff --git a/sys-cluster/dlm/files/dlm-2.02.00-include.patch b/sys-cluster/dlm/files/dlm-2.02.00-include.patch
new file mode 100644
index 000000000000..dc7832e682b7
--- /dev/null
+++ b/sys-cluster/dlm/files/dlm-2.02.00-include.patch
@@ -0,0 +1,20 @@
+--- cluster-2.02.00/dlm/lib/Makefile.orig	2008-03-16 15:40:43.000000000 +0000
++++ cluster-2.02.00/dlm/lib/Makefile	2008-03-16 15:40:52.000000000 +0000
+@@ -13,6 +13,8 @@
+ 
+ TARGET= libdlm
+ 
++include ../../make/defines.mk
++
+ LIBDIRT=$(TARGET).a \
+ 	$(TARGET)_lt.a \
+ 	$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} \
+@@ -27,8 +29,6 @@
+ 
+ UDEVT=51-dlm.rules
+ 
+-include ../../make/defines.mk
+-
+ SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+ STATICLIB=$(TARGET).a $(TARGET)_lt.a
+