summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2014-03-05 20:16:05 +0000
committerSven Wegener <swegener@gentoo.org>2014-03-05 20:16:05 +0000
commitd35dee056e9b4bc36698d980a5483cfd61a524a2 (patch)
treecc9914258d32900fdba836f5f7e62a8a08521ae9 /app-misc
parentvanilla-3.13.5 + genpatches-3.13-8 + grsecurity-3.0-3.13.5-201403041938 (diff)
downloadgentoo-2-d35dee056e9b4bc36698d980a5483cfd61a524a2.tar.gz
gentoo-2-d35dee056e9b4bc36698d980a5483cfd61a524a2.tar.bz2
gentoo-2-d35dee056e9b4bc36698d980a5483cfd61a524a2.zip
Backport append-cppflags, bug #498616.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/screen/ChangeLog5
-rw-r--r--app-misc/screen/screen-4.0.3-r6.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 6067e64bce10..a8df1156ccee 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/screen
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.184 2014/01/18 05:42:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.185 2014/03/05 20:16:05 swegener Exp $
+
+ 05 Mar 2014; Sven Wegener <swegener@gentoo.org> screen-4.0.3-r6.ebuild:
+ Backport append-cppflags, bug #498616.
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> screen-4.0.3-r6.ebuild,
screen-4.0.3-r7.ebuild, screen-4.0.3-r8.ebuild:
diff --git a/app-misc/screen/screen-4.0.3-r6.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild
index fb4ad6c4d326..a2b8ee12667b 100644
--- a/app-misc/screen/screen-4.0.3-r6.ebuild
+++ b/app-misc/screen/screen-4.0.3-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.3 2014/01/18 05:42:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.4 2014/03/05 20:16:05 swegener Exp $
EAPI=4
@@ -89,6 +89,9 @@ src_prepare() {
# Allow usernames up to 32 chars
epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
+ # support CPPFLAGS
+ epatch "${FILESDIR}"/${P}-cppflags.patch
+
sed \
-e 's:termlib:tinfo:g' \
-i configure.in || die
@@ -98,12 +101,12 @@ src_prepare() {
}
src_configure() {
- append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
- use nethack || append-flags "-DNONETHACK"
- use debug && append-flags "-DDEBUG"
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
econf \
--with-socket-dir="${EPREFIX}/var/run/screen" \