From 4ae5c08fb6372dff3f6e0c7f556aa62173775e20 Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Mon, 27 Mar 2006 19:16:22 +0000 Subject: [PATCH] Add unicode error message to older versions Package-Manager: portage-2.1_pre7-r1 --- dev-util/dialog/ChangeLog | 6 ++++- dev-util/dialog/Manifest | 30 +++++++++++++++++----- dev-util/dialog/dialog-1.0.20050206.ebuild | 14 ++++++++-- dev-util/dialog/dialog-1.0.20050306.ebuild | 14 ++++++++-- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog index 879171638bc8..990d6b340bba 100644 --- a/dev-util/dialog/ChangeLog +++ b/dev-util/dialog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/dialog # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.59 2006/01/14 07:51:22 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.60 2006/03/27 19:16:22 truedfx Exp $ + + 27 Mar 2006; Harald van Dijk + dialog-1.0.20050206.ebuild, dialog-1.0.20050306.ebuild: + Also have a clear error message for unicode in older versions 14 Jan 2006; Harald van Dijk dialog-1.0.20051107.ebuild: diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest index 961fb7672f6c..22b838a31ce1 100644 --- a/dev-util/dialog/Manifest +++ b/dev-util/dialog/Manifest @@ -1,18 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 27a43d46f6f7fd2c1bac461a6cb46526 ChangeLog 8870 -MD5 cd7bc4ff18512a7738ebc9c7c50a2006 dialog-1.0.20050206.ebuild 1013 -MD5 87305276830661f174d9c290ea1b1028 dialog-1.0.20050306.ebuild 924 +MD5 d9b519729c069de7ef8a753338380d7a ChangeLog 9045 +RMD160 f987e02ad1688e74a3ea8fd06b0121f05bb143c2 ChangeLog 9045 +SHA256 438e4da2b6fa35e7d8b0c57be010e6f4d286d178711df04c273d3aa9f351fe74 ChangeLog 9045 +MD5 c80375d1986e3b8602cc6054c1808e70 dialog-1.0.20050206.ebuild 1416 +RMD160 4931281ce5b6d00166f2557b8a3d72446cba4079 dialog-1.0.20050206.ebuild 1416 +SHA256 a17cb104bf1d26fe7eb5bea98b9d9b3d8943e6cc4f4f6627ce8a17b21b8f0b45 dialog-1.0.20050206.ebuild 1416 +MD5 bd30a58594ac57f98104fa5a05eafe89 dialog-1.0.20050306.ebuild 1327 +RMD160 6c99b7d99a00bdff02ae74142998ae628db4028d dialog-1.0.20050306.ebuild 1327 +SHA256 710cf747edac3bfcc7ab61490ff0980d561b4ce58d90d2b974f52c84f23132e0 dialog-1.0.20050306.ebuild 1327 MD5 3d0b976460e2094a374891699a8eab6a dialog-1.0.20051107.ebuild 1488 +RMD160 983a7e62b7815182dedbabcc2d3eeb03b2d4d203 dialog-1.0.20051107.ebuild 1488 +SHA256 5fbcf661309cc42327d397417029b0c66c7f01d1c264ad3d5ec530aa8f5c6168 dialog-1.0.20051107.ebuild 1488 MD5 516258483f8caafb1bbad3ca633b2a74 files/dialog-1.0.20051107-mouseselect.patch 664 +RMD160 422e308751482678a3eed19a00bfce77cbcec4be files/dialog-1.0.20051107-mouseselect.patch 664 +SHA256 1bcb116de16edc96ac32271917ec105f0ca97a3777871e4975accf704d1a95e6 files/dialog-1.0.20051107-mouseselect.patch 664 MD5 0fb57e331af29543a80113129d8d6585 files/digest-dialog-1.0.20050206 76 +RMD160 5b56c3fae60feea134e4a9aeb43caa3faea2e5ec files/digest-dialog-1.0.20050206 76 +SHA256 f461ff1af9ab1e3a2624327962d3ae181f855ce84bc017d819d62e0b24835a29 files/digest-dialog-1.0.20050206 76 MD5 6bb2fe6f496b5c53063dfb1f6971021d files/digest-dialog-1.0.20050306 76 +RMD160 83c5e7c8b7a27d4a369c3392940c58f068b2ade0 files/digest-dialog-1.0.20050306 76 +SHA256 891cad7a59cebe8843f4957aac817d905b6e78f0ab8e044a3f6f4ad627c9fded files/digest-dialog-1.0.20050306 76 MD5 8ad8276b29c5f6ffcc0e746acfc02844 files/digest-dialog-1.0.20051107 76 +RMD160 647ef5cde2a8477bd3062e4c222b322352eef65e files/digest-dialog-1.0.20051107 76 +SHA256 8969ea1ee6ddd32bc4c8d46394a3397c088bcf63e85becfef9bb8a8ebfd5761b files/digest-dialog-1.0.20051107 76 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (NetBSD) -iD8DBQFDyK3pwnQyISwouHwRAh6gAJ46IqGqN/yFMIhvxsOn9CclU9Wf4QCffJui -6Br8fEI2pXKkBWMYk6JpDsg= -=TWZe +iD8DBQFEKDqFwnQyISwouHwRAh/OAJ9zr17wt5tCYV0iBEo5oZWx179dTwCfV5Iu +pCTr4B3RpCzYSZ8zlMHecPU= +=tJ0O -----END PGP SIGNATURE----- diff --git a/dev-util/dialog/dialog-1.0.20050206.ebuild b/dev-util/dialog/dialog-1.0.20050206.ebuild index 6b4bb28cd19d..6065f55112af 100644 --- a/dev-util/dialog/dialog-1.0.20050206.ebuild +++ b/dev-util/dialog/dialog-1.0.20050206.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.0.20050206.ebuild,v 1.10 2005/07/05 09:36:19 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.0.20050206.ebuild,v 1.11 2006/03/27 19:16:22 truedfx Exp $ inherit eutils @@ -18,6 +18,16 @@ IUSE="unicode" DEPEND=">=app-shells/bash-2.04-r3 >=sys-libs/ncurses-5.2-r5" +pkg_setup() { + if use unicode && ! built_with_use sys-libs/ncurses unicode; then + eerror "Installing dialog with the unicode flag requires ncurses be" + eerror "built with it as well. Please make sure your /etc/make.conf" + eerror "or /etc/portage/package.use enables it, and re-install" + eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`." + die "Re-emerge ncurses with the unicode flag" + fi +} + src_compile() { #export LANG=C use unicode && ncursesw="w" diff --git a/dev-util/dialog/dialog-1.0.20050306.ebuild b/dev-util/dialog/dialog-1.0.20050306.ebuild index 181e3549dec3..9d98f31cc2e1 100644 --- a/dev-util/dialog/dialog-1.0.20050306.ebuild +++ b/dev-util/dialog/dialog-1.0.20050306.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.0.20050306.ebuild,v 1.1 2005/07/05 09:36:19 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.0.20050306.ebuild,v 1.2 2006/03/27 19:16:22 truedfx Exp $ MY_PV="${PV/1.0./1.0-}" S=${WORKDIR}/${PN}-${MY_PV} @@ -16,6 +16,16 @@ IUSE="unicode" DEPEND=">=app-shells/bash-2.04-r3 >=sys-libs/ncurses-5.2-r5" +pkg_setup() { + if use unicode && ! built_with_use sys-libs/ncurses unicode; then + eerror "Installing dialog with the unicode flag requires ncurses be" + eerror "built with it as well. Please make sure your /etc/make.conf" + eerror "or /etc/portage/package.use enables it, and re-install" + eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`." + die "Re-emerge ncurses with the unicode flag" + fi +} + src_compile() { #export LANG=C use unicode && ncursesw="w" -- 2.26.2