commit: 12b1d70ccba67cb73f34512e14415d0a5c173c5a Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Fri Aug 21 08:40:57 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Aug 21 09:35:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b1d70c
sys-block/parted: Set correct subslot dependency for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> 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 57a6769..54903f1 100644 --- a/sys-block/parted/metadata.xml +++ b/sys-block/parted/metadata.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>livecd</herd> -<use> - <flag name='device-mapper'> + <herd>livecd</herd> + <use> + <flag name="device-mapper"> Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted </flag> - <flag name="debug"> + <flag name="debug"> 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 ;) </flag> -</use> + </use> </pkgmetadata> diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild index 2e7ae56..fe0b0e0 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 e89f3eb..a3a8786 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 }
