Stabilise latest, drop older.

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

12 files changed, 66 insertions, 135 deletions

diff --git a/app-officeext/ooo2gd/ChangeLog b/app-officeext/ooo2gd/ChangeLog
index 90b6d15ab128..d3055233b494 100644
--- a/app-officeext/ooo2gd/ChangeLog
+++ b/app-officeext/ooo2gd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-officeext/ooo2gd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooo2gd/ChangeLog,v 1.4 2013/03/23 10:19:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooo2gd/ChangeLog,v 1.5 2013/04/27 08:29:19 scarabeus Exp $
+
+  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> -ooo2gd-3.0.0.ebuild,
+  ooo2gd-3.0.0-r1.ebuild:
+  Stabilise latest, drop older.
 
 *ooo2gd-3.0.0-r1 (23 Mar 2013)
 
diff --git a/app-officeext/ooo2gd/Manifest b/app-officeext/ooo2gd/Manifest
index f7861b1b62ad..a7b896a6d39e 100644
--- a/app-officeext/ooo2gd/Manifest
+++ b/app-officeext/ooo2gd/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST ooo2gd_3.0.0.oxt 2248664 SHA256 8762e67d65cb4a7c43c76c76c84f44dceedecb1c1e9cf885d6f9cf5550b6c40a SHA512 51b32810b3197c45a56aa5387c4d66f6ad0b48ea6f7152dba98e82d79eee0ca297ab5bd82ce19eaf53a0aaa8583b6bcd6532906d71131a642f511205eede6a03 WHIRLPOOL 29fa9b328cbf1f5b5d817085ce30945ea0d58c9a8861ba804e6d47042c12439e2df5139197eac3e4be403e3e61b939d0ed42db0d5a3d3a79b75344aed89f8ae8
-EBUILD ooo2gd-3.0.0-r1.ebuild 554 SHA256 d1e15185f711324d345abf164fc81b2c5e4d1f337ffd0b54d4cf108ac690a5a3 SHA512 f12725670316a750902e75630ef60406337b4bf30976d4dd2405e04c44897975eedadd855479915f9c7303a7136c57e36aaa7fcf792c34624b1e8a67d31bbadd WHIRLPOOL 9265c738080dca52b3fe8669188c2c2cf405bde035761cb22105e13e2cd0e547080441152ec8c1097dfac00b46d923e832314aa2164c11f292dc4c4954697106
-EBUILD ooo2gd-3.0.0.ebuild 567 SHA256 d65d58d797586d6008d2b481ddbc075ae6e40551f0557600ec72e09ba0b9b03a SHA512 6de1745eb563e5a81df35976cceeade0092047e842177df7d5ceb5a039de036aa6920809c5aac2823f7523ed5b2ff6c974f6f8b886cd38751b6540efbf5dc6ff WHIRLPOOL 65f34c5df8da499e46eea6bbe64e29392f7ec68ea6c9e3f8e57835f3cd0bc8b50a239454686b3e33b4aab8d3149f3ef20a44a3c8adacbef324062e09584f1e79
-MISC ChangeLog 741 SHA256 5284261a45bcbf279bdf89ea17804a2ef42ff4517b6572582a476014b58de735 SHA512 0f869c51b2343f02a095fa972a54ad29d425fe38dcd85e45e2299a04bf5367a3d40e05be7e5a4d0b7da2348de0a9615df2bd44387cc15eb8ffc9740a159470ba WHIRLPOOL 11706c0b1e742988939db92d574c7163332e3e8f55acc30ce2e538b3270005441aa01e0d3de4ccbe7beb294e04de18f28999b560b37a54bca15d112b68acc5eb
+EBUILD ooo2gd-3.0.0-r1.ebuild 552 SHA256 4cce9bb4b758db600e3816496ad3e199a69a6f5d45ba8f120daa08fcf2249dfc SHA512 8237b24b58d9fe6d32b18300a6cdf6c47e58001832d58dd56ab0018d22e467013b2b524aafd771337efa3dd43719f45a9bba1e322c6f0bcfe1c564265980025b WHIRLPOOL ba8b509f11c875fa62d5f626730480e25cab67e0e5200a18ec68aa9c4bc28fe04ba9cc7c15a20b0fc07440de4c8fb0fb8ff028eda06e88b04b62d2ea20a53e14
+MISC ChangeLog 877 SHA256 3ce3859a44144660210e2de7906ecff3b1ce32ebc5832e06249b49fcd6dd9cfa SHA512 accf5a79e226abb167e23c2e9aef885743e21b5dc4cc2c7c1521b7369a18f15cabd622b377008040843f2880b5878b6381fc834ce63bc8bcb05bf110b7f0ae67 WHIRLPOOL 89dd2eb2071ef748f15b798c5bf5f8c8942464a582f6978625cf194163e0e08ae9e4864ddabdaa193b2de4e8e9c2a22b3d892fb75fd9f75ed739cde4e8e84dc6
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTYG1AAoJEOSiRoyO7jvoIb4P/igC9WOi4wU1aja/A/WwUkKA
-rVyVDEPJA0eb9yOYnXyzWnsvIXIln1xR8Prrk4ac7fAnQ47EvAMDwLnz40y6kqlV
-I/W9dpOqM2lneLlSa0OG856BecoQ7VX1lvYZeMcqBCZoArOpT+NfXEl3lHJJTKPV
-t4psPvekz0zKVI/YtEt43jlreJ3AJaVuVdpn2cun4mSsme4k633OM47mG6GfZrrU
-8TViD0vszvlq9A1g6iiZsAmcdU9xhUpw7dgCdAg5Q6AUM8ijBT/qnSoJewwxnrdO
-4cfC0DXmUpZRiGxOXLyh8gZeggpXaXjuE1A0QNnt6byyzPqXgfqjSFId9u16/8Zs
-qWmLqzsv/4EgUjvSpoYrVv3No2/itw/wg5NhHu8lw4uWfW2PIQ0/mq1sG7tcDDeR
-iWBKBWlQ76e7mg+7At2vfnYJjqZCVuccRJ6ABwD0qSaqsIWf9Ik3VqVX9NbSngrX
-qkjVcXFQ7obP5oxzGBk19Q1NrBHGdDabG76C3axvX9FrjNHrRbNfcMeNHScCXr02
-CR6T7fPOHln9NirgJhchLifm/7HllV14iVTl0J+fby+0MZj+QQC/NeDBMfzZLQZg
-rtLDY7l8YOxdWMy8R7oyzVJyOF5cdcM0XU9FPMNQLhJpeweJoBOXlxTqkIRXk+69
-JsVP5VXdliOoEX5W7l8k
-=sWk6
+iQIcBAEBCAAGBQJRe4xgAAoJEOSiRoyO7jvocmQQAIIL3TVuLpPcyi8OlLH+vDMM
+1JSVEZZYxV+Nu+gl4Ij6VdUYh8EySpuNG1BtSrmL1BvBwA8FV35CP5+G3kWf2BWq
+iqHLVN5h/TlV3je8XvQgZP4eWMawzAHHoi4PTUcc/TQbkeJLH6hu1weYqfzPeg0C
+Wt9McPoIDqn2EB+JGj1ZYog+YeMQ2Va27mxoEvIvgHCmPPRjOI/vK8S804UVUTZF
+FoCSFW7uTGPqMVLAbFDJMlZOf+DiImyvDK2/QT/jXtyCkYIx3wRgF+aPKBAJBUTV
+D6TmzJktfFE3kj3WJ0z6uU1PV+F2v/mnsEdmR1g/uuIhdv7NP93+BDwKsSM1+/4F
+hM+wGHXU8vBMq+0VJbzKs8aOqBV8VxOdLwkJL3F6+ZHbquhTLCOanJjtdMJFUvky
+uuyZNm4xpH9npizwNa4ivNSgl1QE6eXtWAh0E1tz48Anzo9hQbs1zK+xwNceMmIe
+mqkMhy9fwIBYmke+bXLqx+ip3An1Wwe5sBYAx5ONhICjttW3TDvu+NHclGDv+xru
+plTkrkD08ubnS7EURygGS+TA79FxiZkqA1iM2txMz532TwBhYEHeRklbGhQJA6RF
+A7+ryRi/PylkO7qPOt2iKa72xCrIq6Gnqsh9t2ZdPF+qbDSN+6xVEV3wNCGZqwub
+yCNd/s9KaFHR49t15nN6
+=0aAE
 -----END PGP SIGNATURE-----
diff --git a/app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild b/app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
index b9b28c733e4b..395d790b528d 100644
--- a/app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
+++ b/app-officeext/ooo2gd/ooo2gd-3.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/ooo2gd/ooo2gd-3.0.0-r1.ebuild,v 1.1 2013/03/23 10:19:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild,v 1.2 2013/04/27 08:29:19 scarabeus Exp $
 
 EAPI=5
 
@@ -17,5 +17,5 @@ SRC_URI="http://ooo2gd.googlecode.com/files/${PN}_${PV}.oxt"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild b/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild
deleted file mode 100644
index 2a44a4928afa..000000000000
--- a/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild
+++ /dev/null
@@ -1,21 +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/ooo2gd/ooo2gd-3.0.0.ebuild,v 1.3 2012/05/23 08:54:32 scarabeus Exp $
-
-EAPI=4
-OO_EXTENSIONS=(
-	"${PN}_${PV}.oxt"
-)
-inherit office-ext
-
-DESCRIPTION="Extension for export to Google docs, zoho and WebDAV"
-HOMEPAGE="http://code.google.com/p/ooo2gd/"
-SRC_URI="http://ooo2gd.googlecode.com/files/${PN}_${PV}.oxt"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/ooo[java]"
-DEPEND="${RDEPEND}"
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"
diff --git a/app-officeext/texmaths/ChangeLog b/app-officeext/texmaths/ChangeLog
index ca561be66803..085e08d1b58a 100644
--- a/app-officeext/texmaths/ChangeLog
+++ b/app-officeext/texmaths/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-officeext/texmaths
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/texmaths/ChangeLog,v 1.14 2013/03/23 10:18:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/texmaths/ChangeLog,v 1.15 2013/04/27 08:36:13 scarabeus Exp $
+
+  27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> -texmaths-0.37.ebuild,
+  texmaths-0.37-r1.ebuild:
+  Stabilise latest, drop older.
 
 *texmaths-0.37-r1 (23 Mar 2013)
 
diff --git a/app-officeext/texmaths/Manifest b/app-officeext/texmaths/Manifest
index e6b0b7769ab1..d454a4130d51 100644
--- a/app-officeext/texmaths/Manifest
+++ b/app-officeext/texmaths/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST TexMaths-0.37.oxt 94750 SHA256 43baf8c6b83c8f7416817225d30fa025e7c953dc109217069147e0e15c1ab1b4 SHA512 c422dc4e207e614e42ac11fdf0fb3670f0e1778ff32ca242cd192737780c630efef1384a32d4304dc46fdad0f5062b23b3132b0f516e594e9696b2001c62302c WHIRLPOOL 9ea7dc6b388c962e63d5c19109b9d10bbc224dbdd6ab26b727c75583f78fb1633f889cc1ef56b80196bb9e3c3182f1e14fe71bce9b27a901fccebfb5e07c1f8b
-EBUILD texmaths-0.37-r1.ebuild 586 SHA256 92eea5f0dbf096fe44a6bc610a3709b43e65bdc797fae829fb3e49dcfd475ab5 SHA512 0377905d526d5f87290a5f98e69e16349445c579f4f678e6237ad2b5bc4ae3e552b99300810bbc106a01fbebd12d0c64914c4209d58efb6d2d33b3ec0a9d9e42 WHIRLPOOL 7d9e85efa1692af8385063a0484d7b9a739007ba7f8898d306e3cf14368a163fb2bcb5dfc18d75b7e097c2b6b3f74c7e5eab574489af7c61210df41ccf2c9891
-EBUILD texmaths-0.37.ebuild 574 SHA256 e5c4ce6e4453feb98dbd8ff0fbfe511c07b432d6a0b88669c8a6d255ad041c0d SHA512 e55182261305c8a605dc28749e3dfeecba4fcf4be6c7f0bcb23db8168d0379fa958429a9d38d2ecf0737850f6e22838e6ed9af711b56d347063d2aa70776d843 WHIRLPOOL 2f6eb47a29eadcf1f1b3dc78b46b7a1f2412bfde8c05b37efc7129e5b295544c0801f6608cb6648301f97035bd286b6acf9e803111168b44dafe642ab6d9de6e
-MISC ChangeLog 2055 SHA256 29f7b4e1779f455e913bc7635008690387be8401a5c55274d1d01cb5a0b7364e SHA512 9547f8415a590c0ecac4cc4f11b505609ae3ce091aed54a4c528d0cfd6122996ec69dd398a2cf1b98f0234b802a771ac2d17be3efb5db9df913b058806f8578b WHIRLPOOL 360fed57f4e12aca1e36c6ab98f98946146edf764c495a127f787ada0c0d991adc7c81f7627e3158abc92b59348b54c010ba8931da2331a998faf81b19fede05
+EBUILD texmaths-0.37-r1.ebuild 584 SHA256 e5b3751523bf8a7287c55d7f49b1e2d32830582888dbd3c77b436e212f70988e SHA512 36a7929660062aa03a851efb2f37231234bd368f74098010176c1f1cdfd9dd50654fcd57d119fc8b53f187083ca67f1033eebdec6fdfa254654cb9a419629c59 WHIRLPOOL 504a0b6fab176c5e0548c890f342e93dabc2942573467382ab95a804d588a5f0d4d5de6edaa1033ed8aa83e1a9457d72cf8c900c989a888f1201aa889766b934
+MISC ChangeLog 2193 SHA256 9c708b5d02580e6bc665dd158addfcccd188905cc339728137591e401d0b605e SHA512 d3b270941e2da676c31795f071fd2a8036cdee2337e73a5af3fea716a349c4c70cd944464107e7492ae23751799c7b95586616b872fa8bbb3b85878e9def9c89 WHIRLPOOL df4680eadf6d65cbceeeecee48ef0b354de7d9d84059216a8605fe19b39371aaf8b4347c7faccaf847ccd024902260a1b1b69a6c1e1e67f8a9c7335cb7151948
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTYFwAAoJEOSiRoyO7jvon34QAK5AUXi9kujriQmFlTUm4zWf
-nT/kgqqXj1eA/tHdtffD+So/LIeZ5WqPSWI5jrdAufqxzitQ8o2nLo1a10S0/hcZ
-7O7xN0mVjNBaGxGpENvxZRWj2rD0ninlN9ck05MkCocEu1OgTWi+2xOErQZ6nnov
-OQsYhjOuMhVMKivIpJaZu065ysXyub/sgMbDDeEbTfaIEnk0Jj1ofYTRWrCnqbVx
-/n29NxGX6x5EhDmTpQwqCiJES3VuSa+eSJE91r2dG71HFW4Nu29mEN93adiIoWQg
-9F+c2lLRCvwIl80BzPDMtlOjZV53DI346sD9HnL7pmW9RDehC1frod9CAv1GdKU4
-8UurDe3AObOyn0aNw66QvekD5BifWfBbZkwU7JiKQislLSu9qGuQ097TfYejTxuX
-zAcMZQL9ZYFM3izb3cQ6i+kLL1BNpq4xMIx5WSTmuw5ya1yI+R6bPXQQA6lIQIXL
-fopgioHyQqEp7SqOGk5xvxYa+G7BNEPDf4+kaZzOjhP+5N171Zz2jXrZc8anWVHH
-yWpKM/BwSdT4A6nmYpmNam66T1sSFP91XOMMvqy/2jADPm5MJ6NiMDPXr0tj9LcV
-eE4Mty8dL+zFMJjpqxjHGXCiMdrcCOPnsw9Jg4oLc2LcK8uFaR5kv67SBmzWnp6w
-tuL9Iao0IAyGWSLbvNyY
-=USfE
+iQIcBAEBCAAGBQJRe43+AAoJEOSiRoyO7jvo5u0P/iQ0+CKBRSEX8jdZE2GKg+BI
+UfML1KDoOCRbCac8rDtPlxRjyEv6BsoE+cn3JLS2oW0Z1UW0rmcm94UEWZFce424
+54ge0Tr1MFVGCQqF4NbLblfZCbVcPU2Y0UVGQ9M0a72B2ctz8S1WmwgFMzVcL5da
+tWlSD3gA+AVKXnGdsu9q4hXHBKlFr/poIuI6oHu0PC1DHlGmvzcMy3z2LmPBDN4C
+HYJx7RqvUqW+GyQn/0wM40pMSXNSFFroZV/8rWVC16sVT1WlhZRVQGKYdCSVXHTj
+400+dIfbP3Cr8V3E2QIr/Hd/dkrvhHlftUX+wI6ol8O9SIJJxKv4QG+BrRZ8v9iv
+xSVJqMo4anwvovbgE/UwmEp2tm3Tv/PEDXTJ3/s0pQhU5KBhVCTswsGpoMkDOHkV
+a/wl9SxNGBQJJ4sYipD4IInu5ZCsv0ifOskxEmOJwPbNTD/392IA1rNK9QM1ArTT
+uE8hOj+Di3U9PorkrBRNNP9LzBvwY94CTldbwvOaWloxbQVz2hlzFcIEII33OxAN
+3vh0okKxZoxKZWXUZn5ZLj9Fz8qjgminrReTWA3FavCuKiTHXG2VFH9iSbyaM5Th
+78QIwVNQVqTzTb9Y7/nvadF8iYKqaNQhZpw2T1QDfjw2QX+XBubZfbXL/9ux6l6T
+yRGeEtnMTGL4COmAEvx9
+=PXiQ
 -----END PGP SIGNATURE-----
diff --git a/app-officeext/texmaths/texmaths-0.37-r1.ebuild b/app-officeext/texmaths/texmaths-0.37-r1.ebuild
index 7edc89e5888a..7bf690d10f05 100644
--- a/app-officeext/texmaths/texmaths-0.37-r1.ebuild
+++ b/app-officeext/texmaths/texmaths-0.37-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/texmaths/texmaths-0.37-r1.ebuild,v 1.1 2013/03/23 10:18:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/texmaths/texmaths-0.37-r1.ebuild,v 1.2 2013/04/27 08:36:13 scarabeus Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-officeext/texmaths/texmaths-0.37.ebuild b/app-officeext/texmaths/texmaths-0.37.ebuild
deleted file mode 100644
index 29c8f1bd929f..000000000000
--- a/app-officeext/texmaths/texmaths-0.37.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/texmaths/texmaths-0.37.ebuild,v 1.2 2013/03/23 07:51:51 scarabeus Exp $
-
-EAPI=5
-
-MY_P="TexMaths-${PV}"
-
-OO_EXTENSIONS=(
-	"${MY_P}.oxt"
-)
-
-inherit office-ext
-
-DESCRIPTION="LaTeX Equation Editor for LibreOffice"
-HOMEPAGE="http://roland65.free.fr/texmaths/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-text/dvisvgm
-	virtual/tex-base
-"