From 2ec8dcc0f9f464501747892d3679809a9e7b4b62 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sat, 23 Jan 2021 21:57:21 +0100
Subject: 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@gentoo.org>
---
 dev-util/cppunit/cppunit-1.15.1-r1.ebuild          | 74 ----------------------
 dev-util/cppunit/cppunit-1.15.1-r2.ebuild          | 70 ++++++++++++++++++++
 .../cppunit/files/cppunit-1.15.1-slibtool.patch    | 12 ----
 3 files changed, 70 insertions(+), 86 deletions(-)
 delete mode 100644 dev-util/cppunit/cppunit-1.15.1-r1.ebuild
 create mode 100644 dev-util/cppunit/cppunit-1.15.1-r2.ebuild
 delete mode 100644 dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch

(limited to 'dev-util/cppunit')

diff --git a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild b/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
deleted file mode 100644
index 8d7448313a9c..000000000000
--- a/dev-util/cppunit/cppunit-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 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/1.15"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)
-"
-
-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
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	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
-	fi
-	einstalldocs
-
-	find "${ED}" -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-1.15.1-r2.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
new file mode 100644
index 000000000000..09eb8d15a46b
--- /dev/null
+++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+LICENSE="LGPL-2.1"
+SLOT="0/1.15"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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() {
+	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
+	fi
+	einstalldocs
+
+	find "${ED}" -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/files/cppunit-1.15.1-slibtool.patch b/dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch
deleted file mode 100644
index d5bfcb2b7489..000000000000
--- 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)
-- 
cgit v1.2.3-18-g5258