Rework the ebuild to better support USE_EXPAND

3 files changed, 19 insertions, 29 deletions

diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog
index 692f33fc22cf..478f1eda5b81 100644
--- a/kde-base/kde-i18n/ChangeLog
+++ b/kde-base/kde-i18n/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kde-i18n
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.2 2003/09/25 15:41:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.3 2003/10/13 16:03:30 caleb Exp $
+
+  13 Oct 2003; Caleb Tennis <caleb@gentoo.org> kde-1i8n-3.1.4.ebuild:
+  Now that portage has fixed USE_EXPAND, let's go with a new scheme in this ebuild.
 
   25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.4.ebuild:
   marking x86 stable
diff --git a/kde-base/kde-i18n/Manifest b/kde-base/kde-i18n/Manifest
index bb14b37f86bc..c51dc3cd7c61 100644
--- a/kde-base/kde-i18n/Manifest
+++ b/kde-base/kde-i18n/Manifest
@@ -1,4 +1,4 @@
-MD5 f290fe7aae7626387c3202ed7a8d2740 kde-i18n-3.1.4.ebuild 1882
-MD5 03c6386786ab0797801cdca670741d35 ChangeLog 426
+MD5 192a6e61dd9640ae8d40b30c745ac15d kde-i18n-3.1.4.ebuild 1336
+MD5 6204f127eaf82c1f53b73d19e97b5d4a ChangeLog 581
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 47b8fcf8ee830e187b7229adfd3e7b1d files/digest-kde-i18n-3.1.4 3708
diff --git a/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild b/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild
index 174b3598952d..64f17f0b01e8 100644
--- a/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild,v 1.5 2003/09/25 15:41:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild,v 1.6 2003/10/13 16:03:30 caleb Exp $
 
 inherit kde
 need-kde ${PV}
@@ -12,38 +12,25 @@ KEYWORDS="x86"
 SLOT="$KDEMAJORVER.$KDEMINORVER"
 RESTRICT="nomirror"
 
+newdepend="$newdepend >=sys-apps/portage-2.0.49-r8"
+
 LANGS="af ar bg bs ca cs da de el es en_GB eo es et eu fa fi fr he hr hu is it
-ja lt mk mt bn nl nn nso pl pt pt_BR ro ru se sk sl sr ss sv ta th tr uk ven vi xh
+ja lt mk mt nb nl nn nso pl pt pt_BR ro ru se sk sl sr ss sv ta th tr uk ven vi xh
 zh_CN zh_TW zu"
 
-BASEDIR="mirror://kde/stable/${PV}/src/"
+#
+# Define the LINGUAS environment variable to contain which language(s) you would
+# like for this ebuild to download and install.
+#
 
-#Maybe this isn't the smartest way of doing things, but it works
-#for the purposes of this ebuild.
-USE="${USE} ${LINGUAS}"
+BASEDIR="mirror://kde/stable/${PV}/src/kde-i18n"
 
-# Important:
-#
-# If you start the emerge without setting the LINGUAS variable, then try to
-# reemerge, portage will NOT scan your changes, because the ebuild itself
-# hasn't changed.  You need to "touch" this ebuild file to make portage re-evaluate
-# this ebuild after your LINGUAS changes.
+for pkg in $LANGS
+do
+	SRC_URI="$SRC_URI linguas_${pkg}? ( $BASEDIR/kde-i18n-${pkg}-${PV}.tar.bz2)"
+done
 
-if [ -z "${LINGUAS}" ]; then
-	ewarn "Using the LINGUAS environment variable, you can download only"
-	ewarn "language packages you are interested in.  Currently you are"
-	ewarn "downloading all languages available."
 
-	SRC_URI="$BASEDIR/kde-i18n-${PV}.tar.bz2"
-else
-	for pkg in $LANGS
-	do
-		if [ `use ${pkg}` ] ; then
-			SRC_URI="$SRC_URI $BASEDIR/kde-i18n/kde-i18n-${pkg}-${PV}.tar.bz2"
-			echo "using package ${pkg}"
-		fi
-	done
-fi
 
 src_unpack() {
 	base_src_unpack unpack