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

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

[Lars Wendler]

commit:     5c05025c021f186c4d4a9076867c3a1cbf401f29
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 17:33:06 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 17:33:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c05025c

dev-util/cppunit: Fixed build with sys-devel/slibtool

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

 dev-util/cppunit/cppunit-1.15.1-r1.ebuild            | 10 +++++++---
 dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild b/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
index 09eb8d15a46..8d7448313a9 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal
+inherit autotools 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
+	inherit 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"
@@ -30,9 +30,13 @@ BDEPEND="
 DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
 [[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15.1-slibtool.patch"
+)
+
 src_prepare() {
 	default
-	[[ "${PV}" == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {

diff --git a/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch b/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
new file mode 100644
index 00000000000..d5bfcb2b748
--- /dev/null
+++ b/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
@@ -0,0 +1,12 @@
+This fixes build with sys-devel/slibtool
+
+--- cppunit-1.15.1/src/cppunit/Makefile.am
++++ cppunit-1.15.1/src/cppunit/Makefile.am
+@@ -62,6 +62,6 @@
+ 
+ libcppunit_la_LDFLAGS= \
+  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -release $(LT_RELEASE) $(LIBADD_DL)
++ $(LIBADD_DL)
+ 
+ libcppunit_la_LIBADD = $(LIBADD_DL)