commit: 511ac15bcb7ea3b8035b66096c783c870c6bd019
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 16:44:07 2020 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 16:44:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511ac15b
dev-libs/tntnet: moved to eapi-7
this commit fix also bug 426262
autotools rename configure.in to configure.ac
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 2 ++
...tnet-2.2.1-r1.ebuild => tntnet-2.2.1-r2.ebuild} | 28 ++++++++++++----------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index 50046a85221..617f01ca9a9 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -88,3 +88,5 @@ src_install() {
newinitd "${FILESDIR}/tntnet.initd" tntnet
fi
}
+
+# @stable ~26may2020
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
similarity index 81%
copy from dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
copy to dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
index 50046a85221..2a1e7bb6230 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc gnutls libressl server ssl examples"
+IUSE="gnutls libressl server ssl examples"
RDEPEND=">=dev-libs/cxxtools-2.2.1
sys-libs/zlib[minizip]
@@ -26,21 +26,28 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
libressl? ( dev-libs/libressl:0= )
)
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
app-arch/zip"
src_prepare() {
# Both fixed in the next release
- epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+ eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
rm framework/common/{ioapi,unzip}.[ch] || die
+ # bug 426262
+ if has_version ">sys-devel/autoconf-2.13"; then
+ mv configure.in configure.ac
+ fi
+
# bug 423697
- sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
+ sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
|| die
eautoreconf
sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
+
+ default
}
src_configure() {
@@ -68,10 +75,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README TODO
- if use doc; then
- dodoc doc/*.pdf
- fi
+ dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
if use examples; then
cd "${S}/sdk/demos"
@@ -79,8 +83,8 @@ src_install() {
rm -rf .deps */.deps .libs */.libs
cd "${S}"
- insinto /usr/share/doc/${PF}/examples
- doins -r sdk/demos/*
+ docinto examples
+ dodoc -r sdk/demos/*
fi
if use server; then
