Added missing patch file (bug #371969)

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 76 insertions, 2 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 47ddc76befa4..8536aee51aaa 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.29 2011/06/16 18:50:45 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.30 2011/06/17 07:44:24 polynomial-c Exp $
+
+  17 Jun 2011; Lars Wendler <polynomial-c@gentoo.org> +files/gentoo-3.3.3.diff:
+  Non-maintainer commit: Added missing patch file with kind permission from
+  suka (bug #371969).
 
 *libreoffice-3.3.3 (16 Jun 2011)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1054093034f4..5c34c7976447 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
 AUX gentoo-3.3.1.diff 2271 RMD160 ecd7bd0a6c34861ad3ef0bee8017a288286644c0 SHA1 0597c7e692873f128a898d1904445b9bbb06e6e8 SHA256 00b5b5fc5dbeafa18874575e78e6b3348d1293662b9c036ca918517a54edf1b6
 AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
+AUX gentoo-3.3.3.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
 AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
@@ -136,5 +140,22 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18129 RMD160 cab0e6e4b1aaf5f8fde1a128089a5d7c4f7db54b SHA1 2cdbeb0f0fb4ba62353d3f9728c3c74d974d37cd SHA256 b5d0921b9ec21260784cd380eb1364a960bea132d5946ee3c9037c560b3383a8
-MISC ChangeLog 6025 RMD160 4ec7ea656ed7748b03ee24f288d876624b3a85c6 SHA1 e1944a1d1bda7fdee46b3c5b4adca5af56e4ae33 SHA256 3cd60e1f46e97e94e3ba87b235b6d739cc7abd7a5347c92a2aa0881172f84c80
+MISC ChangeLog 6212 RMD160 34089b6d7df2099c0cb699971bae3d04aa4b0932 SHA1 441b7c47476bbe41ef729e768184487d5d12b76b SHA256 cbff43ce8fa5495bb3c22a99c721c03e0f177f67ec4584d7428685597568df7d
 MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJN+wXeAAoJEPiazRVxLXTFuicP/0bUbVVvC2tqSFBrq3wJ60s1
+H0y6P3Vx9xFiBNACIpmaCMwxwTqUiYR7vJUgPhyag6XLjS9NjFt9n7X8m7AHWB/g
+RlFGi7jHZeDh6UsoSurjJw6X5ByX4F8rrDAUdbypRXI04UfuFH7BXQJ6PZivJlBx
+2nJPSJM2O33BDQLbPt4i/4pFxhSR1caUw8GAZrx/0Pu48wPhzt85T/KFyfAmhjDS
+AgvCBdz7sM+XNSgv7DtfzQ803IPZJxBm2hXLhyhmgaj8OpiqAr8Ic5zopoz8mE+c
+V9ub2+NN6tBIo7dqKCmByhSCz9CV5vAbS1Vencr8nnIoksHjTBU6DALdiHMbvurD
+ns6F6NSvhNiy+34zB6wMAtf5+o8h/Juo7P+SIMMjzCicLAGD0G0MbyN0yzMICQoB
+8B52g+xPXBEb+BZyfU9gEl+QKwTAtpvAgA9BaEkuUQa2JrllZu9EfIvfBA6kUsYA
+Fc/ysCvhK5NKFyUvJeCTMkMO0D2s58rRK39GeIy5BrKRp2csNFUyWed0VAWhABTc
+kjC82fBg/aGvcEU6PQVukDSaTK+IuXLhXAAQIWNw/lCS5/dDePo3yPDTiO3lrbHG
+7LidpKgPACBBfdrnPo+iytShrhT7/YhklnA673ZTAjpoqk/uGyQ979hUuMBziorh
+qU+20goHk8Q1qDS0ob62
+=RNAq
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/gentoo-3.3.3.diff b/app-office/libreoffice/files/gentoo-3.3.3.diff
new file mode 100644
index 000000000000..2a4b293ea2af
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-3.3.3.diff
@@ -0,0 +1,49 @@
+--- distro-configs/Gentoo.conf.in
++++ distro-configs/Gentoo.conf.in
+@@ -1,5 +1,3 @@
+---disable-fontooo
+---disable-qadevooo
+ --enable-neon
+ --enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-        if test -n "`echo $with_lang | grep "$lang"`" ; then
+-                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-        fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
+--- bin/package-ooo
++++ bin/package-ooo
+@@ -126,8 +126,8 @@
+ fi
+ 
+ # create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
++mkdir -p $SYSCONFDIR/bash_completion.d
++$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
+ if test "$COMPAT_OOWRAPPERS" = "YES" ; then
+     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+ fi
+