gentoo resync : 10.09.2021

3 files changed, 9 insertions, 90 deletions

diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index b95a0828dba2..f80e000b3ba1 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,6 +1,4 @@
-DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
-EBUILD cppunit-1.14.0.ebuild 1693 BLAKE2B 83a201e91d37b031e7fc0763a31df8da568aff53d1f2e6c7d678d44582c6ffacab63d998bbcabb5fd9edff7bf005b40387bfba3f97573f53c6e9d99051133144 SHA512 aac5f7f4f969a4a7511f9f338c0948a8b454f9f6691d34f3ae0f5d90ab6ba0c29257be0e206ca6740323c41b5a5c3deea56e360ab3af1f195127a7001eb37322
 EBUILD cppunit-1.15.1-r2.ebuild 1659 BLAKE2B 267535123db135043b5a74bae59ccee1428625ca3040527fd607f97e709350d8f58f947cef55b9604a9e47a312df2cafa8e903b6a6915db261995cda4f9dbeb6 SHA512 662b8bd560d7040ae6a0752be6cdbbc6849ab116498baed1d913217e232dc4197f8d28117835b06c687716a5c142d3b4a8cfcff1759156648c0621e8752bb70d
-EBUILD cppunit-9999.ebuild 1654 BLAKE2B 8357d827f94727e3074f5933a97f64b129710fa77033848fe72dd1e8589d545f381989515805861bd53e988fcd227e8a7cc61adb54b965bce1ea8c8aa991e533 SHA512 63b847b7125ae2e2540879ae4e685b337320260883e27b49f3837c83381ca38450fdfb31d70bc05093ad4aaf7939b25a46ab5db25ec599475d4684973ef5c04f
+EBUILD cppunit-1.15.1-r3.ebuild 1343 BLAKE2B 401e1705db024dc09bc87b987ba42c17d8f553f65d883aa2bcd4cc1314e7bebb2bf1ccafd02affea9b2f8a5ac251da6ab45de9db62178ff1bad196f4bc41acbd SHA512 0304b185747ca190fced8c531838ff3ebd240b764ca561b0762e2c7e128c05fe68aa5b340dbd107ac2eb7f17223edd543cdba71cac8c5249ca24e1bb6e7603c9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
deleted file mode 100644
index f8d6b23177e3..000000000000
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--disable-werror
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
-		rm -r "${ED%/}"/usr/share/${PN} || die
-	fi
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
index a03be99e2df6..8a942d3911d2 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
+
+SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
 LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc examples static-libs"
+SLOT="0/1.15"
+IUSE="doc examples"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen[dot]
@@ -27,13 +22,7 @@ BDEPEND="
 	)
 "
 
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	default
-	[[ "${PV}" == 9999 ]] && eautoreconf
-}
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO ChangeLog doc/FAQ )
 
 src_configure() {
 	# Anything else than -O0 breaks on alpha
@@ -47,7 +36,6 @@ multilib_src_configure() {
 		--disable-werror
 		$(multilib_native_use_enable doc dot)
 		$(multilib_native_use_enable doc doxygen)
-		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }