Stabilise latest, drop older.

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

4 files changed, 22 insertions, 40 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}"