dev-util/cppunit: Revbump to remove broken slibtool patch

Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler <[email protected]>
johu · Jan 23, 2021 · 2ec8dcc · 2ec8dcc
1 parent 7943935
commit 2ec8dcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild → dev-util/cppunit/cppunit-1.15.1-r2.ebuild b/dev-util/cppunit/cppunit-1.15.1-r1.ebuild → dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal
+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 git-r3
+	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"
@@ -30,13 +30,9 @@ 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
-	eautoreconf
+	[[ "${PV}" == 9999 ]] && 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