From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BE65C13824A for ; Mon, 9 May 2016 08:08:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5494B21C10F; Mon, 9 May 2016 08:08:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCFD321C038 for ; Mon, 9 May 2016 08:07:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AB3F340940 for ; Mon, 9 May 2016 08:07:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85D07960 for ; Mon, 9 May 2016 08:07:54 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1462781140.b7300ffe31249a6185b239e14eee12e2b23ab39f.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/i2pd/i2pd-2.6.0-r3.ebuild X-VCS-Directories: net-misc/i2pd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b7300ffe31249a6185b239e14eee12e2b23ab39f X-VCS-Branch: master Date: Mon, 9 May 2016 08:07:54 +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-Archives-Salt: c5dbab49-8a80-48a9-9384-9f893d31f787 X-Archives-Hash: 39f2b149fa91afe46446543a2f81db32 commit: b7300ffe31249a6185b239e14eee12e2b23ab39f Author: Alexey Korepanov yandex ru> AuthorDate: Fri Apr 8 13:29:56 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon May 9 08:05:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7300ffe net-misc/i2pd: ebuild cleanup net-misc/i2pd/i2pd-2.6.0-r3.ebuild | 49 +++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild index 51341ad..41d1ad1 100644 --- a/net-misc/i2pd/i2pd-2.6.0-r3.ebuild +++ b/net-misc/i2pd/i2pd-2.6.0-r3.ebuild @@ -53,25 +53,13 @@ src_configure() { src_install() { cmake-utils_src_install - dodoc README.md - keepdir /var/lib/i2pd/ - insinto "/var/lib/i2pd" - doins -r "${S}/contrib/certificates" - dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt - fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/ - fperms 700 /var/lib/i2pd/ - dodir "/etc/${PN}" - insinto "/etc/${PN}" - doins "${S}/docs/${PN}.conf" - doins "${S}/debian/subscriptions.txt" - doins "${S}/debian/tunnels.conf" - newconfd "${FILESDIR}/${PN}-2.6.0-r2.confd" "${PN}" - newinitd "${FILESDIR}/${PN}-2.6.0-r2.initd" "${PN}" - systemd_newunit "${FILESDIR}/${PN}-2.6.0-r2.service" "${PN}.service" - doenvd "${FILESDIR}/99${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}" + # config + insinto /etc/i2pd + doins docs/i2pd.conf + doins debian/tunnels.conf + doins debian/subscriptions.txt + # grant i2pd group read and write access to config files fowners "root:${I2PD_GROUP}" \ /etc/i2pd/i2pd.conf \ @@ -81,9 +69,32 @@ src_install() { /etc/i2pd/i2pd.conf \ /etc/i2pd/tunnels.conf \ /etc/i2pd/subscriptions.txt + + # doc + dodoc README.md + + # working directory + keepdir /var/lib/i2pd + insinto /var/lib/i2pd + doins -r contrib/certificates + dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt + fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/ + fperms 700 /var/lib/i2pd/ + + # add /var/lib/i2pd/certificates to CONFIG_PROTECT + doenvd "${FILESDIR}/99i2pd" + + # openrc and systemd daemon routines + newconfd "${FILESDIR}/i2pd-2.6.0-r2.confd" i2pd + newinitd "${FILESDIR}/i2pd-2.6.0-r2.initd" i2pd + systemd_newunit "${FILESDIR}/i2pd-2.6.0-r2.service" i2pd.service + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}/i2pd-2.5.0.logrotate" i2pd } pkg_setup() { enewgroup "${I2PD_GROUP}" - enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}" + enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}" }