commit: 18414add5206e04741dcc5a3b38c6e533de31939 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Apr 20 01:09:58 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 20 01:20:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18414add
dev-libs/libcoyotl: port to EAPI 7 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch | 10 ++++----- dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch | 4 ++-- dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild | 32 +++++++++++++++++----------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch index 4d3391e2116..e81476565e3 100644 --- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch +++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch @@ -1,6 +1,5 @@ -diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libcoyotl/command_line.cpp ---- libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp 2008-03-21 22:41:41.000000000 +0100 -+++ libcoyotl-3.1.0/libcoyotl/command_line.cpp 2008-03-21 22:41:59.000000000 +0100 +--- a/libcoyotl/command_line.cpp ++++ b/libcoyotl/command_line.cpp @@ -30,10 +30,13 @@ // http://www.coyotegulch.com // @@ -15,9 +14,8 @@ diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libco command_line::command_line(int argc, char * argv[], const set<string> & bool_opts) : m_options(), m_inputs(), -diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/sortutil.h libcoyotl-3.1.0/libcoyotl/sortutil.h ---- libcoyotl-3.1.0.orig/libcoyotl/sortutil.h 2008-03-21 22:41:41.000000000 +0100 -+++ libcoyotl-3.1.0/libcoyotl/sortutil.h 2008-03-21 22:41:59.000000000 +0100 +--- a/libcoyotl/sortutil.h ++++ b/libcoyotl/sortutil.h @@ -34,10 +34,11 @@ //----------------------------------------------------------------------- diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch index 443cbe2a865..266a5631fec 100644 --- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch +++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch @@ -1,5 +1,5 @@ ---- libcoyotl/maze_renderer.cpp.ORIG 2005-10-10 06:48:30.000000000 +0200 -+++ libcoyotl/maze_renderer.cpp 2013-04-12 10:29:31.127689828 +0200 +--- a/libcoyotl/maze_renderer.cpp ++++ b/libcoyotl/maze_renderer.cpp @@ -36,6 +36,8 @@ #include "maze_renderer.h" using namespace libcoyotl; diff --git a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild index 3aba111d9a9..0e59b18b775 100644 --- a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild +++ b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit autotools epatch ltprune +inherit autotools DESCRIPTION="A collection of portable C++ classes" HOMEPAGE="http://www.coyotegulch.com/products/libcoyotl/"; @@ -12,39 +12,45 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" - -IUSE="doc static-libs" +IUSE="doc" RDEPEND="media-libs/libpng:0=" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" DOCS=( AUTHORS ChangeLog NEWS README ) +PATCHES=( + "${FILESDIR}"/${PV}-gcc-4.3.patch + "${FILESDIR}"/${PV}-gcc-4.7.patch +) + src_prepare() { - epatch "${FILESDIR}/${PV}-gcc-4.3.patch" - epatch "${FILESDIR}/${PV}-gcc-4.7.patch" - epatch_user + default + eautoreconf } src_configure() { - ac_cv_prog_HAVE_DOXYGEN="false" econf $(use_enable static-libs static) + ac_cv_prog_HAVE_DOXYGEN="false" econf --disable-static } src_compile() { emake if use doc ; then - cd docs + cd docs || die doxygen libcoyotl.doxygen || die "generating docs failed" fi } src_install() { default - prune_libtool_files + + find "${ED}" -name '*.la' -delete || die + if use doc ; then - dohtml docs/html/* + docinto html + dodoc docs/html/* fi }
