Ebuild cleanup, version bump.

(Portage version: 2.1.4.4)

6 files changed, 15 insertions, 184 deletions

diff --git a/sys-cluster/dlm/ChangeLog b/sys-cluster/dlm/ChangeLog
index dfc87f333be3..16289281e63f 100644
--- a/sys-cluster/dlm/ChangeLog
+++ b/sys-cluster/dlm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.34 2008/04/10 08:15:45 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/ChangeLog,v 1.35 2008/11/13 19:01:06 xmerlin Exp $
+
+*dlm-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -dlm-1.02.00-r1.ebuild, -dlm-1.03.00.ebuild, -dlm-1.04.00.ebuild,
+  -dlm-2.02.00.ebuild, -dlm-2.02.00-r1.ebuild, +dlm-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   10 Apr 2008; Christian Zoffoli <xmerlin@gentoo.org> dlm-2.02.00.ebuild,
   dlm-2.02.00-r1.ebuild:
diff --git a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild b/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
deleted file mode 100644
index b836ea0ce9fc..000000000000
--- a/sys-cluster/dlm/dlm-1.02.00-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.6 2008/03/17 16:43:31 xmerlin Exp $
-
-CLUSTER_RELEASE="1.02.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/dlm-1.03.00.ebuild b/sys-cluster/dlm/dlm-1.03.00.ebuild
deleted file mode 100644
index ff683f757f8c..000000000000
--- a/sys-cluster/dlm/dlm-1.03.00.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.6 2008/03/17 16:43:31 xmerlin Exp $
-
-CLUSTER_RELEASE="1.03.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/dlm-1.04.00.ebuild b/sys-cluster/dlm/dlm-1.04.00.ebuild
deleted file mode 100644
index a5ad4a29e267..000000000000
--- a/sys-cluster/dlm/dlm-1.04.00.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.2 2008/03/17 16:43:31 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/dlm-2.02.00-r1.ebuild b/sys-cluster/dlm/dlm-2.02.00-r1.ebuild
deleted file mode 100644
index 67912b04ea74..000000000000
--- a/sys-cluster/dlm/dlm-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-r1.ebuild,v 1.3 2008/04/10 08:15:45 xmerlin Exp $
-
-inherit eutils versionator
-
-CVS_RELEASE="20080323"
-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
-	mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2
-	http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	"
-
-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"
-
-	(cd "${WORKDIR}"/${MY_P};
-		epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die
-	)
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$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/dlm-2.02.00.ebuild b/sys-cluster/dlm/dlm-2.03.09.ebuild
index 778d24b0edeb..0cbf528f7e37 100644
--- a/sys-cluster/dlm/dlm-2.02.00.ebuild
+++ b/sys-cluster/dlm/dlm-2.03.09.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2008/04/10 15:11:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm/dlm-2.03.09.ebuild,v 1.1 2008/11/13 19:01:06 xmerlin Exp $
 
-inherit eutils versionator
+inherit eutils linux-mod linux-info versionator
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-kernel/linux-headers-2.6.23
+DEPEND=">=sys-kernel/linux-headers-2.6.24
 	!sys-cluster/dlm-headers
 	!sys-cluster/dlm-kernel
 	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
@@ -39,7 +39,7 @@ src_unpack() {
 		/\tinstall/s/install/& -m 0644/' \
 		man/Makefile || die "failed patching man pages permission"
 
-	epatch "${FILESDIR}"/${P}-include.patch || die
+#	epatch "${FILESDIR}"/${P}-include.patch || die
 }
 
 src_compile() {
@@ -48,8 +48,9 @@ src_compile() {
 			--cc=$(tc-getCC) \
 			--cflags="-Wall" \
 			--disable_kernel_check \
-			--release_major="$MAJ_PV" \
-			--release_minor="$MIN_PV" \
+			--kernel_src=${KERNEL_DIR} \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
 			--cmanlibdir=/usr/lib \
 			--dlmlibdir=/usr/lib \
 			--dlmincdir=/usr/include \