From 12b1d70ccba67cb73f34512e14415d0a5c173c5a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 21 Aug 2015 10:40:57 +0200 Subject: [PATCH] sys-block/parted: Set correct subslot dependency for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-block/parted/metadata.xml | 10 +++++----- sys-block/parted/parted-2.4.ebuild | 6 +++--- sys-block/parted/parted-3.2.ebuild | 11 ++++++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml index 57a676994422..54903f1e1aa0 100644 --- a/sys-block/parted/metadata.xml +++ b/sys-block/parted/metadata.xml @@ -1,17 +1,17 @@ -livecd - - + livecd + + Enable device-mapper support from sys-fs/lvm2 in parted - + Enable debugging as encouraged by upstream: [The default configuration] includes --enable-debug (by default), which contains many assertions. Obviously, these "waste" space, but in the past, they have caught potentially dangerous bugs before they would have done damage, so we think it's worth it. Also, it means we get more bug reports ;) - + diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild index 2e7ae565ce87..fe0b0e079f27 100644 --- a/sys-block/parted/parted-2.4.ebuild +++ b/sys-block/parted/parted-2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,9 +19,9 @@ RESTRICT="test" # to fix bug 85999 RDEPEND=" >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2 + >=sys-libs/ncurses-5.2:5= device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2 ) + readline? ( >=sys-libs/readline-5.2:0= ) selinux? ( sys-libs/libselinux ) " DEPEND=" diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild index e89f3eb16737..a3a8786b034b 100644 --- a/sys-block/parted/parted-3.2.ebuild +++ b/sys-block/parted/parted-3.2.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + inherit autotools eutils DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" @@ -19,9 +20,9 @@ RESTRICT="test" # to fix bug 85999 RDEPEND=" >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.7-r7 + >=sys-libs/ncurses-5.7-r7:5= device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2 ) + readline? ( >=sys-libs/readline-5.2:0= ) selinux? ( sys-libs/libselinux ) " DEPEND=" @@ -31,9 +32,9 @@ DEPEND=" " src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch - - epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch + epatch \ + "${FILESDIR}"/${PN}-3.2-devmapper.patch \ + "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch eautoreconf } -- 2.26.2