summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-02 15:31:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-02 15:31:51 +0000
commitabf38be0e62958d33319b28cf5ba91cda2076261 (patch)
treef559360c48a9d5ab5f7552d007e618c0d883f2cd /sys-fs/lvm2
parentRestore stable keywords. (diff)
downloadgentoo-2-abf38be0e62958d33319b28cf5ba91cda2076261.tar.gz
gentoo-2-abf38be0e62958d33319b28cf5ba91cda2076261.tar.bz2
gentoo-2-abf38be0e62958d33319b28cf5ba91cda2076261.zip
Set QA_MULTILIB_PATHS wrt #479520 by Andrey Ovcharov
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r--sys-fs/lvm2/ChangeLog5
-rw-r--r--sys-fs/lvm2/lvm2-2.02.99.ebuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 215bc3fa2ee1..167761ae15c2 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/lvm2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.308 2013/08/02 06:59:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.309 2013/08/02 15:31:51 ssuominen Exp $
+
+ 02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.99.ebuild:
+ Set QA_MULTILIB_PATHS wrt #479520 by Andrey Ovcharov
02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.99.ebuild:
Pass --with-default-pid-dir=/run and build lvm2_activation_generator_systemd
diff --git a/sys-fs/lvm2/lvm2-2.02.99.ebuild b/sys-fs/lvm2/lvm2-2.02.99.ebuild
index 4251958dd490..f06fa7210786 100644
--- a/sys-fs/lvm2/lvm2-2.02.99.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.99.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99.ebuild,v 1.3 2013/08/02 06:59:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99.ebuild,v 1.4 2013/08/02 15:31:51 ssuominen Exp $
EAPI=5
inherit eutils multilib toolchain-funcs autotools linux-info udev systemd
@@ -16,9 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin"
-DEPEND_COMMON="readline? ( sys-libs/readline )
- clvm? ( =sys-cluster/libdlm-3*
- cman? ( =sys-cluster/cman-3* ) )
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+ readline? ( sys-libs/readline )
udev? ( >=virtual/udev-200[static-libs?] )"
# /run is now required for locking during early boot. /var cannot be assumed to
# be available.
@@ -35,10 +34,12 @@ RDEPEND="${RDEPEND}
DEPEND="${DEPEND_COMMON}
virtual/pkgconfig
>=sys-devel/binutils-2.20.1-r1
- static? ( udev? ( virtual/udev[static-libs] ) )"
+ static? ( udev? ( >=virtual/udev-200[static-libs] ) )"
S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+QA_MULTILIB_PATHS="usr/lib/systemd/system-generators/.*" #479520
+
pkg_setup() {
local CONFIG_CHECK="~SYSVIPC"
use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"