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
commit9eb867cde6230c0f70152fb2b8490d17ba277a46 (patch)
treed26b140a526ce0102f73f18fc8a6ffe84b2206a7 /app-arch
parentold (diff)
downloadhistorical-9eb867cde6230c0f70152fb2b8490d17ba277a46.tar.gz
historical-9eb867cde6230c0f70152fb2b8490d17ba277a46.tar.bz2
historical-9eb867cde6230c0f70152fb2b8490d17ba277a46.zip
Fix building when ncurses is built with USE=-ncurses #217046.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/dpkg/ChangeLog5
-rw-r--r--app-arch/dpkg/Manifest10
-rw-r--r--app-arch/dpkg/dpkg-1.14.17.ebuild8
3 files changed, 15 insertions, 8 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/Manifest b/app-arch/dpkg/Manifest
index a0d538132a92..28bce86aee43 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -6,13 +6,13 @@ AUX dpkg-1.14.16.6-check-PATH.patch 691 RMD160 7b728ad6e9018c134314c3b07c0a61783
DIST dpkg_1.14.16.6.tar.gz 6303810 RMD160 237ba62aefc7d15dffba6d207fc2b65e782e97c0 SHA1 66a08951160a2fcc4ca33c4db804b641197a6893 SHA256 d667d2273fc849a7d54729821f4e6debfcd8a9e74e2cf100da7e7df3cb974af4
DIST dpkg_1.14.17.tar.gz 6379035 RMD160 5686ec623171eea505042ff337791105354ffc3d SHA1 15faa3d798821d27b05fc09a3250fb26bacfb4a4 SHA256 9c45ae389e305a76070340415169383ae1126c1e7e77376c16feaf35cc40b6d2
EBUILD dpkg-1.14.16.6.ebuild 1383 RMD160 c0eeb09c261d3b48241f977e3554992ab921f7ac SHA1 c9ab21f3c4d6427a431f1287a5951df97da4131a SHA256 cdd46b39ecb99bf71933013331bd692076a46b6fba3fe0515f1430a801c4708e
-EBUILD dpkg-1.14.17.ebuild 1329 RMD160 d738494192382f856c269fbda46a09ef2286ae2a SHA1 6a4477906110d6af4fa9fa07c99b5f384f2783fa SHA256 9a061d3978ae83e2b95efcf7cc066c2bfdb08652a45bc8258d2b051b83f97abf
-MISC ChangeLog 7620 RMD160 b16999d9fbc155e7f520b95d9fa4114700d711fd SHA1 b4b2c8bca0da73c9ffd32c4fe4c50132f76cf386 SHA256 3769e02cc93b821f331ac4ce0982f23e6c5c9a1826c17a58e7d5e55cbc830ff2
+EBUILD dpkg-1.14.17.ebuild 1472 RMD160 11ecec701a634cc2828258d8859a83ca4da088d1 SHA1 b42c127ad3f8540d502026cc32b9d722ed054b11 SHA256 2ce1a6f63e5d232fcc5fcecc04770f8f19e8e1c3d8232c4657fee813ce7a3ce3
+MISC ChangeLog 7756 RMD160 63e75b95291f98abab2089824360cad56ac51872 SHA1 ff71a462b306efa7fadd53b9b46a6981e5922736 SHA256 5f11f2c179e918d847e576ea24c97302e567718616810a685e0e7da5d7d2109d
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFH/ZDyj9hvisErhMIRAvHWAJ93GfmQDGDodhWMmwXk2LYln7CpawCfTUC+
-O8U6dyCBXes7SGodsIWfzEc=
-=4cA/
+iD8DBQFH/ZSzj9hvisErhMIRAmsGAKCKQcBzJIzE8RW+5D8RBqGsKKCDBACgu9V/
+P8wL3Ol3nps6+zofq6iVgjw=
+=ermT
-----END PGP SIGNATURE-----
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() {