gentoo resync : 28.04.2019

6 files changed, 34 insertions, 18 deletions

diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 3e1d8a7e8091..ccdc4737db0a 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/ct2n/Manifest b/app-officeext/ct2n/Manifest
index 0b6a4c20780f..b27e47506868 100644
--- a/app-officeext/ct2n/Manifest
+++ b/app-officeext/ct2n/Manifest
@@ -1,3 +1,5 @@
+DIST converttexttonumber-1-5.0.oxt 49659 BLAKE2B d2a583bf1e639442d0c69aa4014a72586cf74e04130721f8d52a09a2426a3628cc7e926ea2b77061bc03e19268d856073209787b98d17abede4f09931e1cf5c3 SHA512 2396244dc9c2de1d11da71737889e8794a48a87f47b20c130e687cc6e4aa785a6980435587d4ec8de4b9d44da04e73045089d6543c94f8ad3b28a93c832f7d8d
 DIST converttexttonumber-1.4.0.oxt 45759 BLAKE2B 58781827b028d77fb9e3e0eecab595a85d08a0d5fe8cb42783a7e008ab67975a83c8e13824dab796852858d7e45e546807feab91e467dcf5cd9c7a1bb8981a10 SHA512 838b0ab241e93456d970ad2e30bd8c4908d9bc43e7fda881f7bff087afa6782f56916f9bf44bbaaf0a3b0ff0cbec21c2baa13034a9679c08c84da7192db06175
-EBUILD ct2n-1.4.0-r1.ebuild 547 BLAKE2B 2c30ec0857639e83ed7390f1196a8182a09e783e62b19d82ee02f76fb7a41da5684d3603a99aa8a856677d60cc00f3eccaa577609d629c923527142e13d147e5 SHA512 92a3d3e71f6cea3829eaf847d434e69874df1fd6f22849ba1922c640a813bbbbabb2e238b76a027127fda24ae8c02d3fa2428797ee28a93a82faddad1cbc0e41
+EBUILD ct2n-1.4.0-r1.ebuild 539 BLAKE2B 9c0e79d254892eeffff6ec5548702dfe308eb057a12cab73edc5636fa88fb6607f82cf99a2d51782c980319d59223bc3c71e0bfcbbbd0c26788d9bf341ceed7e SHA512 ea384ebf6f671a437954b02e51041b6e4920d50061fb5a0029660297597fd895ba22b307040b51724e80ac2ce0710eb3edf866ba8d7dc40f263e94d54a8f94ee
+EBUILD ct2n-1.5.0.ebuild 540 BLAKE2B b37c4f3e6c889277c956efb8e9a6be37e7cfab35567b15d8d1b94f91058c2a615976e25255810ee4e7261c94baee44df05a0effe5dcb665c4cf1656e2196dcda SHA512 0b57031c18c46c8af9c4b5db9f60a4326ebedffcd24f900a9755420f6c3f7accd6107cdfef7ec6f639293c46d37e864821fdd38252766d4448abac154bb21fe8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-officeext/ct2n/ct2n-1.4.0-r1.ebuild b/app-officeext/ct2n/ct2n-1.4.0-r1.ebuild
index 7a4824a298e5..27f97e1c8f21 100644
--- a/app-officeext/ct2n/ct2n-1.4.0-r1.ebuild
+++ b/app-officeext/ct2n/ct2n-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ OFFICE_EXTENSIONS=(
 inherit office-ext-r1
 
 DESCRIPTION="Extension for converting text to numbers"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/ct2n-convert-text-to-number-and-dates"
 SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}-convert-text-to-number-and-dates/releases/${PV}/${MY_P}.oxt"
 
 LICENSE="LGPL-3"
diff --git a/app-officeext/ct2n/ct2n-1.5.0.ebuild b/app-officeext/ct2n/ct2n-1.5.0.ebuild
new file mode 100644
index 000000000000..12d97f145b3f
--- /dev/null
+++ b/app-officeext/ct2n/ct2n-1.5.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="converttexttonumber-${PV/./-}"
+OFFICE_EXTENSIONS=( "${MY_P}.oxt" )
+inherit office-ext-r1
+
+DESCRIPTION="Extension for converting text to numbers"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/ct2n-convert-text-to-number-and-dates"
+SRC_URI="https://extensions.libreoffice.org/extensions/ct2n-convert-text-to-number-and-dates/${PV/.0}/@@download/file/${MY_P}.oxt"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index fbbd08c658ab..3a285cab8150 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,5 +1,5 @@
-DIST OOoFBTools-2.52.zip 5650498 BLAKE2B 57a068f1098278bc65d056a98c9047d3391cd732180fb02279d854d10215fec8ef60aa5024e837646738c5ca4f6c60f2205d2311da68eb755ef3427b79c697de SHA512 3da09160422f81be2871e294ddc9397267bf158a6304d23cfa125756c75266d21bb6a6dc5b5ef5feb7afde2979484fd092c555bf14460b43ce215b6c91007e61
 DIST OOoFBTools-2.53.zip 5634554 BLAKE2B 38f3b263ca0429611d8ebd6176c75ef74715dd0830482f8f179f8cc8aba0b01f6e0ece75115d7c35eef9be19b5a247f105d49ba511904df763121caeb964b09e SHA512 7b20ae427c1accff68dda335efde5d76d65f254a30b94d7490913949223501ee5e7099ec672a9e82ac1f5a793fa570bc12103fade24eb4ce86cc3f9f16597379
-EBUILD ooofbtools-2.52.ebuild 775 BLAKE2B 724d8d07d6c34981e0bd4159cf05aac3a3149cb6980735374ec53483deaa8336ec86ea062c0f1ae723ae6e8c8f4795ec68eb6a2b40809b7b32a5e4f1523fdbb0 SHA512 0e76e93b9eda0c190e045edf8f6ae1b594ea5af40c0439b03475a9aaadd8475643a5acc7f7e30136286dab90876aa25e4f8748b118899d7120f5d89771178e49
+DIST OOoFBTools-2.55.zip 5272938 BLAKE2B 1f4328e02ad41cfb27803fa6dbf104ecbb3c57c3056d30e02ed6573eb2b4ac9f33447b41eee4e67572b36c81eb0a2c67ea36d1ff006440afd2e7da3d19c0c3a1 SHA512 0a327939e9ee84b964d1bab0795438f0a827086932d3cc2eb4dbc82e34dc85d6653a8836f6a7fb7b983d4fb9e83d56747b472d49d3817f8703cf461a390ad1c5
 EBUILD ooofbtools-2.53.ebuild 775 BLAKE2B 724d8d07d6c34981e0bd4159cf05aac3a3149cb6980735374ec53483deaa8336ec86ea062c0f1ae723ae6e8c8f4795ec68eb6a2b40809b7b32a5e4f1523fdbb0 SHA512 0e76e93b9eda0c190e045edf8f6ae1b594ea5af40c0439b03475a9aaadd8475643a5acc7f7e30136286dab90876aa25e4f8748b118899d7120f5d89771178e49
+EBUILD ooofbtools-2.55.ebuild 776 BLAKE2B 3f01be7bfd1d97ab4f81b5634eec581838cf2513f449bcfa037068a3a3c83063636139891de5c08c20873de5e4258cab16fa82b99c096e7661b22fc62fa79b4e SHA512 9e102591453e7bd28b3846b1bb5924e04a3c810ced52d8599435e578dc95d5ad417c78f8618ab56e01bceed298ac499e0621a57b852cc5319bd508e854dcf3a6
 MISC metadata.xml 558 BLAKE2B fd01136ef59f107646bfd319657c23cf75cd2a75066a9ae63c1b430b34e5a30b087fb307a5442ad6c40a16f74a81178f35f216c95d264ef584e10ea4c3784c5e SHA512 45b372bbf351cb6d5e2f984fd8151a47f85f398059ef5470afd671fbd1d0f05e6fb987c94a29c263f4e71283c3cccdab5094cce9b78d16221c2e87045aa92009
diff --git a/app-officeext/ooofbtools/ooofbtools-2.52.ebuild b/app-officeext/ooofbtools/ooofbtools-2.55.ebuild
index db2dfa3409c9..e7c531d9b5ce 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.52.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.55.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
+OFFICE_EXTENSIONS=( "${MY_PN}.oxt" )
 inherit office-ext-r1
 
-DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
+DESCRIPTION="Open/LibreOffice extension for the FictionBook2 format with validation"
 HOMEPAGE="https://sourceforge.net/projects/fbtools/"
 SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-libs/libxml2
-	app-arch/zip"
+RDEPEND="
+	app-arch/zip
+	dev-libs/libxml2
+"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 OFFICE_EXTENSIONS_LOCATION="${S}"
 
 src_prepare() {
+	default
+
 	# Remove Windows cruft
 	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
 	rm -r win32 || die
 	popd &>/dev/null || die
-
-	eapply_user
 }
 
 src_install() {