commit:     46f414b13fc6569d531466c945e5f187887f5304
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 23:44:12 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 23:45:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f414b1

net-print/apsfilter: port to EAPI 7

Closes: https://bugs.gentoo.org/742161
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-print/apsfilter/apsfilter-7.2.8-r1.ebuild | 43 +++++++++++++++++----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild 
b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index dcc618969c3..4f7f15844ca 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -1,42 +1,55 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
 HOMEPAGE="http://www.apsfilter.org";
 SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2";
+S="${WORKDIR}/${PN}"
+
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( net-print/cups net-print/lprng )
+RDEPEND="
        app-text/ghostscript-gpl
        >=app-text/psutils-1.17
        >=app-text/a2ps-4.13b-r4
+       net-print/cups
        virtual/awk
        virtual/imagemagick-tools
        virtual/mta"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_configure() {
-       # assume thet lprng is installed if cups isn't USEd
-       use cups && \
-           myconf="--with-printcap=/etc/cups/printcap 
--with-spooldir=/var/spool/cups" || \
-           myconf="--with-printcap=/etc/lprng/printcap"
+       local myconf=
+
+       # assume that lprng is installed if cups isn't USEd
+       if use cups ; then
+               myconf="--with-printcap=/etc/cups/printcap 
--with-spooldir=/var/spool/cups"
+       else
+               myconf="--with-printcap=/etc/lprng/printcap"
+       fi
 
        # econf doesn't work here :(
-       ./configure --prefix=/usr --mandir=/usr/share/man \
-               --docdir=/usr/share/doc/${PF} --sysconfdir=/etc ${myconf} || die
+       ./configure \
+               --prefix="${EPREFIX}/usr" \
+               --mandir=/usr/share/man \
+               --docdir=/usr/share/doc/${PF} \
+               --sysconfdir=/etc \
+               "${myconf} ${EXTRA_ECONF}" \
+       || die
 }
 
 src_install() {
-       emake DESTDIR="${D}" install
-       dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
-       use cups && \
-           dosym /etc/cups/printcap /etc/printcap || \
-           dosym /etc/lprng/printcap /etc/printcap
+       emake DESTDIR="${ED}" install
+       dosym ../share/apsfilter/SETUP /usr/bin/apsfilter
+
+       if use cups ; then
+               dosym ../cups/printcap /etc/printcap
+       else
+               dosym ../lprng/printcap /etc/printcap
+       fi
 }

Reply via email to