gentoo resync : 29.12.2022

3 files changed, 25 insertions, 32 deletions

diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index bcb76161d912..b89fdb90f671 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1139 BLAKE2B 1f2d3b23e9843491c29bd7d43994b2cd5a95662932e833639d2044a6ce870e39329ac88d1540b5c140724dddb16cd522bc0a884690cce1d5cad5b579a8b9a855 SHA512 21bb7cff8c7097da0e165fbd018c9435d85ea8fd7614332c6aca5a9c0d4a886cf02ee759affc253816575181bdbcd784d9f7b972146a535939a30eba601724b2
-EBUILD librevenge-9999.ebuild 1134 BLAKE2B 1c20710c1f34cbf12ae52dc58472772339130103a0fd9b94552bdab40a20ca915d4b46ccccc9c0d83b2808a2487f95d454b44a111fcfab7dbed038d0ece122e3 SHA512 5c6a541aba411553f27def5201dd1e718e28066c367b4d4505ad237f8e03f96b7b33e72d7652f54f8c67b38a91f52aff28b38c16c0ca81fd2dd76070ecc5e2fa
+EBUILD librevenge-0.0.4-r2.ebuild 1113 BLAKE2B beac3c2d736ed716e8313d19a16fa0f9f16b9a865298dc861aed0e5759153ba780d0b79fb980b758712f8f53fa05049b5091dfb198157a289362803ecd461e90 SHA512 a364d7f7ef746a6b6d9698c306927a499f614380cee3eb682c8b3d1e6b4e173c5f4e6d1ab7b5746338c9535da293de935550f6d3e18c668a2b8c531bc9d50126
+EBUILD librevenge-9999.ebuild 1118 BLAKE2B 5f6fcf32966de6e3b510cac2e59c6b910556695114c381dde63b23b8cf38401e4537ea56cc8ff7314b82ec3002d6e4bca5f16f642b2e857932cd1635c6d29560 SHA512 eace218e5959b643722b233f333e164e346a960e803778eb197b3a8f63880aae58ce37ef92348ca494ab8430c84a14fb824b1bb9369649a6bdb0f1a0cece8533
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r2.ebuild
index 14145f8a95a9..8859233f807d 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r2.ebuild
@@ -1,52 +1,47 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic multilib-minimal
+inherit multilib-minimal
 
-DESCRIPTION="A helper library for REVerse ENGineered formats filters"
-HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
 	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
+DESCRIPTION="Helper library for REVerse ENGineered formats filters"
+HOMEPAGE="https://sf.net/p/libwpd/librevenge"
+
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
-"
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-
-	# bug 651264
-	append-cxxflags -std=c++11
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable test tests)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index eff06c57664d..1507cf6e091a 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic multilib-minimal
+inherit multilib-minimal
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
@@ -19,19 +19,17 @@ HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
-"
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )"
 BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
@@ -45,5 +43,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }