Drop errornous templates useflag handling.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c47e6a93c3ff36fd74e038f861f3c1ece498d56c..94a01637b3ce97064ff8f6a2d7bb007b111b3115 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.226 2012/01/11 12:10:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.227 2012/01/11 14:52:14 scarabeus Exp $
+
+  11 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.5.2.ebuild:
+  Drop errornous templates useflag handling.
 
   11 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/generate_libreoffice_package.sh:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 93e7eb923f23e9c5de893a04b692aed928cfde13..f7bd9385fd3c6526cc5d6b2a1970d062f8567553 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -177,26 +177,26 @@ DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1d
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b73340d2c9 SHA1 4ba8289141748a37763049aad453ce8cde277e1b SHA256 7da90f1704e492c9ea60982283868860d96ab7550e7cb6a5806858d68fa15b98
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18514 RMD160 66fdf0ebbb2bbe6c507f97b0d2be87b8c72aa79c SHA1 814410fddd8101148b58924f2f20b899b1925c6a SHA256 89fef1d27d99fe7996dd4675120d5fb180a3bd6798abf51eb8da4d25f83013b9
-EBUILD libreoffice-3.4.5.2.ebuild 15020 RMD160 f3f35ff7d0efa6f84258d64b0f9d6eb3196bd312 SHA1 1a73e08c981e08c9b10f9c5d84dc323a48c3ae34 SHA256 8077eca87a3edc1c16cb92c95b1c0fe3c2714a62e48c862d27784c9d5768ee9e
+EBUILD libreoffice-3.4.5.2.ebuild 14980 RMD160 919f4a07685e27a77374080ac3e291698824c75d SHA1 72ecd407f92f9f48f35f1770ebf759f472ff4f62 SHA256 662842f1f461b36ee763ad28b8ba2af941c2315ca074b9b847309eed00e9d929
 EBUILD libreoffice-3.4.99.3.ebuild 13999 RMD160 1b055f76609c12f6c66a4ba8104239fca52f0ee4 SHA1 2e4f47e8b1e2c713a8d894d199c3aef1f3e7f344 SHA256 462c665b11b854b5a4acc0fa816467ec7bf1af5a6fd29cc3bb565fa19facde42
 EBUILD libreoffice-3.5.9999.ebuild 13999 RMD160 a97b9c96b1c0c0f076e945fb12b4f955ec539915 SHA1 c19643e5d0aaa5a9a0cb8feb47038a9202f5917b SHA256 3e428eb8d24f8d690239fb94472dfde6e1c6c63163a8e2a4f4c143ff6dd68e67
 EBUILD libreoffice-9999-r2.ebuild 14069 RMD160 46428f00afc92a57e77c3128753c4f8027ac0a98 SHA1 ad89353db2bf4de7553f0482b851051604b05923 SHA256 6fe85994f8c3a6d434a68163e418b50a335c0747b5c889acf6c992a46364ea48
-MISC ChangeLog 41228 RMD160 a5c03f12cee6d1496926db135d7457b4c72f09f9 SHA1 75172e0641f1da449ea18d691003f8516330fe53 SHA256 7f3ae7cc85eccc8f14a775d850c9de5686373b310e3364e766ffd410dabbedb8
+MISC ChangeLog 41359 RMD160 235057b7cb110a531ade91f17506d447145d1dbe SHA1 a8537e5ee820a3567942863095ff4562e6592848 SHA256 1e25f7259427ed3a77c9a2c7bd28142babf2baa905a981435b9fed2b28f8fa6a
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPDXxsAAoJEOSiRoyO7jvoIaMP/2kxtWNY7nYObp45HI2eGZog
-MHkCPQ5qbdLxH8Ruo6YFdfWF+Duc+d9EgSrSwjnt4/h8i9ztf/DlE7rimKYQ12q2
-LGjSWHtJicJI3heiJuAgNAdEeT1TcJBMyXc10XzogetrgfDqmrFa68Hs7kcNAF1U
-XMOsqGKPvVZsTsIycy/8AxwfYBJNPqBQjR4JbHwkHEekZZHgR0AMw2HaiBITTKmw
-o4JgA41h9gzZXYyvlopr+gbm7mJNwRFcy2B+x0Jt1MuH57WrODeVIROugps2AvFq
-Ch5ZdVB2UyaCC8ygYXuUbZ0PVP7dIejYGbRWDabi96olaZ4LAXS/Lr1ovj4rBNDO
-QoUivWOBzQxoF+JL88JXkPWiqWAmnuKZodkN8U+ruuZ43v532jPTVDwlyCiMBuVw
-HByUclG8BRG+4GD8PpshKfwdjZg5AQRu+n5FS5+1vBhinEbxsxIhnSjr0gykwbw6
-zzWJkpEE1jXM1XDU9tn7be6jKqZDXWImh2tKA+sd2uVHVFYG44WKl4pNXTi3OaVh
-Ljih6By395VEKrbjB/psmYMzCaaSqqVF77vyQckVmX95R2RCjq/zLfJx9/MF3OAg
-cY9dgH3s4EOmr2/mpw3gVq1DCUoaJi6ZigvjGz/JQpfIvuRqvuOv7rQ9kqn4bUnp
-SNKGLXn8clWophZcYY72
-=8Tag
+iQIcBAEBAgAGBQJPDaItAAoJEOSiRoyO7jvokVwP/jqib6pshChXVrviHznhQJse
+24mrXasDnjGgEeJ/MfGrwlx1BBLJIZxJLTYbzfTFZ0eS78kDK7ViVz1Hhu9chNFA
+Vsx1k4Jo0/8sEq2p2S8JGa/aVUAsjgq2jou77RJQ0xC8KTarcCtfN5WxwotFF5hz
+6KFEj8kIMzD69DsfTyZjRGepPeoswokvfKfnhSKJXRG17y74tI7mwBxF3UeXUUzu
+J6sjcZp4D3vBZMUwHdmGg14DG6eXnG55kc5TcHO/MeL1T6KZuqflglYwrcAZbv/d
+9vmu8saFALSkuPTac6rm72UOx6GWo+xiSVrADnmcXQQKGtd/Aed5nzYHvRnI7aSr
+1N5EWg/oo0d6+CMic7ZWQPb9qjIcWBdIUXCRFFJEt7PIqE15MufE2rodHjnjD2cF
+Ghz4PWKZ36ljlrVLsCqkLo1LZNBMCBDckieYeEo0qn/IPdLNcjrQfXdHocmZyzoQ
+u+R5LHJMsRMHkcQibBLmeQRvKMHlLlyZeUASNWynOmsqBLKvgrT3qpn0WCd1vq+D
+Pl6Txza7yBNbQnn01vwJiI/m1fbWAl9zGHDfsoYernVgQ0kcGCXlMSayNdgDpQ7g
+n/0y104kiXSFKdJdAHX3EMO/jCvvn5uO32llrfe7JOLxs8GMdN1HNfEoII/sI3Ft
+0TKcZm5xofhzTUh9F1YR
+=UDFt
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
index e0747ceb04148096d7b8b40aa5cd088698193c06..ae2c15f1bf695694704732adfb08f53433f02f24 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.2 2012/01/08 14:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.3 2012/01/11 14:52:14 scarabeus Exp $
 
 EAPI=4
 
@@ -469,7 +469,6 @@ src_configure() {
                $(use_with java) \
                $(use_with mysql system-mysql-cppconn) \
                $(use_with nsplugin system-mozilla libxul) \
-               $(use_with templates sun-templates) \
                ${internal_libs} \
                ${java_opts} \
                ${extensions}