public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/
@ 2019-10-07  9:47 Agostino Sarubbo
  0 siblings, 0 replies; 5+ messages in thread
From: Agostino Sarubbo @ 2019-10-07  9:47 UTC (permalink / raw
  To: gentoo-commits

commit:     3c4f9447a8bc0fb8b7e4240cd475d90b0a0cfc5f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 09:46:00 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 09:47:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4f9447

net-print/apsfilter: ppc stable wrt bug #696346

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-print/apsfilter/apsfilter-7.2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index 76726e4ea67..7a47862af71 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 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"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/
@ 2019-10-07 10:44 Agostino Sarubbo
  0 siblings, 0 replies; 5+ messages in thread
From: Agostino Sarubbo @ 2019-10-07 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     82b030ecf1cb5480e8d1c9ddb85ad60ba2ea1366
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 10:43:48 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 10:43:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b030ec

net-print/apsfilter: sparc stable wrt bug #696346

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-print/apsfilter/apsfilter-7.2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index 7a47862af71..80d004a13b7 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 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"
-KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/
@ 2019-10-12  4:30 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2019-10-12  4:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b403b7f51a420e7a6a47ca9e6a5441a4111da3d8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 04:21:12 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 04:29:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b403b7f5

net-print/apsfilter: drop to ~alpha, bug 696346

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-print/apsfilter/apsfilter-7.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/apsfilter/apsfilter-7.2.5.ebuild b/net-print/apsfilter/apsfilter-7.2.5.ebuild
index 47627f70637..67caf68d2f4 100644
--- a/net-print/apsfilter/apsfilter-7.2.5.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.5.ebuild
@@ -5,7 +5,7 @@ EAPI=0
 
 DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
 HOMEPAGE="http://www.apsfilter.org"
-KEYWORDS="alpha ppc sparc x86"
+KEYWORDS="~alpha ppc sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/
@ 2019-10-12  7:01 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2019-10-12  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     04e3ad5b86d00c73c4557f623a50f8b1655cba63
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 07:01:13 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 07:01:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e3ad5b

net-print/apsfilter: Drop old (EAPI 0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-print/apsfilter/Manifest               |  1 -
 net-print/apsfilter/apsfilter-7.2.5.ebuild | 41 ------------------------------
 2 files changed, 42 deletions(-)

diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
index 147f1a894d1..c347450380f 100644
--- a/net-print/apsfilter/Manifest
+++ b/net-print/apsfilter/Manifest
@@ -1,2 +1 @@
-DIST apsfilter-7.2.5.tar.bz2 309436 BLAKE2B d9f0ca66ba3bec5a77161d90cdb197906149052978b992a4b82a3da1ece3a0e48e7de78b7cb4fdb11df6479c38782cfe8f3b996630795ac5bc679ba6b3cc4ecd SHA512 a9f2060f1636d255a5ec2c9bd9d8c6a34452e7ad76724746acd45bfb2644a924036032013e7f29a753545a02a83fe099364685562a8e95634170df3277c8e943
 DIST apsfilter-7.2.8.tar.bz2 310587 BLAKE2B aae44a7e79157d3ddf9ce56fe51ae90106eb952d536658efe0f19dfcbe5f0d5c7dd078e3bb5044433e250df6b9289a08a466d6e9fc77c91d540daf07a70bf197 SHA512 ca07e7eb620a95b08fb912e899520d5ff85613eb3d1f712e1d38a66cf5b84516dbb35e3e40ef75ac10d1e717cfc2f49930a0f0873fee451d495c8ae572072012

diff --git a/net-print/apsfilter/apsfilter-7.2.5.ebuild b/net-print/apsfilter/apsfilter-7.2.5.ebuild
deleted file mode 100644
index 67caf68d2f4..00000000000
--- a/net-print/apsfilter/apsfilter-7.2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
-HOMEPAGE="http://www.apsfilter.org"
-KEYWORDS="~alpha ppc sparc x86"
-IUSE="cups"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="|| ( net-print/cups net-print/lprng )
-	app-text/ghostscript-gpl
-	>=app-text/psutils-1.17
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/a2ps-4.13b-r4
-	virtual/awk
-	virtual/mta"
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
-S=${WORKDIR}/apsfilter
-
-src_compile() {
-	# 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"
-	./configure --prefix=/usr ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
-	use cups && \
-	    dosym /etc/cups/printcap /etc/printcap || \
-	    dosym /etc/lprng/printcap /etc/printcap
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/
@ 2020-10-01 23:45 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-10-01 23:45 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-10-01 23:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-07 10:44 [gentoo-commits] repo/gentoo:master commit in: net-print/apsfilter/ Agostino Sarubbo
  -- strict thread matches above, loose matches on Subject: below --
2020-10-01 23:45 Sam James
2019-10-12  7:01 Michał Górny
2019-10-12  4:30 Matt Turner
2019-10-07  9:47 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox