[gentoo-commits] repo/gentoo:master commit in: dev-util/cppunit/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     79701d2071c5bbf4817702588569cad2c55da28e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 13:00:41 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 13:00:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79701d20

dev-util/cppunit: Synced live ebuild

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-util/cppunit/cppunit-9999.ebuild | 43 +++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
index 435544298bf..a03be99e2df 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-9999.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-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"
-
+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
 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}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		app-doc/doxygen[dot]
 		media-gfx/graphviz
@@ -27,11 +28,11 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
+[[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999 ]] && eautoreconf
+	[[ "${PV}" == 9999 ]] && eautoreconf
 }
 
 src_configure() {
@@ -42,22 +43,24 @@ 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) \
+	local myeconfargs=(
 		--disable-werror
+		$(multilib_native_use_enable doc dot)
+		$(multilib_native_use_enable doc doxygen)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 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
+	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
+	find "${ED}" -name '*.la' -delete || die
 
 	if use examples ; then
 		find examples -iname "*.o" -delete