summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2015-03-23 11:01:10 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2015-03-23 11:01:10 +0000
commitbc2fa539db67f8d5aff73aa542f0c89b1652f800 (patch)
treebe481f5929fea0bb1284d5ce4ca10571a8c2204d /sys-cluster
parentConvert to python-r1.eclass. Fixes bug #531146. With thanks to Ian Delaney an... (diff)
downloadgentoo-2-bc2fa539db67f8d5aff73aa542f0c89b1652f800.tar.gz
gentoo-2-bc2fa539db67f8d5aff73aa542f0c89b1652f800.tar.bz2
gentoo-2-bc2fa539db67f8d5aff73aa542f0c89b1652f800.zip
fix #455418
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/libdlm/ChangeLog8
-rw-r--r--sys-cluster/libdlm/libdlm-3.1.5.ebuild10
-rw-r--r--sys-cluster/libdlm/libdlm-3.2.0.ebuild10
3 files changed, 16 insertions, 12 deletions
diff --git a/sys-cluster/libdlm/ChangeLog b/sys-cluster/libdlm/ChangeLog
index a090664f3f4d..1d7f7ebb5872 100644
--- a/sys-cluster/libdlm/ChangeLog
+++ b/sys-cluster/libdlm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/libdlm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/ChangeLog,v 1.4 2013/03/20 14:34:06 ultrabug Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/ChangeLog,v 1.5 2015/03/23 11:01:10 ultrabug Exp $
+
+ 23 Mar 2015; Ultrabug <ultrabug@gentoo.org> libdlm-3.1.5.ebuild,
+ libdlm-3.2.0.ebuild:
+ use linux-headers instead of breaking linux sources fix #455418
*libdlm-3.2.0 (20 Mar 2013)
diff --git a/sys-cluster/libdlm/libdlm-3.1.5.ebuild b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
index d6d5af79be2e..54a7dc0ebc85 100644
--- a/sys-cluster/libdlm/libdlm-3.1.5.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/libdlm-3.1.5.ebuild,v 1.3 2013/02/05 13:37:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/libdlm-3.1.5.ebuild,v 1.4 2015/03/23 11:01:10 ultrabug Exp $
-EAPI=4
+EAPI=5
-inherit linux-info multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator
CLUSTER_RELEASE="${PV}"
MY_P="cluster-${CLUSTER_RELEASE}"
@@ -37,7 +37,7 @@ src_configure() {
--cflags="-Wall" \
--libdir=/usr/$(get_libdir) \
--disable_kernel_check \
- --kernel_src=${KERNEL_DIR} \
+ --kernel_src=/usr/ \
--somajor="$MAJ_PV" \
--sominor="$MIN_PV" \
--dlmlibdir=/usr/$(get_libdir) \
diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index 869c0e7f9a48..c413415add51 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/libdlm-3.2.0.ebuild,v 1.1 2013/03/20 14:34:06 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libdlm/libdlm-3.2.0.ebuild,v 1.2 2015/03/23 11:01:10 ultrabug Exp $
-EAPI=4
+EAPI=5
-inherit linux-info multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator
CLUSTER_RELEASE="${PV}"
MY_P="cluster-${CLUSTER_RELEASE}"
@@ -43,7 +43,7 @@ src_configure() {
--cflags="-Wall" \
--libdir=/usr/$(get_libdir) \
--disable_kernel_check \
- --kernel_src=${KERNEL_DIR} \
+ --kernel_src=/usr/ \
--somajor="$MAJ_PV" \
--sominor="$MIN_PV" \
--dlmlibdir=/usr/$(get_libdir) \