summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-04-10 04:16:46 +0000
committerMike Frysinger <vapier@gentoo.org>2008-04-10 04:16:46 +0000
commitc03127d08a11eb87b0b197fa8419877bfc8c0be2 (patch)
tree2560f8bc72aacb4f084686f0d623899329b5208e /app-arch
parentold (diff)
downloadgentoo-2-c03127d08a11eb87b0b197fa8419877bfc8c0be2.tar.gz
gentoo-2-c03127d08a11eb87b0b197fa8419877bfc8c0be2.tar.bz2
gentoo-2-c03127d08a11eb87b0b197fa8419877bfc8c0be2.zip
Fix building when ncurses is built with USE=-ncurses #217046.
(Portage version: 2.2_pre5)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/dpkg/ChangeLog5
-rw-r--r--app-arch/dpkg/dpkg-1.14.17.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 6c3efb38b41e..acee7c74b553 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/dpkg
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.63 2008/04/10 03:59:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.64 2008/04/10 04:16:46 vapier Exp $
+
+ 10 Apr 2008; Mike Frysinger <vapier@gentoo.org> dpkg-1.14.17.ebuild:
+ Fix building when ncurses is built with USE=-ncurses #217046.
10 Apr 2008; Mike Frysinger <vapier@gentoo.org> dpkg-1.14.16.6.ebuild:
Mark amd64 stable #215809.
diff --git a/app-arch/dpkg/dpkg-1.14.17.ebuild b/app-arch/dpkg/dpkg-1.14.17.ebuild
index bf86f02acb7e..f247b006075d 100644
--- a/app-arch/dpkg/dpkg-1.14.17.ebuild
+++ b/app-arch/dpkg/dpkg-1.14.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.14.17.ebuild,v 1.1 2008/04/02 03:04:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.14.17.ebuild,v 1.2 2008/04/10 04:16:46 vapier Exp $
inherit eutils multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 nls selinux test zlib"
+IUSE="bzip2 nls selinux test unicode zlib"
RDEPEND=">=dev-lang/perl-5.6.0
>=sys-libs/ncurses-5.2-r7
@@ -25,6 +25,10 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-1.14.12-nls.patch #192819
+ if ! use unicode ; then
+ sed -i "s:ncursesw/curses.h:curses.h:" dselect/dselect.h #217046
+ export ac_cv_lib_ncursesw_initscr=no
+ fi
}
src_compile() {