Err, fix this...

Package-Manager: portage-2.1.2.3

diff --git a/app-i18n/koffice-i18n/ChangeLog b/app-i18n/koffice-i18n/ChangeLog
index 40bd65d5d328bb0287c3267c1c91f0e732d20dcd..f578253984b2d139bf1d64660bf4f440d0a68a4d 100644 (file)
--- a/app-i18n/koffice-i18n/ChangeLog
+++ b/app-i18n/koffice-i18n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/koffice-i18n
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/ChangeLog,v 1.87 2007/03/18 21:52:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/ChangeLog,v 1.88 2007/03/31 00:32:25 carlo Exp $
+
+  31 Mar 2007; Carsten Lohrke <carlo@gentoo.org>
+  files/koffice-18n-1.6.1-es-fix.diff, koffice-i18n-1.6.1.ebuild:
+  Err, fix this...
 
   18 Mar 2007; Carsten Lohrke <carlo@gentoo.org>
   +files/koffice-18n-1.6.1-es-fix.diff, koffice-i18n-1.6.1.ebuild:

diff --git a/app-i18n/koffice-i18n/Manifest b/app-i18n/koffice-i18n/Manifest
index 026e8d79e0bba9032776f7e38e3f10f81c5d9768..efa8d0517d21d85cef0ff2a65e692ebffb2c28a5 100644 (file)
--- a/app-i18n/koffice-i18n/Manifest
+++ b/app-i18n/koffice-i18n/Manifest
@@ -1,7 +1,7 @@
-AUX koffice-18n-1.6.1-es-fix.diff 1426 RMD160 f6ad1f45608ad101bc6e57666b786cc89151a193 SHA1 181a9abe94ddba4c5bcd6347f43e29aabdcf8cd7 SHA256 d22d822233c06c232662e4f6542a29359de6be0df37f78a7431378a2104aa4bd
-MD5 93733944b6584f74129b308e96e37a07 files/koffice-18n-1.6.1-es-fix.diff 1426
-RMD160 f6ad1f45608ad101bc6e57666b786cc89151a193 files/koffice-18n-1.6.1-es-fix.diff 1426
-SHA256 d22d822233c06c232662e4f6542a29359de6be0df37f78a7431378a2104aa4bd files/koffice-18n-1.6.1-es-fix.diff 1426
+AUX koffice-18n-1.6.1-es-fix.diff 1408 RMD160 a151f9fcd19924f300ce2c663760eba7f015eea9 SHA1 4786f51b0ff5bc4d9f350d5a12670d809c5d8f92 SHA256 bfa8a85c845dbd04391339b15a3b423f0ee7ba6d2ab730169eceff7540e07c55
+MD5 e055ec68f6925350f6adc0b6478bc2c4 files/koffice-18n-1.6.1-es-fix.diff 1408
+RMD160 a151f9fcd19924f300ce2c663760eba7f015eea9 files/koffice-18n-1.6.1-es-fix.diff 1408
+SHA256 bfa8a85c845dbd04391339b15a3b423f0ee7ba6d2ab730169eceff7540e07c55 files/koffice-18n-1.6.1-es-fix.diff 1408
 DIST koffice-l10n-af-1.5.2.tar.bz2 299202 RMD160 f95aa8595c563bf2acee0de1f16e6efb19df0bdc SHA1 7fca66ea4c769b547eb3442bc9fcfc8669c99b5c SHA256 faa430cfdffc355d2d5d62b14361d92149fe9837858c535403cb231db5faf615
 DIST koffice-l10n-ar-1.5.2.tar.bz2 318944 RMD160 c5c50a702f3a2c8b024c15b60b0752c7d85e82eb SHA1 635bb56881ba53ef212685a0352fa739e435b7e1 SHA256 ad4d0b0950ea96b08f6da469d3198ee92aa1642f187de3b9a5e8822ed4117629
 DIST koffice-l10n-bg-1.5.2.tar.bz2 351822 RMD160 f3be40dca76aacc973b37221a41d96c3868013d9 SHA1 18e8684d94c0f22f3a8908163bf87df4c8ec105e SHA256 294b662d5275caf11ad72ab11cb99ba48c4b095fb461eccaf63980e45ca69ba8
@@ -117,18 +117,18 @@ EBUILD koffice-i18n-1.5.2.ebuild 1479 RMD160 d34948a4475761031d1431972cafc12703e
 MD5 e6e34996960df61fb7c12b03fabb3ba4 koffice-i18n-1.5.2.ebuild 1479
 RMD160 d34948a4475761031d1431972cafc12703e4e5dc koffice-i18n-1.5.2.ebuild 1479
 SHA256 bbd00439ee8b813151c662077ab11fe5d30ed36a8f072c2d958cd70e6fbafb8b koffice-i18n-1.5.2.ebuild 1479
-EBUILD koffice-i18n-1.6.1.ebuild 1489 RMD160 2850b91094c146be5ef59ba4cc73a4df6e051522 SHA1 10ad65c600e17cd1c5c5fdb9100bd891ceb5cd75 SHA256 f3244545aeb269ce56807b948938acc81388e8738318d3e54b5c558099a4b226
-MD5 322dd949bc97000bf2b8153d80373f33 koffice-i18n-1.6.1.ebuild 1489
-RMD160 2850b91094c146be5ef59ba4cc73a4df6e051522 koffice-i18n-1.6.1.ebuild 1489
-SHA256 f3244545aeb269ce56807b948938acc81388e8738318d3e54b5c558099a4b226 koffice-i18n-1.6.1.ebuild 1489
+EBUILD koffice-i18n-1.6.1.ebuild 1562 RMD160 f6ee391e8fa10d7ac8faf233ae712c98c5626f6e SHA1 0ed93f2f8214b6ab8796a340967d0bd2713b1595 SHA256 d1d4631b204d519bfacb65b9f6077725f8326c4499606ce9db269f627d1d5af3
+MD5 9b42a80b4c48823933ff5060a4f1e9fc koffice-i18n-1.6.1.ebuild 1562
+RMD160 f6ee391e8fa10d7ac8faf233ae712c98c5626f6e koffice-i18n-1.6.1.ebuild 1562
+SHA256 d1d4631b204d519bfacb65b9f6077725f8326c4499606ce9db269f627d1d5af3 koffice-i18n-1.6.1.ebuild 1562
 EBUILD koffice-i18n-1.6.2.ebuild 1441 RMD160 a8b4d35ebab5dc57dc65046dc1201871a4418843 SHA1 59457a493b61b2da913046c91cf443a7649e05b9 SHA256 9f0cba74cfc513521f2ab89c228f15dff3606e66c0db501debea17660896e60b
 MD5 a1ddc54724bd102f5c451d5120e08af9 koffice-i18n-1.6.2.ebuild 1441
 RMD160 a8b4d35ebab5dc57dc65046dc1201871a4418843 koffice-i18n-1.6.2.ebuild 1441
 SHA256 9f0cba74cfc513521f2ab89c228f15dff3606e66c0db501debea17660896e60b koffice-i18n-1.6.2.ebuild 1441
-MISC ChangeLog 11216 RMD160 bffa36ce46d11090281b1c43b7301f12eac229d0 SHA1 4dcfcb559ec6f1210a498cbac912b0c1bdfdf3b1 SHA256 0276e163285c91a635179b140b69e272dc3d146cd4add621ec6adc7e442ee165
-MD5 0941be1e1a7b0892f27348a1dcd34b40 ChangeLog 11216
-RMD160 bffa36ce46d11090281b1c43b7301f12eac229d0 ChangeLog 11216
-SHA256 0276e163285c91a635179b140b69e272dc3d146cd4add621ec6adc7e442ee165 ChangeLog 11216
+MISC ChangeLog 11351 RMD160 facca86ed0adc6b79a11034bc90468751ee7c597 SHA1 94554458fca42428785cab8fa39f665992624330 SHA256 e37420e54f83fad51ddd1f5ce86537d7bb1f6ae793c408036080947535a5b583
+MD5 438fdb35f9300af7d29ad5b4e8d04dc5 ChangeLog 11351
+RMD160 facca86ed0adc6b79a11034bc90468751ee7c597 ChangeLog 11351
+SHA256 e37420e54f83fad51ddd1f5ce86537d7bb1f6ae793c408036080947535a5b583 ChangeLog 11351
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156

diff --git a/app-i18n/koffice-i18n/files/koffice-18n-1.6.1-es-fix.diff b/app-i18n/koffice-i18n/files/koffice-18n-1.6.1-es-fix.diff
index 4074f76a484f379db549b39f094ab35139584dc4..d5f0a2a70d770b446d28074f28d0f24eb37f9364 100644 (file)
--- a/app-i18n/koffice-i18n/files/koffice-18n-1.6.1-es-fix.diff
+++ b/app-i18n/koffice-i18n/files/koffice-18n-1.6.1-es-fix.diff
@@ -1,5 +1,5 @@
---- /var/tmp/portage/app-i18n/koffice-i18n-1.6.1/work/koffice-l10n-es-1.6.1/docs/koffice/krita/developers.docbook      2006-11-06 12:10:08.000000000 -0700
-+++ developers.docbook 2007-02-13 21:15:53.000000000 -0700
+--- koffice-l10n-es-1.6.1/docs/koffice/krita/developers.docbook        2006-11-06 12:10:08.000000000 -0700
++++ koffice-l10n-es-1.6.1/docs/koffice/krita/developers.docbook        2007-02-13 21:15:53.000000000 -0700
 @@ -4,5 +4,4 @@
  
  <para
@@ -7,8 +7,8 @@
 -&developers-scripting; &developers-plugins; </chapter>
 -
 +</chapter>
---- /var/tmp/portage/app-i18n/koffice-i18n-1.6.1/work/koffice-l10n-es-1.6.1/docs/koffice/krita/using-filters.docbook   2006-11-06 12:10:08.000000000 -0700
-+++ using-filters.docbook      2007-02-13 21:16:19.000000000 -0700
+--- koffice-l10n-es-1.6.1/docs/koffice/krita/using-filters.docbook     2006-11-06 12:10:08.000000000 -0700
++++ koffice-l10n-es-1.6.1/docs/koffice/krita/using-filters.docbook     2007-02-13 21:16:19.000000000 -0700
 @@ -1073,7 +1073,7 @@
  > <guisubmenu
  >Otro</guisubmenu

diff --git a/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild b/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
index 892c7386ed3e3b59d4ebb86633951441383d8b65..5c5a6b82f92df8c7eadcaeb50db51a75112ca7d0 100644 (file)
--- a/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
+++ b/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild,v 1.7 2007/03/18 21:52:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild,v 1.8 2007/03/31 00:32:25 carlo Exp $
 
 inherit kde
 
@@ -25,6 +25,7 @@ for X in ${LANGS}; do
        IUSE="${IUSE} linguas_${X}"
 done
 
+
 src_unpack() {
        if [ -z "${A}" ]; then
                echo
@@ -39,13 +40,16 @@ src_unpack() {
        fi
 
        unpack ${A}
-       epatch ${FILESDIR}/koffice-18n-1.6.1-es-fix.diff || die
 }
 
 src_compile() {
        local _S=${S}
        for dir in `ls ${WORKDIR}`; do
                S=${WORKDIR}/${dir}
+               if [[ "${dir}" == "koffice-l10n-es-1.6.1" ]] ; then
+                       cd ${S}
+                       epatch ${FILESDIR}/koffice-18n-1.6.1-es-fix.diff || die
+               fi
                kde_src_compile
        done
        S=${_S}