Gentoo Archives: gentoo-commits

From: Tony Olagbaiye <gentoo@××××.io>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/yacy/
Date: Wed, 18 May 2022 19:49:44
Message-Id: 1652903369.8cc423598bc4b568aa8a0c92703e035738e9a1f8.gentoo@gentoo
1 commit: 8cc423598bc4b568aa8a0c92703e035738e9a1f8
2 Author: Tony Olagbaiye <bqv <AT> fron <DOT> io>
3 AuthorDate: Wed May 18 19:49:29 2022 +0000
4 Commit: Tony Olagbaiye <gentoo <AT> fron <DOT> io>
5 CommitDate: Wed May 18 19:49:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8cc42359
7
8 net-misc/yacy: update EAPI 6 -> 7
9
10 Signed-off-by: Tony Olagbaiye <bqv <AT> fron.io>
11
12 net-misc/yacy/yacy-1.924.20210209.10069.ebuild | 20 +++++++-------------
13 1 file changed, 7 insertions(+), 13 deletions(-)
14
15 diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
16 index f63c6934b..b85b112cf 100644
17 --- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
18 +++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
19 @@ -1,13 +1,13 @@
20 # Copyright 1999-2014 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=6
24 +EAPI=7
25
26 -inherit java-pkg-2 java-ant-2 systemd versionator user
27 +inherit java-pkg-2 java-ant-2 systemd
28
29 -MAJOR_PV="$(get_version_component_range 1-2)"
30 -REL_PV="$(get_version_component_range 3)"
31 -SVN_PV="$(get_version_component_range 4)"
32 +MAJOR_PV="$(ver_cut 1-2)"
33 +REL_PV="$(ver_cut 3)"
34 +SVN_PV="$(ver_cut 4)"
35
36 DESCRIPTION="YaCy - p2p based distributed web-search engine"
37 HOMEPAGE="https://www.yacy.net/"
38 @@ -26,11 +26,6 @@ S="${WORKDIR}/${PN}"
39 EANT_BUILD_TARGET="all"
40 UNINSTALL_IGNORE="/usr/share/yacy/DATA"
41
42 -pkg_setup() {
43 - enewgroup yacy
44 - enewuser yacy -1 -1 /var/lib/yacy yacy
45 -}
46 -
47 src_install() {
48 # remove win-only stuff
49 find "${S}" -name "*.bat" -exec rm '{}' \; || die
50 @@ -42,7 +37,7 @@ src_install() {
51
52 dodoc AUTHORS NOTICE && rm AUTHORS NOTICE COPYRIGHT gpl.txt
53
54 - yacy_home="${EROOT}usr/share/${PN}"
55 + yacy_home="${EROOT}/usr/share/${PN}"
56 dodir ${yacy_home}
57 cp -r ${S}/* ${D}${yacy_home} || die
58
59 @@ -58,8 +53,7 @@ src_install() {
60 use openrc && {
61 exeinto /etc/init.d
62 newexe "${FILESDIR}/yacy.rc" yacy
63 - insinto /etc/conf.d
64 - newins "${FILESDIR}/yacy.confd" yacy
65 + doconfd "${FILESDIR}/yacy.confd"
66 }
67
68 use systemd && systemd_newunit "${FILESDIR}"/${PN}-ipv6.service ${PN}.service