From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83C6F158090 for ; Wed, 18 May 2022 19:49:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7C4DE091A; Wed, 18 May 2022 19:49:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1AE7E091A for ; Wed, 18 May 2022 19:49:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79291341795 for ; Wed, 18 May 2022 19:49:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8812447B for ; Wed, 18 May 2022 19:49:39 +0000 (UTC) From: "Tony Olagbaiye" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tony Olagbaiye" Message-ID: <1652903369.8cc423598bc4b568aa8a0c92703e035738e9a1f8.gentoo@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/yacy/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/yacy/yacy-1.924.20210209.10069.ebuild X-VCS-Directories: net-misc/yacy/ X-VCS-Committer: gentoo X-VCS-Committer-Name: Tony Olagbaiye X-VCS-Revision: 8cc423598bc4b568aa8a0c92703e035738e9a1f8 X-VCS-Branch: dev Date: Wed, 18 May 2022 19:49:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1fbf34e-03a8-4a5b-a882-12e867a8c062 X-Archives-Hash: ca72bfacbd215f6be0a3c24601a0b6cb commit: 8cc423598bc4b568aa8a0c92703e035738e9a1f8 Author: Tony Olagbaiye fron io> AuthorDate: Wed May 18 19:49:29 2022 +0000 Commit: Tony Olagbaiye fron io> CommitDate: Wed May 18 19:49:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8cc42359 net-misc/yacy: update EAPI 6 -> 7 Signed-off-by: Tony Olagbaiye fron.io> net-misc/yacy/yacy-1.924.20210209.10069.ebuild | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild index f63c6934b..b85b112cf 100644 --- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild +++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit java-pkg-2 java-ant-2 systemd versionator user +inherit java-pkg-2 java-ant-2 systemd -MAJOR_PV="$(get_version_component_range 1-2)" -REL_PV="$(get_version_component_range 3)" -SVN_PV="$(get_version_component_range 4)" +MAJOR_PV="$(ver_cut 1-2)" +REL_PV="$(ver_cut 3)" +SVN_PV="$(ver_cut 4)" DESCRIPTION="YaCy - p2p based distributed web-search engine" HOMEPAGE="https://www.yacy.net/" @@ -26,11 +26,6 @@ S="${WORKDIR}/${PN}" EANT_BUILD_TARGET="all" UNINSTALL_IGNORE="/usr/share/yacy/DATA" -pkg_setup() { - enewgroup yacy - enewuser yacy -1 -1 /var/lib/yacy yacy -} - src_install() { # remove win-only stuff find "${S}" -name "*.bat" -exec rm '{}' \; || die @@ -42,7 +37,7 @@ src_install() { dodoc AUTHORS NOTICE && rm AUTHORS NOTICE COPYRIGHT gpl.txt - yacy_home="${EROOT}usr/share/${PN}" + yacy_home="${EROOT}/usr/share/${PN}" dodir ${yacy_home} cp -r ${S}/* ${D}${yacy_home} || die @@ -58,8 +53,7 @@ src_install() { use openrc && { exeinto /etc/init.d newexe "${FILESDIR}/yacy.rc" yacy - insinto /etc/conf.d - newins "${FILESDIR}/yacy.confd" yacy + doconfd "${FILESDIR}/yacy.confd" } use systemd && systemd_newunit "${FILESDIR}"/${PN}-ipv6.service ${PN}.service