* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2016-11-11 14:00 Manuel Rüger
0 siblings, 0 replies; 6+ messages in thread
From: Manuel Rüger @ 2016-11-11 14:00 UTC (permalink / raw
To: gentoo-commits
commit: d22f3b25d5edfaf335bc37708fe8b0c49eda4da1
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 14:00:02 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 14:00:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22f3b25
net-print/foo2zjs: Start making the ebuild less horrible
Package-Manager: portage-2.3.0
net-print/foo2zjs/foo2zjs-99999999.ebuild | 36 +++++++++++++++----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 11eaf26..c5011e9 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
-inherit eutils
+inherit toolchain-funcs eutils
DESCRIPTION="Support for printing to ZjStream-based printers"
HOMEPAGE="http://foo2zjs.rkkda.com/"
@@ -18,7 +18,7 @@ RESTRICT="bindist"
RDEPEND="net-print/cups
net-print/foomatic-db-engine
- || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+ >=net-print/cups-filters-1.0.43-r1[foomatic]
virtual/udev"
DEPEND="${RDEPEND}
app-arch/unzip
@@ -32,46 +32,46 @@ S="${WORKDIR}/${PN}"
src_unpack() {
einfo "Fetching ${PN} tarball"
- wget "http://foo2zjs.rkkda.com/${PN}.tar.gz"
- tar zxf "${WORKDIR}/${PN}.tar.gz"
+ wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" || die
+ tar zxf "${WORKDIR}/${PN}.tar.gz" || die
- epatch "${FILESDIR}/${PN}-udev.patch"
- epatch "${FILESDIR}/${PN}-usbbackend.patch"
+ epatch "${FILESDIR}/${PN}-udev.patch"\
+ "${FILESDIR}/${PN}-usbbackend.patch"
- cd "${S}"
+ cd "${S}" || die
einfo "Fetching additional files (firmware, etc)"
emake getweb
# Display wget output, downloading takes some time.
- sed -e '/^WGETOPTS/s/-q//g' -i getweb
+ sed -e '/^WGETOPTS/s/-q//g' -i getweb || die
- ./getweb all
+ ./getweb all || die
}
src_prepare() {
# Prevent an access violation.
- sed -e "s~/etc~${D}/etc~g" -i Makefile
- sed -e "s~/etc~${D}/etc~g" -i hplj1000
+ sed -e "s~/etc~${D}/etc~g" -i Makefile || die
+ sed -e "s~/etc~${D}/etc~g" -i hplj1000 || die
# Prevent an access violation, do not create symlinks on live file system
# during installation.
- sed -e 's/ install-filter / /g' -i Makefile
+ sed -e 's/ install-filter / /g' -i Makefile || die
# Prevent an access violation, do not remove files from live filesystem
# during make install
- sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile
- sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000
+ sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
+ sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
}
src_compile() {
- MAKEOPTS=-j1 default
+ MAKEOPTS=-j1 CC="$(tc-getCC)" default
}
src_install() {
# ppd files are installed automagically. We have to create a directory
# for them.
- mkdir -p "${D}/usr/share/ppd"
+ dodir /usr/share/ppd
emake DESTDIR="${D}" -j1 install install-hotplug
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2017-02-11 19:05 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2017-02-11 19:05 UTC (permalink / raw
To: gentoo-commits
commit: bd534f4bd7f2bb0776404b13a3f17555aa4605c3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 19:04:57 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 19:05:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd534f4b
net-print/foo2zjs: Hard-disable test phase
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-print/foo2zjs/foo2zjs-99999999.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index c5011e9bfb..bcbff6fa38 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -75,3 +75,8 @@ src_install() {
emake DESTDIR="${D}" -j1 install install-hotplug
}
+
+src_test() {
+ # see bug 419787
+ : ;
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2019-12-12 16:46 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-12-12 16:46 UTC (permalink / raw
To: gentoo-commits
commit: f3a7b62452b23d9ac1c23ef293b387fe0e7abeb7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 15:33:24 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 16:34:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a7b624
net-print/foo2zjs: [QA] Fix MissingTestRestrict
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-print/foo2zjs/foo2zjs-99999999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index d1309102958..53f4e1dcf6a 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS=""
IUSE="test"
-RESTRICT="bindist"
+RESTRICT="bindist !test? ( test )"
RDEPEND="net-print/cups
net-print/foomatic-db-engine
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2020-02-21 17:19 Rick Farina
0 siblings, 0 replies; 6+ messages in thread
From: Rick Farina @ 2020-02-21 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 99af30bdb87c3935c1f1a007fd439cb697f5bf95
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 17:19:33 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 17:19:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99af30bd
net-print/foo2zjs: add stable candidate
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-print/foo2zjs/Manifest | 1 +
...zjs-99999999.ebuild => foo2zjs-20200221.ebuild} | 30 ++++++----------------
net-print/foo2zjs/foo2zjs-99999999.ebuild | 8 +++---
3 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
new file mode 100644
index 00000000000..1a03fc0a744
--- /dev/null
+++ b/net-print/foo2zjs/Manifest
@@ -0,0 +1 @@
+DIST foo2zjs-20200221.tar.xz 6330264 BLAKE2B 71e290cbb76d4975d72627270406a8479437adc3e94d334827d5c219dc0269708ddc559f847f881076f40515396931a2b4a4f4604b121e6a7007a5b2fc5b3432 SHA512 8d992b48157189b800a2ba2f8e528f0c3d59a532e6172f2979c4b3f6fa9a3ac7167e0e28195019b70e260d2459ebd17aba118735d5a2c8e5c7603c750ea8dfaf
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-20200221.ebuild
similarity index 74%
copy from net-print/foo2zjs/foo2zjs-99999999.ebuild
copy to net-print/foo2zjs/foo2zjs-20200221.ebuild
index 53f4e1dcf6a..a3a8fb5c6d1 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20200221.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://foo2zjs.rkkda.com/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="test"
RESTRICT="bindist !test? ( test )"
@@ -27,28 +27,12 @@ DEPEND="${RDEPEND}
sys-devel/bc
test? ( sys-process/time )"
-S="${WORKDIR}/${PN}"
+SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-src_unpack() {
- einfo "Fetching ${PN} tarball"
- wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" || die
- tar zxf "${WORKDIR}/${PN}.tar.gz" || die
-
- epatch "${FILESDIR}/${PN}-udev.patch"\
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-udev.patch"\
"${FILESDIR}/${PN}-usbbackend.patch"
- cd "${S}" || die
-
- einfo "Fetching additional files (firmware, etc)"
- emake getweb
-
- # Display wget output, downloading takes some time.
- sed -e '/^WGETOPTS/s/-q//g' -i getweb || die
-
- ./getweb all || die
-}
-
-src_prepare() {
# Prevent an access violation.
sed -e "s~/etc~${D}/etc~g" -i Makefile || die
sed -e "s~/etc~${D}/etc~g" -i hplj1000 || die
@@ -61,6 +45,8 @@ src_prepare() {
# during make install
sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
+
+ default
}
src_compile() {
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 53f4e1dcf6a..630ce3d9e59 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs eutils
@@ -34,7 +34,7 @@ src_unpack() {
wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" || die
tar zxf "${WORKDIR}/${PN}.tar.gz" || die
- epatch "${FILESDIR}/${PN}-udev.patch"\
+ eapply "${FILESDIR}/${PN}-udev.patch"\
"${FILESDIR}/${PN}-usbbackend.patch"
cd "${S}" || die
@@ -61,6 +61,8 @@ src_prepare() {
# during make install
sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
+
+ default
}
src_compile() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2021-12-26 2:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-12-26 2:04 UTC (permalink / raw
To: gentoo-commits
commit: c2a0582dc23b9475006ed0d502b26394d9df84f6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 02:01:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 02:03:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a0582d
net-print/foo2zjs: mark as PROPERTIES="live" for 9999*
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-print/foo2zjs/foo2zjs-99999999.ebuild | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index a9d4aa9966f2..a2cb6e6f268b 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://foo2zjs.rkkda.com/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+PROPERTIES="live"
IUSE="test"
RESTRICT="bindist !test? ( test )"
@@ -19,8 +19,8 @@ RDEPEND="net-print/cups
net-print/foomatic-db-engine
>=net-print/cups-filters-1.0.43-r1[foomatic]
virtual/udev"
-DEPEND="${RDEPEND}
- app-arch/unzip
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
app-editors/vim
net-misc/wget
sys-apps/ed
@@ -69,6 +69,11 @@ src_compile() {
MAKEOPTS=-j1 CC="$(tc-getCC)" default
}
+src_test() {
+ # see bug 419787
+ : ;
+}
+
src_install() {
# ppd files are installed automagically. We have to create a directory
# for them.
@@ -76,8 +81,3 @@ src_install() {
emake DESTDIR="${D}" -j1 install install-hotplug
}
-
-src_test() {
- # see bug 419787
- : ;
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/
@ 2024-01-08 9:48 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-08 9:48 UTC (permalink / raw
To: gentoo-commits
commit: bcc28afe5cb0f85a2da872178d0814b5f7153a38
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 09:38:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 09:42:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc28afe
net-print/foo2zjs: sys-devel/bc -> app-alternatives/bc
All of these will be using app-alternatives/bc anyway as they're not calling
bc-reference, so make the dep reflect reality.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-print/foo2zjs/foo2zjs-20200221.ebuild | 4 ++--
net-print/foo2zjs/foo2zjs-99999999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-print/foo2zjs/foo2zjs-20200221.ebuild b/net-print/foo2zjs/foo2zjs-20200221.ebuild
index 2e16ac81d528..6bfd213d2c6b 100644
--- a/net-print/foo2zjs/foo2zjs-20200221.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20200221.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
app-editors/vim
net-misc/wget
sys-apps/ed
- sys-devel/bc
+ app-alternatives/bc
test? ( sys-process/time )"
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index a2cb6e6f268b..2a03dcc7030a 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ BDEPEND="app-arch/unzip
app-editors/vim
net-misc/wget
sys-apps/ed
- sys-devel/bc
+ app-alternatives/bc
test? ( sys-process/time )"
S="${WORKDIR}/${PN}"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-08 9:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-26 2:04 [gentoo-commits] repo/gentoo:master commit in: net-print/foo2zjs/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-08 9:48 Sam James
2020-02-21 17:19 Rick Farina
2019-12-12 16:46 Michał Górny
2017-02-11 19:05 Andreas Hüttel
2016-11-11 14:00 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox