gentoo Easter resync : 12.04.2020

3 files changed, 73 insertions, 20 deletions

diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index ed6be73c8026..282d338908f8 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,4 +1,6 @@
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
+DIST libstaroffice-0.0.7.tar.xz 707920 BLAKE2B f06786f600414a086f9b08b413ef1e028b15070ce90b4be03b18dd69787f4812b4ecbc245381e0ed464fabe0c1147149a3c4df248181b236e5d8bb766b398985 SHA512 fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8
 EBUILD libstaroffice-0.0.6.ebuild 939 BLAKE2B 0c15a6739fd974981ea96eca622e2b5f4a9c92a5b26cb59c6f9f0003fc7746d004443887b93770a24a46c1b2af50e0aefa93895c10d9b0aaf10021329f0d059a SHA512 c5ac1dababb01bfd8c208ba686dff5d9745c57923550e780a0970b2c8cdc2bc2b4382085f0be2eec9ba5cdfa4adf8a182f810a4db3d8a586e2fe873bb696ee55
-EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
+EBUILD libstaroffice-0.0.7.ebuild 970 BLAKE2B 8a0c15fbed015a4fcf3486377a283d5de02b90dc9c6004a0cc6385cdc1ca1fc12ce40623b0c761a2f008355a912dbc5c389744c99cefdd4014aa624dcfda7b8c SHA512 beceac819018586c88d9c29869486b0307b9ad52d62539f2bf5fa1ae47cbf70d6b5a62c26085c33a19107139ae956eff80c8ec1f883ce304834c778117687537
+EBUILD libstaroffice-9999.ebuild 948 BLAKE2B e587d8cb4ce451cd83e8890e03b797087cf097b5d1a337ce47cc5b17a003bea0547a187d759545b2c825422549fc781931ac19099d1bac28d754735039b3b8cd SHA512 e75eead560e819a37f4a3f0df4fc9d048ae6c53d291fa79687f3175ffb14b2112e8e4017aff581a1c2a482342e52c5c61d559589acd29e5e258757de11b6670b
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
new file mode 100644
index 000000000000..e56e6857509e
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+IUSE="debug doc tools +zlib"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
+		$(use_enable zlib zip)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 7578276aed40..22578cbcb776 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Import filter for old StarOffice documents"
 HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
 IUSE="debug doc tools +zlib"
 
-RDEPEND="
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
 	dev-libs/librevenge
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable tools) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
 		$(use_enable zlib zip)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }