Stabilise latest, drop older.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 22 insertions, 48 deletions

diff --git a/app-officeext/sun-templates/ChangeLog b/app-officeext/sun-templates/ChangeLog
index e45c4977eab3..24efc22312f7 100644
--- a/app-officeext/sun-templates/ChangeLog
+++ b/app-officeext/sun-templates/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-officeext/sun-templates
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/ChangeLog,v 1.3 2013/03/24 08:35:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/ChangeLog,v 1.4 2013/04/27 08:31:48 scarabeus Exp $
+
+  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> -sun-templates-1.0.0.ebuild,
+  sun-templates-1.0.0-r1.ebuild:
+  Stabilise latest, drop older.
 
   24 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   sun-templates-1.0.0-r1.ebuild:
diff --git a/app-officeext/sun-templates/Manifest b/app-officeext/sun-templates/Manifest
index 66e63bba9397..05371fed1fd4 100644
--- a/app-officeext/sun-templates/Manifest
+++ b/app-officeext/sun-templates/Manifest
@@ -7,24 +7,23 @@ DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419
 DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc SHA512 db6f62292ed82976104e9e378fa87b464e6e8f5655ecea5e2ac1ca2d87f294d3fd63c00465ea8f3bc74a2b9c56264c108c610528e0fccec4db5a7ca03bf16b68 WHIRLPOOL cc96d36005485ab702a335159144dff0ccb257b8162740bf3b4717e4c44ca8886ae4ced39fcd6f2fd831d971382d530ee990ee8247eca09194529a447c2f8ca6
 DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859 SHA512 35f977757b732f0087582437f35089c935bee02ff681657bf30cd2408b9de61c8da9fd83269384cbbb8a73d11da468a58bd284360a5850d1e9d6fe5183a9622d WHIRLPOOL 1abe24ffe907e74c8f2a1fa1cbc1ac8d5baef5091ef1ce6b2b2ba6b15fccb17c70bc63ae049baf12f9e629e336406d7cd39e528af60764dfc7921abdc7b0adde
 DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4 SHA512 3e7e39d4cb98fee2cb6241ff1ad661265ebb961f6f3ca0c3bcdfcb570c8c61ac746c7db5ff5c5c9ccbbecb66dc6aea4ed5fe743a91ef377fcd925763ba598348 WHIRLPOOL 9c372ec1c48c09b44a2ac8601a52e71c3032056227105aeb314f7eb9c9efcfd9cade226ec569f5c16dfddb15e62a17cdea6cd193c6181321bf8c746a3c339723
-EBUILD sun-templates-1.0.0-r1.ebuild 1044 SHA256 dd453ad23d5fd0a0fd2763564ecf6822ec3c1b010805628f3e0abdf40ad62785 SHA512 b0cfbfa0699f8a51bcd19953fa5973b69991aa34ee3f6d306d0c1bbe3e9deb7c9f66a104c35de10c6e92e23bb981ca62a37b46ad8bd9759e0c4654a93175dd4c WHIRLPOOL 6ccd319d5cbf08d6df6a5cba706c0a0acbde196273bd60c8126c27538c6427917e52f280ddc938bddb8a4a52211680ea9272599292f1fee23abcb0e2abe5ee3b
-EBUILD sun-templates-1.0.0.ebuild 1099 SHA256 c89f4a0f779790f548c9820c1aa5cf17cfafea43b62415775bd01a94056a7a4f SHA512 6e67ca9305899531d0e06b69f9304ed9dbbf41192fed088ebccb4089de0b87ab951e8b51902afd5d0a0c4f4b377fa84672d6879c9951d41b03bc076c3541a439 WHIRLPOOL 210de10db08fd2fe57dcf37f75f17591af32c92b953e1a0598180bd170abf5c0cefdf92ec52043251cafc14d7057a24069a85c939059a5187b3a5cbc1e321080
-MISC ChangeLog 702 SHA256 f6fc5e4147df3c7829c5955fe1c9443f5803aeb5cf8ec96023cc18131311df44 SHA512 b2f6bddb40d1c57e0da9857b5cd7993871e01495217ca3e1e88b23d686d19b01a3d3a54def5732877f366c40cd806cb6fae25f4f35c33e6f66afe1e176cafd65 WHIRLPOOL 6158a56478c424758a2a9fa7011403b3164169468471466b67a2c534ccd8761cc1bf6c7f28a026bc3837a5177ffa88974f34b80020f03dd3aa87ba3eec0dec68
+EBUILD sun-templates-1.0.0-r1.ebuild 1042 SHA256 4724415b893773a4880727f3083e201ef4ebefa9fe6c019d7f92683a922d820a SHA512 98b5f232d012ec5296992941be67a1e97e013e6199aabc5566503f373696713dbb4f870d711e470e7b57e09eb9bafd4f39d005c270763df54c0b941e72d5f535 WHIRLPOOL 27f493bc5b9f6c7d58af710debcc1f11600fd253fd14c30b7afd7fc3c56921d5f0b63540a6e60178063eae4b138fbbd660679a012d30d00fae044840de0c0a82
+MISC ChangeLog 852 SHA256 520fe2525eedf4278f3b7c3880b00b573baf48f1c09a0c9be32763ad04e90627 SHA512 3b8b311e30561acb0cd418d1c847474dac8d342dbe945fee2f3df4db148876a13d28c6403d68ec851b75e9e5e9d92b299131d3360f42cdf97d77a70895983184 WHIRLPOOL ba884c9f26fa573996402b743a8d9914c38613e4ea81f935c3e99f792c5b126c636b1c54e4cb0460f2b2dea164e89047ce599b5fc5b32baf759aba99cd807579
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTrrCAAoJEOSiRoyO7jvoEUsQAKqmrGD/VfJhVcFBExCOr3wC
-eACQk6MYQlGrTDXPd4xkxifOusDeojwngSWDBI0E6LWW02sQrG7Xz2M1kKo1rC2g
-g/C4463A3O0dnJefjNe8V1gPjYVrcOW3Wdsw3m4Y6eZxFKMsgT7iewmojm6tR58Z
-/lDrzl1vvXhCildhIv9m5RJJ52oJs07bDV6/aoyB2MBzHmjndjbQxw1DQMeUUwGE
-QPHXcfvZmOEL8apo2Sk1GfsEmpn4EQ2YOVT9vYXyqWvup3KX2Cz8HUU0aQrYpC8m
-eZR+sOYd3RkGof3QfsEngvfQK0ZX3J+bDLhk/crqIWAI0q1HcMUSONVFlGWgFejh
-iva1M4AgKyYqbBPdbEX5R+MoL2d8phLKd94N48WX2ijBoChG5CYPrkM44McGEiMx
-yLMmGsOhRMJNDKLlL8emK7spo5MmVikwLDkK2OvCLv3uJ0xoN9EtjVb640Gk029/
-yU6d0REo+ePKsWW/tYjTW4iKgDMCJhkySDGldc4tU5DmAunLDeMO6CIaaiik04OK
-S4gTYMhRM101n3mpbTVbLqkgnOKf0A/iW30USMQnRsZbavl9nDFsJycBeluZHlTm
-knCyosyGXPVhZW6/ScnqPHmP/zotEKwl9jM6f9tU6VdkYvnYJ3y1kSbbDkMuLxlR
-ewNhvmgpJuhD/eDX6qJi
-=T7Uy
+iQIcBAEBCAAGBQJRe4z2AAoJEOSiRoyO7jvoem8P/i8byIbFgtXYoq8P0z3R0my7
+6tT01J1z/2ympX6za2qAkus4Tpl8XWsUpUMD0wVjiZb66Cl8Xq7W6stDFVTTlgd0
+AkakeDDJFsqWXHLEn2Mlw+JlkPms3lRE2WWWP64CfhgSVa9zGb6Q3+d4lZuX2z/z
+aF8qsGylWLQdynQPDxAfnuL28EiP7/4A+O0mJyIFtnLK0rVuxzyf4lYMhwbOAGOA
+p1sRxTq+NlL8XQDARlqpF6d8CERyh8JYTdjZ4TI98gKyp5ci3e0ZD7rHCyQu5xp4
+45MVofsVWHimdCYhZevH0a4Oq56XbVL9wy1wPVAIDCX+9u3YIzTRBAKk07hbJ0gN
+q4zEtWqW0T7M+EmKz9AP3iW1yKmB5RZOCLLh3TJ/9auOAgMHM5ruKg3AeHbDCO9B
+/P3n81+N5focGtXPk3CPiftgP+9PMxW+ABdTA53kS1+39Wt/UqZtA9F6I7QYrJyk
+/YRjh0w+Rml8fub3YMRpP4JFMssQB9go1vvno/Gr6EO3G3oonyUw46PIVix+vlvT
+mF0QXKrWSUugh1Ov+aFDFE2z7FlHepWHy590Fa8tLirEAZR4g6w8ThS37rcZVYeB
+FeH1e1p+lT4RlGF5Z5/es500l8LzbSKbVxuXcj239MRUeKmKV7nfIRV/KKVhxcZz
+zbJ+hFGrb0kj3yxpjQ/o
+=d2Ux
 -----END PGP SIGNATURE-----
diff --git a/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild b/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
index ece853d6e8de..29969f187395 100644
--- a/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
+++ b/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild,v 1.2 2013/03/24 08:35:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild,v 1.3 2013/04/27 08:31:48 scarabeus Exp $
 
 EAPI=5
 
@@ -22,5 +22,5 @@ SRC_URI="${URI_EXTENSIONS}"
 
 LICENSE="sun-bcla-j2me"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-officeext/sun-templates/sun-templates-1.0.0.ebuild b/app-officeext/sun-templates/sun-templates-1.0.0.ebuild
deleted file mode 100644
index 4a44ebba01b9..000000000000
--- a/app-officeext/sun-templates/sun-templates-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/sun-templates/sun-templates-1.0.0.ebuild,v 1.1 2012/05/31 10:06:18 scarabeus Exp $
-
-EAPI=4
-
-OO_EXTENSIONS=(
-	"472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_${PV}.oxt"
-	"53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_${PV}.oxt"
-	"4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_${PV}.oxt"
-	"a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_${PV}.oxt"
-	"09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_${PV}.oxt"
-	"b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_${PV}.oxt"
-)
-URI_EXTENSIONS="${OO_EXTENSIONS[@]/#/http://ooo.itc.hu/oxygenoffice/download/libreoffice/}"
-
-inherit office-ext
-
-DESCRIPTION="Collection of sun templates for various countries."
-HOMEPAGE="http://ooo.itc.hu/oxygenoffice/download/libreoffice/"
-SRC_URI="${URI_EXTENSIONS}"
-
-LICENSE="sun-bcla-j2me"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# to avoid collisions
-RDEPEND=">=app-office/libreoffice-l10n-3.5.4"