Better error message if LINGUAS contains unavailable languages (#85997).

Package-Manager: portage-2.0.51.19

4 files changed, 36 insertions, 34 deletions

diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog
index fc2be40914b0..deee11b64599 100644
--- a/kde-base/kde-i18n/ChangeLog
+++ b/kde-base/kde-i18n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-i18n
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.63 2005/03/20 11:42:56 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.64 2005/03/21 13:53:30 greg_g Exp $
+
+  21 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kde-i18n-3.3.2.ebuild,
+  kde-i18n-3.4.0.ebuild:
+  Better error message if LINGUAS contains unavailable languages (#85997).
 
   20 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-i18n-3.4.0.ebuild:
   Marked ~amd64, closes bug 85981.
diff --git a/kde-base/kde-i18n/Manifest b/kde-base/kde-i18n/Manifest
index 7ab40b7ed4cd..3564c52d4c60 100644
--- a/kde-base/kde-i18n/Manifest
+++ b/kde-base/kde-i18n/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dab85fdb3edb009f8a8fcdb11d80b565 kde-i18n-3.3.2.ebuild 1679
-MD5 5cb93e5a369ef36bf8e9e3f7cd90a853 kde-i18n-3.4.0.ebuild 1516
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4b8c5e274bff05a581412195d98cf979 kde-i18n-3.2.3.ebuild 5376
+MD5 53c8be3ac5447c9190cf270ac924bedf kde-i18n-3.3.2.ebuild 1797
+MD5 b7b790fee6eead31bf76502469b76b8e kde-i18n-3.4.0.ebuild 1635
+MD5 d53f7a1a8879afd5255487f8888e9fca ChangeLog 7271
 MD5 e7754491447e02160b2955de72b3f355 kde-i18n-3.3.1.ebuild 5676
-MD5 fc86bc7bad904268c7e78f9e4b1e51ff ChangeLog 7096
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 f6b5f831d55a7be8b21a682e23bbe82c files/kde-i18n-ru-3.4.0-filedialog.patch 312
+MD5 4132e0717a74837f7e81bd5922babf43 files/digest-kde-i18n-3.4.0 3501
 MD5 eac0d7734f4387b032f33325f2ff48e4 files/digest-kde-i18n-3.2.3 3492
-MD5 24e0ecdf191bf0a50fff46c239a2dcb9 files/digest-kde-i18n-3.3.1 3645
 MD5 be2b24a376f130383c134228731eea5b files/digest-kde-i18n-3.3.2 3714
-MD5 4132e0717a74837f7e81bd5922babf43 files/digest-kde-i18n-3.4.0 3501
+MD5 f6b5f831d55a7be8b21a682e23bbe82c files/kde-i18n-ru-3.4.0-filedialog.patch 312
+MD5 24e0ecdf191bf0a50fff46c239a2dcb9 files/digest-kde-i18n-3.3.1 3645
 MD5 fe416091cd30cb387c87c28e2d0a793d files/kde-i18n-ru-3.3.2-kmplot.diff 9744
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCPWHGntT9W3vfTuoRAq7aAKCs1wc05c+H6uJww1Tb5E95MJBqnACcD6I4
-9rnfg7/kOBIMaikXt6MFbhQ=
-=Vd1V
------END PGP SIGNATURE-----
diff --git a/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild b/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild
index f7c07bc092db..d0dc283f52a7 100644
--- a/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild,v 1.11 2005/02/08 17:10:07 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild,v 1.12 2005/03/21 13:53:30 greg_g Exp $
 
 inherit kde eutils
 
@@ -26,16 +26,20 @@ for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
 done
 
-src_unpack() {
-	if [ -z "${LINGUAS}" ]; then
-		ewarn
-		ewarn "You must define a LINGUAS environment variable that contains a list"
-		ewarn "of the language codes for which languages you would like to install."
-		ewarn "e.g.: LINGUAS=\"se de pt\""
-		ewarn
+pkg_setup() {
+	if [ -z "${A}" ]; then
+		echo
+		eerror "You must define a LINGUAS environment variable that contains a list"
+		eerror "of the language codes for which languages you would like to install."
+		eerror "Look at the LANGS variable inside the ebuild to see the list of"
+		eerror "available languages."
+		eerror "e.g.: LINGUAS=\"se de pt\""
+		echo
 		die
 	fi
+}
 
+src_unpack() {
 	base_src_unpack unpack
 	cd ${WORKDIR}
 	use linguas_ru && epatch ${FILESDIR}/kde-i18n-ru-3.3.2-kmplot.diff
diff --git a/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild b/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild
index 6043bbe40873..d55fbad167b4 100644
--- a/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild,v 1.4 2005/03/20 11:42:56 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.4.0.ebuild,v 1.5 2005/03/21 13:53:30 greg_g Exp $
 
 inherit kde eutils
 
@@ -23,16 +23,20 @@ for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/3.4/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
 done
 
-src_unpack() {
-	if [ -z "${LINGUAS}" ]; then
-		ewarn
-		ewarn "You must define a LINGUAS environment variable that contains a list"
-		ewarn "of the language codes for which languages you would like to install."
-		ewarn "e.g.: LINGUAS=\"se de pt\""
-		ewarn
+pkg_setup() {
+	if [ -z "${A}" ]; then
+		echo
+		eerror "You must define a LINGUAS environment variable that contains a list"
+		eerror "of the language codes for which languages you would like to install."
+		eerror "Look at the LANGS variable inside the ebuild to see the list of"
+		eerror "available languages."
+		eerror "e.g.: LINGUAS=\"se de pt\""
+		echo
 		die
 	fi
+}
 
+src_unpack() {
 	base_src_unpack unpack
 
 	if use linguas_ru; then