commit: 51bca7fef3ab81b6eddab355b9ee619d2985256e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 23:45:46 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 23:45:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bca7fe
sys-apps/ucspi-tcp: Port to EAPI 7 Closes: https://bugs.gentoo.org/742095 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch | 4 +-- sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild | 40 ++++++++++------------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch b/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch index cd75a71000c..ccf6341a488 100644 --- a/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch +++ b/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch @@ -1,5 +1,5 @@ ---- rblsmtpd.c 2005-01-30 16:28:09.000000000 +0100 -+++ rblsmtpd.c 2005-01-30 16:30:52.000000000 +0100 +--- a/rblsmtpd.c ++++ b/rblsmtpd.c @@ -195,6 +195,7 @@ { int flagwantdefaultrbl = 1; diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild index ac0979eeb27..55e72e8ade0 100644 --- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild +++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils qmail toolchain-funcs +inherit qmail toolchain-funcs DESCRIPTION="Collection of tools for managing UNIX services" HOMEPAGE="https://cr.yp.to/ucspi-tcp.html"; @@ -12,8 +12,7 @@ SRC_URI=" mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/${P}-man.tar.gz http://xs3.b92.net/tomislavr/${P}-rblspp.patch - ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff19.bz2 ) -" + ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff19.bz2 )" LICENSE="public-domain" SLOT="0" @@ -21,30 +20,29 @@ KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd6 IUSE="ipv6 qmail-spp selinux" RESTRICT="test" -DEPEND="" -RDEPEND="${DEPEND} +RDEPEND=" !app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )" src_prepare() { - epatch "${FILESDIR}"/${PV}-protos.patch + eapply "${FILESDIR}"/${PV}-protos.patch if use ipv6; then - epatch "${WORKDIR}"/${P}-ipv6.diff19 - epatch "${FILESDIR}"/${PV}-protos-ipv6.patch - epatch "${FILESDIR}"/${PV}-tcprules.patch #135571 - epatch "${FILESDIR}"/${PV}-bigendian.patch #18892 + eapply "${WORKDIR}"/${P}-ipv6.diff19 + eapply "${FILESDIR}"/${PV}-protos-ipv6.patch + eapply "${FILESDIR}"/${PV}-tcprules.patch #135571 + eapply "${FILESDIR}"/${PV}-bigendian.patch #18892 else - epatch "${FILESDIR}"/${PV}-protos-no-ipv6.patch + eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch fi - epatch "${DISTDIR}"/ucspi-rss.diff - epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch - epatch "${DISTDIR}"/${P}-rblspp.patch - epatch "${FILESDIR}"/${PV}-protos-rblspp.patch - epatch "${FILESDIR}"/${PV}-large-responses.patch - epatch "${FILESDIR}"/${PV}-uint-headers.patch - epatch "${FILESDIR}"/${PV}-ar-ranlib.patch + eapply "${DISTDIR}"/ucspi-rss.diff + eapply "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch + eapply "${DISTDIR}"/${P}-rblspp.patch + eapply "${FILESDIR}"/${PV}-protos-rblspp.patch + eapply "${FILESDIR}"/${PV}-large-responses.patch + eapply "${FILESDIR}"/${PV}-uint-headers.patch + eapply "${FILESDIR}"/${PV}-ar-ranlib.patch - epatch_user + eapply_user } src_configure() { @@ -53,7 +51,7 @@ src_configure() { # See also the patch above for generating the "makelib" script. tc-export AR RANLIB - echo "${EPREFIX}/usr/" > conf-home + echo "${EPREFIX}/usr/" > conf-home || die } src_install() {
