summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-06-22 16:14:07 +0000
committerJeroen Roovers <jer@gentoo.org>2013-06-22 16:14:07 +0000
commitb06e3e048ae6f35f3f873beb8954bf99df52f458 (patch)
tree4214fb0d1f0c7e088dbd07f778136d57b643bd45 /app-misc
parentrevbump; migrate to distutils-r1, remove old, correct deps (diff)
downloadgentoo-2-b06e3e048ae6f35f3f873beb8954bf99df52f458.tar.gz
gentoo-2-b06e3e048ae6f35f3f873beb8954bf99df52f458.tar.bz2
gentoo-2-b06e3e048ae6f35f3f873beb8954bf99df52f458.zip
Since we are not installing Nut (FLTK) anyway, do not attempt to build it (happens to fix bug #470246).
(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/nut/ChangeLog6
-rw-r--r--app-misc/nut/nut-18.9.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index fa90dae36b01..93208d438929 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/nut
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.65 2013/05/20 15:07:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.66 2013/06/22 16:14:07 jer Exp $
+
+ 22 Jun 2013; Jeroen Roovers <jer@gentoo.org> nut-18.9.ebuild:
+ Since we are not installing Nut (FLTK) anyway, do not attempt to build it
+ (happens to fix bug #470246).
20 May 2013; Jeroen Roovers <jer@gentoo.org> -files/nut-17.12-makefile.patch,
-files/nut-18.7-fltk-linking.patch, -nut-18.5.ebuild, -nut-18.7.ebuild:
diff --git a/app-misc/nut/nut-18.9.ebuild b/app-misc/nut/nut-18.9.ebuild
index f902e83222e4..f4da1b0f150a 100644
--- a/app-misc/nut/nut-18.9.ebuild
+++ b/app-misc/nut/nut-18.9.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/app-misc/nut/nut-18.9.ebuild,v 1.1 2013/05/16 05:14:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.9.ebuild,v 1.2 2013/06/22 16:14:07 jer Exp $
EAPI=5
inherit toolchain-funcs
@@ -14,12 +14,16 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
+ emake \
+ CC="$(tc-getCC)" \
+ OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\" \
+ nut
}
src_install() {
insinto /usr/share/nut
doins raw.data/*
+
dobin nut
doman nut.1
}