summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-05-12 20:22:41 +0000
committerMike Frysinger <vapier@gentoo.org>2013-05-12 20:22:41 +0000
commit3776f1b5c8d87c0adb8fdaad969e051db52e449a (patch)
treee996cdc44dc6a159d383c8e6cf2e777ea79aaeda /sys-apps
parentVersion bump. (diff)
downloadgentoo-2-3776f1b5c8d87c0adb8fdaad969e051db52e449a.tar.gz
gentoo-2-3776f1b5c8d87c0adb8fdaad969e051db52e449a.tar.bz2
gentoo-2-3776f1b5c8d87c0adb8fdaad969e051db52e449a.zip
Add USE=ncurses support.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/gptfdisk/ChangeLog5
-rw-r--r--sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild14
2 files changed, 14 insertions, 5 deletions
diff --git a/sys-apps/gptfdisk/ChangeLog b/sys-apps/gptfdisk/ChangeLog
index 72c01adc4f5e..9dc4b58e3d73 100644
--- a/sys-apps/gptfdisk/ChangeLog
+++ b/sys-apps/gptfdisk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/gptfdisk
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.34 2013/05/12 19:57:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.35 2013/05/12 20:22:41 vapier Exp $
+
+ 12 May 2013; Mike Frysinger <vapier@gentoo.org> gptfdisk-0.8.6.ebuild:
+ Add USE=ncurses support.
12 May 2013; Mike Frysinger <vapier@gentoo.org> gptfdisk-0.8.6.ebuild:
Add USE=static support.
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
index 55113c0165f7..653266abf9b1 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.6.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-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.9 2013/05/12 19:57:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.10 2013/05/12 20:22:41 vapier Exp $
EAPI=5
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="+icu kernel_linux static"
+IUSE="+icu kernel_linux ncurses static"
LIB_DEPEND="dev-libs/popt[static-libs(+)]
- >=sys-libs/ncurses-5.7-r7[static-libs(+)]
+ ncurses? ( >=sys-libs/ncurses-5.7-r7[static-libs(+)] )
icu? ( dev-libs/icu:=[static-libs(+)] )
kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
@@ -37,6 +37,12 @@ src_prepare() {
-i Makefile || die
fi
+ if ! use ncurses; then
+ sed -i \
+ -e '/^all:/s:cgdisk::' \
+ Makefile || die
+ fi
+
sed \
-e '/g++/s:=:?=:g' \
-e "s:-lncurses:$(${PKG_CONFIG} --libs ncurses):g" \
@@ -46,7 +52,7 @@ src_prepare() {
}
src_install() {
- dosbin gdisk sgdisk cgdisk fixparts
+ dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
doman *.8
dodoc NEWS README
}