global variables defined in src_unpack now are empty in src_compile; ergo, I've moved the locale messages selection code into src_install (bug #95402, comment #9)

(Portage version: 2.0.51.22-r2)

4 files changed, 28 insertions, 33 deletions

diff --git a/net-dialup/pppconfig/ChangeLog b/net-dialup/pppconfig/ChangeLog
index 7e8452df2d73..24ad14870633 100644
--- a/net-dialup/pppconfig/ChangeLog
+++ b/net-dialup/pppconfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/pppconfig
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pppconfig/ChangeLog,v 1.14 2005/08/14 18:23:19 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pppconfig/ChangeLog,v 1.15 2005/09/07 18:57:39 mrness Exp $
+
+*pppconfig-2.3.11-r2 (07 Sep 2005)
+
+  07 Sep 2005; Alin Nastac <mrness@gentoo.org> -pppconfig-2.3.11-r1.ebuild,
+  +pppconfig-2.3.11-r2.ebuild:
+  Move the locale messages selection code to src_install because global
+  variables defined in one function (e.g. src_unpack) became unusable in
+  subsequent functions (e.g. src_compile). See bug #95402, comment #9.
 
   14 Aug 2005; Luis Medinas <metalgod@gentoo.org>
   pppconfig-2.3.11-r1.ebuild:
diff --git a/net-dialup/pppconfig/Manifest b/net-dialup/pppconfig/Manifest
index b1a261781e46..771d7cddc641 100644
--- a/net-dialup/pppconfig/Manifest
+++ b/net-dialup/pppconfig/Manifest
@@ -1,7 +1,9 @@
-MD5 374507a4cf20518211d8c451ad64d1d2 ChangeLog 2530
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 406090fa0d56ee113a58f365e6ac81be pppconfig-2.3.11-r1.ebuild 1789
 MD5 c4d95862f441200aedd85d9a89d8f483 pppconfig-2.3.11.ebuild 776
+MD5 ef1ec7215127e255d17293ca203960d8 pppconfig-2.3.11-r2.ebuild 1657
+MD5 374507a4cf20518211d8c451ad64d1d2 ChangeLog 2530
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 075c1c15d87393ab98a10d051bbfd1bd files/digest-pppconfig-2.3.11 68
-MD5 075c1c15d87393ab98a10d051bbfd1bd files/digest-pppconfig-2.3.11-r1 68
 MD5 0a18599faef6a8d04e0df3fb632aa3e4 files/pppconfig 219
+MD5 075c1c15d87393ab98a10d051bbfd1bd files/digest-pppconfig-2.3.11-r1 68
+MD5 075c1c15d87393ab98a10d051bbfd1bd files/digest-pppconfig-2.3.11-r2 68
diff --git a/net-dialup/pppconfig/files/digest-pppconfig-2.3.11-r1 b/net-dialup/pppconfig/files/digest-pppconfig-2.3.11-r2
index 9c075fe21efa..9c075fe21efa 100644
--- a/net-dialup/pppconfig/files/digest-pppconfig-2.3.11-r1
+++ b/net-dialup/pppconfig/files/digest-pppconfig-2.3.11-r2
diff --git a/net-dialup/pppconfig/pppconfig-2.3.11-r1.ebuild b/net-dialup/pppconfig/pppconfig-2.3.11-r2.ebuild
index 5402851d8c37..0789d1fcd499 100644
--- a/net-dialup/pppconfig/pppconfig-2.3.11-r1.ebuild
+++ b/net-dialup/pppconfig/pppconfig-2.3.11-r2.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/net-dialup/pppconfig/pppconfig-2.3.11-r1.ebuild,v 1.2 2005/08/14 18:23:19 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pppconfig/pppconfig-2.3.11-r2.ebuild,v 1.1 2005/09/07 18:57:39 mrness Exp $
 
 DESCRIPTION="A text menu based utility for configuring ppp."
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/pppconfig/${PN}_${PV}.tar.gz"
@@ -17,12 +17,17 @@ DEPEND="net-dialup/ppp
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
+src_install () {
+	dodir /etc/chatscripts /etc/ppp/resolv
+	dosbin 0dns-down 0dns-up dns-clean
+	newsbin pppconfig pppconfig.real
+	dosbin ${FILESDIR}/pppconfig
+	doman pppconfig.8
+	dodoc debian/{copyright,changelog}
 
 	if use nls; then
-		declare MY_LOCALE_LANGUAGES
 		cd ${S}/po
+		local MY_LOCALE_LANGUAGES lang
 
 		if [ -n "${LINGUAS}" ]; then #install messages only in user-selected languages
 			local lang
@@ -37,34 +42,14 @@ src_unpack() {
 				MY_LOCALE_LANGUAGES="${MY_LOCALE_LANGUAGES} ${f%.po}"
 			done
 		fi
-		einfo "Locale messages will be installed in following languages:"
+		einfo "Locale messages will be installed for following languages:"
 		einfo "   ${MY_LOCALE_LANGUAGES}"
-	fi
-}
-
-src_compile() {
-	if use nls; then
-		local lang
-		for lang in ${MY_LOCALE_LANGUAGES}; do
-			msgfmt -o po/${lang}.mo po/${lang}.po || \
-				die "failed to compile ${lang}.mo"
-		done
-	fi
-}
-
-src_install () {
-	dodir /etc/chatscripts /etc/ppp/resolv
-	dosbin 0dns-down 0dns-up dns-clean
-	newsbin pppconfig pppconfig.real
-	dosbin ${FILESDIR}/pppconfig
-	doman pppconfig.8
-	dodoc debian/{copyright,changelog}
 
-	if use nls; then
-		local lang
 		for lang in ${MY_LOCALE_LANGUAGES}; do
-			insinto /usr/share/locale/${lang}/LC_MESSAGES
-			newins po/${lang}.mo pppconfig.mo
+			msgfmt -o ${lang}.mo ${lang}.po && \
+				insinto /usr/share/locale/${lang}/LC_MESSAGES && \
+				newins ${lang}.mo pppconfig.mo || \
+					die "failed to install locale messages for ${lang} language"
 		done
 	fi
 }