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() {
