Ebuild cleanup, version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 15 insertions, 75 deletions

diff --git a/sys-cluster/dlm-lib/ChangeLog b/sys-cluster/dlm-lib/ChangeLog
index f01c3e58bd7d..091ef183daa1 100644
--- a/sys-cluster/dlm-lib/ChangeLog
+++ b/sys-cluster/dlm-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/ChangeLog,v 1.3 2008/03/23 17:09:49 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/ChangeLog,v 1.4 2008/11/13 19:02:22 xmerlin Exp $
+
+*dlm-lib-2.03.09 (13 Nov 2008)
+
+  13 Nov 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -dlm-lib-2.02.00.ebuild, -dlm-lib-2.02.00-r1.ebuild,
+  +dlm-lib-2.03.09.ebuild:
+  Ebuild cleanup, version bump.
 
   23 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
   dlm-lib-2.02.00-r1.ebuild:
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild
deleted file mode 100644
index 9d3162ea8574..000000000000
--- a/sys-cluster/dlm-lib/dlm-lib-2.02.00-r1.ebuild
+++ /dev/null
@@ -1,67 +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-lib/dlm-lib-2.02.00-r1.ebuild,v 1.2 2008/03/23 17:09:49 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
-	"
-
-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 \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	#emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.02.00.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
index 497978637c11..03956ab21bb6 100644
--- a/sys-cluster/dlm-lib/dlm-lib-2.02.00.ebuild
+++ b/sys-cluster/dlm-lib/dlm-lib-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-lib/dlm-lib-2.02.00.ebuild,v 1.1 2008/03/17 16:26:21 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild,v 1.1 2008/11/13 19:02:22 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
 	"
@@ -38,7 +38,6 @@ src_unpack() {
 	#	/\tinstall/s/install/& -m 0644/' \
 	#	man/Makefile || die "failed patching man pages permission"
 
-	epatch "${FILESDIR}"/${P}-include.patch || die
 }
 
 src_compile() {
@@ -47,14 +46,15 @@ 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 \
 			--cmanincdir=/usr/include \
 	) || die "configure problem"
 
 	#emake clean || die "clean problem"
-	emake || die "compile problem"
+	emake -j1 || die "compile problem"
 }
 
 src_install() {