commit: 2ec8dcc0f9f464501747892d3679809a9e7b4b62
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:57:21 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 20:57:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec8dcc0
dev-util/cppunit: Revbump to remove broken slibtool patch
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../{cppunit-1.15.1-r1.ebuild => cppunit-1.15.1-r2.ebuild} | 10 +++-------
dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch | 12 ------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
similarity index 92%
rename from dev-util/cppunit/cppunit-1.15.1-r1.ebuild
rename to dev-util/cppunit/cppunit-1.15.1-r2.ebuild
index 8d7448313a9..09eb8d15a46 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
+++ b/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
deleted file mode 100644
index d5bfcb2b748..00000000000
--- a/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
