Removed old ugly hack.

Package-Manager: portage-2.1.2-r9

diff --git a/sys-cluster/dlm-kernel/ChangeLog b/sys-cluster/dlm-kernel/ChangeLog
index ebdead7a72d08982f06eb0ae51f4466f906337ee..fd6ef742a0b0241e7300ddb038fa537097846f97 100644 (file)
--- a/sys-cluster/dlm-kernel/ChangeLog
+++ b/sys-cluster/dlm-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/dlm-kernel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.27 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.28 2007/03/10 11:55:39 xmerlin Exp $
+
+  10 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild,
+  dlm-kernel-1.04.00.ebuild:
+  Removed old ugly hack.
 
 *dlm-kernel-1.04.00 (03 Mar 2007)
 

diff --git a/sys-cluster/dlm-kernel/Manifest b/sys-cluster/dlm-kernel/Manifest
index 80c08f191c956694631c25dd1109c27156572878..6e4b52b7d5def98a69a0fc9323fa7c8e20b66ecd 100644 (file)
--- a/sys-cluster/dlm-kernel/Manifest
+++ b/sys-cluster/dlm-kernel/Manifest
@@ -5,22 +5,22 @@ DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
 DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2
 DIST dlm-kernel-1.02.00-20060714-cvs.patch.gz 2988 RMD160 72466639d655ab725aaf2db0c71cedbff0e0b089 SHA1 f82c421c7ff2fbe223d9a7736c230bfecc4d7a37 SHA256 48081d39b2a6895c696f1e860b09a1b049c50a8588137ac88f0e9654fafbcaab
-EBUILD dlm-kernel-1.02.00-r1.ebuild 1574 RMD160 acf97c8f8c67f9294f44e5a3a12a93fa53b731fc SHA1 be55f8d321712ad77fdf0635366d5a72df922be1 SHA256 36bf9e6e52d3b0f413b6ca9a2a6fb1f16f44e83f6f10256ba880867531e20c5d
-MD5 27fdfbe66761515628cccb556cf2edb9 dlm-kernel-1.02.00-r1.ebuild 1574
-RMD160 acf97c8f8c67f9294f44e5a3a12a93fa53b731fc dlm-kernel-1.02.00-r1.ebuild 1574
-SHA256 36bf9e6e52d3b0f413b6ca9a2a6fb1f16f44e83f6f10256ba880867531e20c5d dlm-kernel-1.02.00-r1.ebuild 1574
-EBUILD dlm-kernel-1.03.00.ebuild 1312 RMD160 a0c5d1580f3c77bcb8b3f67fc1c791b8d538e012 SHA1 24a21e5d5621699d1efaf90afd5eb4f2c39ec365 SHA256 55fb255f5aafc41ea4b80b26f484c0580efb9caca650ddabdfcf6a5e36a1b803
-MD5 b6c990181b412af1120f5306ed9f8f93 dlm-kernel-1.03.00.ebuild 1312
-RMD160 a0c5d1580f3c77bcb8b3f67fc1c791b8d538e012 dlm-kernel-1.03.00.ebuild 1312
-SHA256 55fb255f5aafc41ea4b80b26f484c0580efb9caca650ddabdfcf6a5e36a1b803 dlm-kernel-1.03.00.ebuild 1312
-EBUILD dlm-kernel-1.04.00.ebuild 1513 RMD160 8f78c9c7330edae0c803f4cb114d468194d9a80c SHA1 67bbeb732dde8f1fb92ee7eea42116a38a5b5ad4 SHA256 ef2d8e31cceba212f504939901ef250c84d84c45a674e8fe6fdfa98662ac82e2
-MD5 de7ec3521daa66be9ba3db1b480f10af dlm-kernel-1.04.00.ebuild 1513
-RMD160 8f78c9c7330edae0c803f4cb114d468194d9a80c dlm-kernel-1.04.00.ebuild 1513
-SHA256 ef2d8e31cceba212f504939901ef250c84d84c45a674e8fe6fdfa98662ac82e2 dlm-kernel-1.04.00.ebuild 1513
-MISC ChangeLog 4031 RMD160 750d3b6f1a0a2b84827e88d607964907ce19acd4 SHA1 8d57c17259ac12335ad56a6916dea94446c95ce4 SHA256 38c05039a9ec18629ea16f2dd248ad4d9d1f5f3552f0d64e60e1a7bb8897982d
-MD5 bfadc09214f350cd75246bb312a7f5e2 ChangeLog 4031
-RMD160 750d3b6f1a0a2b84827e88d607964907ce19acd4 ChangeLog 4031
-SHA256 38c05039a9ec18629ea16f2dd248ad4d9d1f5f3552f0d64e60e1a7bb8897982d ChangeLog 4031
+EBUILD dlm-kernel-1.02.00-r1.ebuild 1696 RMD160 f01c9d494e862b290a30da69ba5a2c13625c3500 SHA1 739d6b931ff95412fb37ca885f9067390470a8db SHA256 5b480b2ce2249f88520fcec513020dd0e4051d0f10579d239ae42ed784e913a9
+MD5 cf1e829d35afb34e22dd6026af07eaf8 dlm-kernel-1.02.00-r1.ebuild 1696
+RMD160 f01c9d494e862b290a30da69ba5a2c13625c3500 dlm-kernel-1.02.00-r1.ebuild 1696
+SHA256 5b480b2ce2249f88520fcec513020dd0e4051d0f10579d239ae42ed784e913a9 dlm-kernel-1.02.00-r1.ebuild 1696
+EBUILD dlm-kernel-1.03.00.ebuild 1474 RMD160 14fef4d01b6b8a9a1aa2cf2efa4caba5e00c2624 SHA1 d4aac9263c823c82c7b0a37e0ccb1711538a18e2 SHA256 5aec2ee76cd5a34e3c7c284450622665596ef4801c4eb3c1ec1441d1e84cbef7
+MD5 366c034caba6bbca59b287f05706f432 dlm-kernel-1.03.00.ebuild 1474
+RMD160 14fef4d01b6b8a9a1aa2cf2efa4caba5e00c2624 dlm-kernel-1.03.00.ebuild 1474
+SHA256 5aec2ee76cd5a34e3c7c284450622665596ef4801c4eb3c1ec1441d1e84cbef7 dlm-kernel-1.03.00.ebuild 1474
+EBUILD dlm-kernel-1.04.00.ebuild 1474 RMD160 63c0c12f7662e90a2e2cd2bc6b8362fe7789270f SHA1 ea1c18a0b8dfff51ca9dff17a6340e62d5f9012d SHA256 feca66fba176a269a9df4034ab034f4c16297def4b568592091be940dcc889a7
+MD5 b6734395715c5a1f25025526c60792c1 dlm-kernel-1.04.00.ebuild 1474
+RMD160 63c0c12f7662e90a2e2cd2bc6b8362fe7789270f dlm-kernel-1.04.00.ebuild 1474
+SHA256 feca66fba176a269a9df4034ab034f4c16297def4b568592091be940dcc889a7 dlm-kernel-1.04.00.ebuild 1474
+MISC ChangeLog 4199 RMD160 ea6a4c146e824b789e7bd6aba87f9ebc3e6bbd52 SHA1 e5d53487d56062070c635737b56ad36fcd9dc9ee SHA256 1771bf864ee254e48dda23fc20ae574660b17a735356f8b58c5bad8e848d865b
+MD5 95c230b81965d863533bb4b5e10f2511 ChangeLog 4199
+RMD160 ea6a4c146e824b789e7bd6aba87f9ebc3e6bbd52 ChangeLog 4199
+SHA256 1771bf864ee254e48dda23fc20ae574660b17a735356f8b58c5bad8e848d865b ChangeLog 4199
 MISC metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d SHA1 033d2c47eb2bfe68e657ac2d68a7bfd28aab5b22 SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d metadata.xml 223
@@ -37,7 +37,7 @@ SHA256 358be21a647dcb0388ec46ddf8044de17a3fdb8c57b0f63e5bcc6340eb476d31 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF8YJvgMUyd/cdjWsRAhMPAJoDOeXYaguDi25AojBXsIBzI7EzMQCdEM+Q
-wPT+yelfYvy1xELe7VKjUDM=
-=4acC
+iD8DBQFF8pzGgMUyd/cdjWsRAkO3AJ9PZe+gUyccnyaH9T8+Ed66QxyZgwCdGL3J
+Uuuw7otcvzuF35fCCRARhiw=
+=wOmw
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild
index 4d28c42f9d8ea3ea8db78c8b004c229f495078b2..a0188d18cd279f911608a5bb081e3062aebe309a 100644 (file)
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.10 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.11 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -40,6 +40,15 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${WORKDIR}/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
+
+       if kernel_is 2 6; then
+               if [ "$KV_PATCH" -ge "18" ] ; then
+                       sed -i \
+                               -e 's|version.h|utsrelease.h|g' \
+                               configure \
+                               || die "sed failed"
+               fi
+       fi
 }
 
 src_compile() {
@@ -50,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+       emake DESTDIR=${D} install || die "install problem"
        rm -f ${D}/usr/include/cluster/*
 }
 

diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
index 0634f0a09fd61c2290e65c7c8f7381a7b6f63ee6..48386709a843ad61f3bc4ca8a0bdd6927eb5099b 100644 (file)
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.7 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.8 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -33,6 +33,20 @@ pkg_setup() {
        esac
 }
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       if kernel_is 2 6; then
+               if [ "$KV_PATCH" -ge "18" ] ; then
+                       sed -i \
+                               -e 's|version.h|utsrelease.h|g' \
+                               configure \
+                               || die "sed failed"
+               fi
+       fi
+}
+
 src_compile() {
        set_arch_to_kernel
 
@@ -41,7 +55,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+       emake DESTDIR=${D} install || die "install problem"
        rm -f ${D}/usr/include/cluster/*
 }
 

diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
index eea5ae582fc7452ff33ff16652896110ab9e9e29..7e832fb7076d3f75c24147bf3632c96156c2661c 100644 (file)
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild,v 1.1 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild,v 1.2 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -55,7 +55,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+       emake DESTDIR=${D} install || die "install problem"
        rm -f ${D}/usr/include/cluster/*
 }