Fix i18n packages to use the new $KDE_S variable, thanks to miste78 for reporting...

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 68ac95cd410d45fa126371fb73d47c1e67bd3cac..98ded07ced631fd6c9617ddabb415e52d6fed88d 100644 (file)
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.152 2006/05/31 16:05:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.153 2006/06/21 00:09:07 flameeyes Exp $
+
+  21 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> k3b-0.12.14.ebuild,
+  k3b-0.12.15.ebuild:
+  Fix i18n packages to use the new $KDE_S variable, thanks to miste78 for
+  reporting in bug #135692.
 
   31 May 2006; Diego Pettenò <flameeyes@gentoo.org> k3b-0.12.15.ebuild:
   Add linguas in IUSE to avoid the screen full of QA warnings.

diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index a5e632fd8c7b4d7cb795dc5cb03ae5df43a44aa2..ed85214885a09c33600d1f457ad1aa856b84c8f7 100644 (file)
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -5,18 +5,22 @@ DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9
 DIST k3b-0.12.15.tar.bz2 4000389 RMD160 9d0ff14b394153d97ef61fcf7b46894ec5d3d511 SHA1 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f SHA256 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
 DIST k3b-i18n-0.12.14.tar.bz2 4744451 RMD160 489d650e223a5dfca7d36318dc08d3a6a1854547 SHA1 92f7ee7105cf216a7c01fbf673bca7f282c8380b SHA256 fa3a94b8631eee6d48d796749d51f949a563a1e97b7386a0cc8c1f6ef76a20c4
 DIST k3b-i18n-0.12.15.tar.bz2 4683857 RMD160 053ed2acadb3fb627ce02e73dc63c825840c5e90 SHA1 0e3ecc7c79def1b50d72d09ceca4af2c603466d1 SHA256 39f4a3278875792d7eba0cddaab15e6c04b411e673d20babda0fc82df62f60fd
-EBUILD k3b-0.12.14.ebuild 3271 RMD160 e1cc78d7911cff327c5e687614efb427e518d571 SHA1 3d96d3c534849c65849aef1a1ec7bc34952c4dc5 SHA256 5771d4ad526d5845ec76b3545241a553029b24636b081e9d755a2808202dabd9
-MD5 98eeaac9672546a8b03c4c571952d2d3 k3b-0.12.14.ebuild 3271
-RMD160 e1cc78d7911cff327c5e687614efb427e518d571 k3b-0.12.14.ebuild 3271
-SHA256 5771d4ad526d5845ec76b3545241a553029b24636b081e9d755a2808202dabd9 k3b-0.12.14.ebuild 3271
-EBUILD k3b-0.12.15.ebuild 3305 RMD160 dd1872bbf4f8c3ac14416db1049dfffe4c85acfa SHA1 6ec4c699c012dcd208a36765ef5e760449443f42 SHA256 161cf9145c58f01643e96f48a25809237fbda3b3fbed9498d470a09667559551
-MD5 96b88a428f82b39cbe140c7a3204657e k3b-0.12.15.ebuild 3305
-RMD160 dd1872bbf4f8c3ac14416db1049dfffe4c85acfa k3b-0.12.15.ebuild 3305
-SHA256 161cf9145c58f01643e96f48a25809237fbda3b3fbed9498d470a09667559551 k3b-0.12.15.ebuild 3305
-MISC ChangeLog 21191 RMD160 21ea9e3a4026cc609cea4df06426f9a8c1aa19cf SHA1 09eb56172b25206bdeb3c8c36dbe0c3ae4401878 SHA256 f6210d082c78a9e04350f47968913fcd86411a01d2c17c0f1cc2070dcfc88322
-MD5 fae21d1ae3a67d53b0c1adccc0896b1c ChangeLog 21191
-RMD160 21ea9e3a4026cc609cea4df06426f9a8c1aa19cf ChangeLog 21191
-SHA256 f6210d082c78a9e04350f47968913fcd86411a01d2c17c0f1cc2070dcfc88322 ChangeLog 21191
+EBUILD k3b-0.12.14.ebuild 3212 RMD160 4258606531dacdf988fb70431359bca2f5660431 SHA1 2eca8b03dd769a6d81857526bc9a3f2df3d9b797 SHA256 d4b23528ac8e0ea8cab6767f19e201d7bcdfb17d31f303430baba3890c4ae422
+MD5 55b1e4c549242ef6889f2094486879e0 k3b-0.12.14.ebuild 3212
+RMD160 4258606531dacdf988fb70431359bca2f5660431 k3b-0.12.14.ebuild 3212
+SHA256 d4b23528ac8e0ea8cab6767f19e201d7bcdfb17d31f303430baba3890c4ae422 k3b-0.12.14.ebuild 3212
+EBUILD k3b-0.12.15.ebuild 3245 RMD160 f6fb1725ffb463af9f6d29c312097399cea235fc SHA1 8fb3d25be0e046681f167e749832cbfd551ff7c1 SHA256 9123b316bcba5ba7573e7fba7227673b2f6e205aed664ee1fd4cc8491d63b208
+MD5 28767ffb96e7048d9b16516810b9454f k3b-0.12.15.ebuild 3245
+RMD160 f6fb1725ffb463af9f6d29c312097399cea235fc k3b-0.12.15.ebuild 3245
+SHA256 9123b316bcba5ba7573e7fba7227673b2f6e205aed664ee1fd4cc8491d63b208 k3b-0.12.15.ebuild 3245
+MISC ChangeLog 21389 RMD160 2e0d9f99c586798154061d876adda4c808653858 SHA1 dbea34afefc1691b60b91231f3053275fb45bc43 SHA256 7c90a142a3916fad7ac13ec595407fee277d3e6651a561b2f37f03fa3de7522d
+MD5 c29de55b868e49804c4d2fd4cfb044b3 ChangeLog 21389
+RMD160 2e0d9f99c586798154061d876adda4c808653858 ChangeLog 21389
+SHA256 7c90a142a3916fad7ac13ec595407fee277d3e6651a561b2f37f03fa3de7522d ChangeLog 21389
+MISC k3b-0.12.14.ebuild.orig 3271 RMD160 e1cc78d7911cff327c5e687614efb427e518d571 SHA1 3d96d3c534849c65849aef1a1ec7bc34952c4dc5 SHA256 5771d4ad526d5845ec76b3545241a553029b24636b081e9d755a2808202dabd9
+MD5 98eeaac9672546a8b03c4c571952d2d3 k3b-0.12.14.ebuild.orig 3271
+RMD160 e1cc78d7911cff327c5e687614efb427e518d571 k3b-0.12.14.ebuild.orig 3271
+SHA256 5771d4ad526d5845ec76b3545241a553029b24636b081e9d755a2808202dabd9 k3b-0.12.14.ebuild.orig 3271
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -30,7 +34,7 @@ SHA256 e4987ff02e156c647873fdf105159bb57edae41e2c0386f34c28cca08cbc4ac5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfb7PAiZjviIA2XgRAiuFAJ9W5pw0LcV/R5Pwy8u3qcxs2/mKrACeN2gk
-IFZmuSu446kzwOhsdP7mSlk=
-=vN36
+iD8DBQFEmI43AiZjviIA2XgRAmhEAKDGaka0DA7Grk+JutidpYZOicI+tACgwhNJ
+0d7Is0S6VA+GEjtb9P/V+Dc=
+=uGbl
 -----END PGP SIGNATURE-----

diff --git a/app-cdr/k3b/k3b-0.12.14.ebuild b/app-cdr/k3b/k3b-0.12.14.ebuild
index 74fc554eb3c72d2e905f460c38f505ece5029b08..1cc65a15899b8a9e928447c1cd0b20d040c2e5ca 100644 (file)
--- a/app-cdr/k3b/k3b-0.12.14.ebuild
+++ b/app-cdr/k3b/k3b-0.12.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.14.ebuild,v 1.5 2006/04/22 14:59:59 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.14.ebuild,v 1.6 2006/06/21 00:09:07 flameeyes Exp $
 
 inherit kde eutils
 
@@ -96,26 +96,20 @@ src_compile() {
        kde_src_compile
 
        # Build process of K3b-i18n
-       local _S=${S}
        if [ -d "${WORKDIR}/${I18N}" ]; then
-               S="${WORKDIR}/${I18N}"
-               cd "${S}"
+               KDE_S="${WORKDIR}/${I18N}" \
                kde_src_compile
        fi
-       S=${_S}
 }
 
 src_install() {
        kde_src_install
        dodoc FAQ KNOWNBUGS PERMISSIONS
 
-       local _S=${S}
        if [ -d "${WORKDIR}/${I18N}" ]; then
-               S="${WORKDIR}/${I18N}"
-               cd "${S}"
+               KDE_S="${WORKDIR}/${I18N}" \
                kde_src_install
        fi
-       S=${_S}
 
        # Move menu entry
        if use kde; then

diff --git a/app-cdr/k3b/k3b-0.12.15.ebuild b/app-cdr/k3b/k3b-0.12.15.ebuild
index 1b56d1c8c99537a11efbb53ba9a0a33722538c9e..66df20102fc5df9b0f078572e9be5a97dae1c5bc 100644 (file)
--- a/app-cdr/k3b/k3b-0.12.15.ebuild
+++ b/app-cdr/k3b/k3b-0.12.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.15.ebuild,v 1.2 2006/05/31 16:05:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.15.ebuild,v 1.3 2006/06/21 00:09:07 flameeyes Exp $
 
 inherit kde eutils
 
@@ -97,26 +97,20 @@ src_compile() {
        kde_src_compile
 
        # Build process of K3b-i18n
-       local _S=${S}
        if [ -d "${WORKDIR}/${I18N}" ]; then
-               S="${WORKDIR}/${I18N}"
-               cd "${S}"
+               KDE_S="${WORKDIR}/${I18N}" \
                kde_src_compile
        fi
-       S=${_S}
 }
 
 src_install() {
        kde_src_install
        dodoc FAQ KNOWNBUGS PERMISSIONS
 
-       local _S=${S}
        if [ -d "${WORKDIR}/${I18N}" ]; then
-               S="${WORKDIR}/${I18N}"
-               cd "${S}"
+               KDE_S="${WORKDIR}/${I18N}" \
                kde_src_install
        fi
-       S=${_S}
 
        # Move menu entry
        if use kde; then