summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-05-12 19:57:43 +0000
committerMike Frysinger <vapier@gentoo.org>2013-05-12 19:57:43 +0000
commit4a797b69b7a48f1fcae40b3fb10c546ea7f9827e (patch)
treeaf3fd158b40d071cc26d17f65fd22f2e6237c396 /sys-apps/gptfdisk
parentrerun autoconf to fix bug 469578 by John Brendler; also split out some functi... (diff)
downloadgentoo-2-4a797b69b7a48f1fcae40b3fb10c546ea7f9827e.tar.gz
gentoo-2-4a797b69b7a48f1fcae40b3fb10c546ea7f9827e.tar.bz2
gentoo-2-4a797b69b7a48f1fcae40b3fb10c546ea7f9827e.zip
Add USE=static support.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/gptfdisk')
-rw-r--r--sys-apps/gptfdisk/ChangeLog5
-rw-r--r--sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild25
2 files changed, 18 insertions, 12 deletions
diff --git a/sys-apps/gptfdisk/ChangeLog b/sys-apps/gptfdisk/ChangeLog
index ceac7ac67527..72c01adc4f5e 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.33 2013/05/07 17:47:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.34 2013/05/12 19:57:43 vapier Exp $
+
+ 12 May 2013; Mike Frysinger <vapier@gentoo.org> gptfdisk-0.8.6.ebuild:
+ Add USE=static support.
07 May 2013; Agostino Sarubbo <ago@gentoo.org> gptfdisk-0.8.6.ebuild:
Stable for ppc64, wrt bug #467718
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
index 1b24aa10688b..55113c0165f7 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
@@ -1,10 +1,10 @@
# 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.8 2013/05/07 17:47:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.9 2013/05/12 19:57:43 vapier Exp $
EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="GPT partition table manipulator for Linux"
HOMEPAGE="http://www.rodsbooks.com/gdisk/"
@@ -13,19 +13,22 @@ 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="kernel_linux +icu"
+IUSE="+icu kernel_linux static"
-RDEPEND="
- dev-libs/popt
- >=sys-libs/ncurses-5.7-r7
- icu? ( dev-libs/icu:= )
- kernel_linux? ( sys-apps/util-linux )" # libuuid
+LIB_DEPEND="dev-libs/popt[static-libs(+)]
+ >=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(+)]} )"
DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
virtual/pkgconfig"
src_prepare() {
+ tc-export CXX PKG_CONFIG
+
if use icu; then
- append-cxxflags $($(tc-getPKG_CONFIG) --variable=CXXFLAGS icu-io icu-uc)
+ append-cxxflags $(${PKG_CONFIG} --cflags icu-io icu-uc)
else
sed \
-e 's:-licuio::g' \
@@ -36,10 +39,10 @@ src_prepare() {
sed \
-e '/g++/s:=:?=:g' \
- -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+ -e "s:-lncurses:$(${PKG_CONFIG} --libs ncurses):g" \
-i Makefile || die
- tc-export CXX
+ use static && append-ldflags -static
}
src_install() {