commit: 2668053406290df5b612fed940f64a59841669c4
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 16:16:24 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 16:28:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26680534
net-misc/openntpd: drop old EAPI
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-misc/openntpd/Manifest | 1 -
net-misc/openntpd/openntpd-6.0_p1.ebuild | 88 --------------------------
net-misc/openntpd/openntpd-6.2_p3.ebuild | 104 -------------------------------
3 files changed, 193 deletions(-)
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index ecb8e0eb947..c791dddbce4 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,2 +1 @@
-DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B
331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda
SHA512
a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B
f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519
SHA512
56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild
b/net-misc/openntpd/openntpd-6.0_p1.ebuild
deleted file mode 100644
index eeb3ff507f8..00000000000
--- a/net-misc/openntpd/openntpd-6.0_p1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_p/p}"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/";
-SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="libressl selinux"
-
-DEPEND="!<=net-misc/ntp-4.2.0-r2
- !net-misc/ntp[-openntpd]
- libressl? ( >=dev-libs/libressl-2.3.2 )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-ntp )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
- enewgroup ntp
- enewuser ntp -1 -1 "${NTP_HOME}" ntp
-
- # make sure user has correct HOME as flipping between the standard ntp
pkg
- # and this one was possible in the past
- if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
- ewarn "From this version on, the homedir of the ntp user cannot
be changed"
- ewarn "dynamically after the installation. For homedir
different from"
- ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf
and re-emerge."
- esethome ntp "${NTP_HOME}"
- fi
-}
-
-src_prepare() {
- # fix /run path
- sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
- sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
- # fix ntpd.drift path
- sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8
|| die
- sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
- # fix default config to use gentoo pool
- sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
- printf "\n# Choose servers announced from Gentoo NTP Pool\nservers
0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers
2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-}
-
-src_configure() {
- econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME}
$(use_enable libressl https-constraint)
-}
-
-src_install() {
- default
- rm -r "${ED}"/var
-
- newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
- newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
- keepdir "${NTP_HOME}"
-
- systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
-}
-
-pkg_postinst() {
- # Clean up chroot localtime copy from older versions
- if [ -d "${EROOT%/}${NTP_HOME}"/etc ] ; then
- if [ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ] ; then
- rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
- fi
-
- rmdir "${EROOT%/}${NTP_HOME}"/etc ||
- ewarn "Unable to remove legacy
${EROOT%/}${NTP_HOME}/etc directory"
- fi
-
- # Fix permissions on home directory
- chown root:root "${EROOT%/}${NTP_HOME}" || die
-
- [[ -f ${EROOT}var/log/ntpd.log ]] && \
- ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned,
please remove it if not in use via syslog."
-
- if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then
- einfo "Moving ntpd.drift file to new location."
- mv "${EROOT}var/lib/ntpd.drift"
"${EROOT}var/lib/openntpd/ntpd.drift"
- fi
-}
diff --git a/net-misc/openntpd/openntpd-6.2_p3.ebuild
b/net-misc/openntpd/openntpd-6.2_p3.ebuild
deleted file mode 100644
index 2250abea65c..00000000000
--- a/net-misc/openntpd/openntpd-6.2_p3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
-MY_P="${P/_p/p}"
-
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/";
-SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86"
-IUSE="libressl selinux"
-
-DEPEND="
- !<=net-misc/ntp-4.2.0-r2
- !net-misc/ntp[-openntpd]
- libressl? ( dev-libs/libressl:0= )"
-
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-ntp )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup ntp
- enewuser ntp -1 -1 "${NTP_HOME}" ntp
-
- # make sure user has correct HOME as flipping between the standard ntp
pkg
- # and this one was possible in the past
- if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
- ewarn "From this version on, the homedir of the ntp user cannot
be changed"
- ewarn "dynamically after the installation. For homedir
different from"
- ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf
and re-emerge."
- esethome ntp "${NTP_HOME}"
- fi
-}
-
-src_prepare() {
- default
-
- # fix /run path
- sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
- sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
-
- # fix ntpd.drift path
- sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8
|| die
- sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
-
- # fix default config to use gentoo pool
- sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
- printf "\n# Choose servers announced from Gentoo NTP Pool\nservers
0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers
2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-
- # disable constraint config if libressl not enabled
- use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
-}
-
-src_configure() {
- econf \
- --with-privsep-user=ntp \
- --with-privsep-path=${NTP_HOME} \
- $(use_enable libressl https-constraint)
-}
-
-src_install() {
- default
-
- rm -r "${ED}"/var || die
-
- newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
- newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
- keepdir "${NTP_HOME}"
-
- systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
-}
-
-pkg_postinst() {
- # Clean up chroot localtime copy from older versions
- if [[ -d "${EROOT%/}${NTP_HOME}"/etc ]]; then
- if [[ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ]]; then
- rm -v "${EROOT%/}${NTP_HOME}"/etc/localtime || die
- fi
-
- rmdir "${EROOT%/}${NTP_HOME}"/etc ||
- ewarn "Unable to remove legacy
${EROOT%/}${NTP_HOME}/etc directory"
- fi
-
- # Fix permissions on home directory
- chown root:root "${EROOT%/}${NTP_HOME}" || die
-
- [[ -f ${EROOT}var/log/ntpd.log ]] && \
- ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned,
please remove it if not in use via syslog."
-
- if [[ -f ${EROOT}var/lib/ntpd.drift ]]; then
- einfo "Moving ntpd.drift file to new location."
- mv "${EROOT}var/lib/ntpd.drift"
"${EROOT}var/lib/openntpd/ntpd.drift" || die
- fi
-}
