move stable keywords from 20080406-r9 to 4.0_pre20080406 in preparation of version bump to 5.7_p1 (bug #536032)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 17 insertions, 117 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index d064de5a827d..0a8df2580575 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.127 2015/01/12 16:27:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.128 2015/01/12 18:01:31 ottxor Exp $
+
+  12 Jan 2015; Christoph Junghans <ottxor@gentoo.org>
+  -openntpd-20080406-r9.ebuild, openntpd-4.0_pre20080406.ebuild:
+  move stable keywords from 20080406-r9 to 4.0_pre20080406 in preparation of
+  version bump to 5.7_p1 (bug #536032)
 
 *openntpd-4.0_pre20080406 (12 Jan 2015)
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index a1581ec5bef6..dd8e9b7cb20a 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -9,18 +9,17 @@ AUX openntpd.init.d-20080406-r6 417 SHA256 fca7183a7676f0f471878925c8fbec20b7a0b
 AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
 DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
-EBUILD openntpd-20080406-r9.ebuild 3174 SHA256 7570e990dafeec956b6c47862d318faadfc1755a9e87cbce8b17a036a009d110 SHA512 2055312a73e1eed42285f54d6457052c8509047e40f41d1ba06f580b4908861e68790d50635acab6480cd72a6503243caf1d2094abcc3e232bfe2d2a0f86726e WHIRLPOOL bd9eb18efa4356c98486c2d03ddbf502d56b69265ada6031a4903a60aca711bc4e2f8f178e9275f30be3a365ec217d6ade56c761fffc420b1083eeee623ce417
-EBUILD openntpd-4.0_pre20080406.ebuild 3251 SHA256 6db12344d992b47694186da4dcc7d17e644088449723ca38d9ddb7850741c1ce SHA512 a5c7c51ab7534fafdef16d9fcccb7aa8691a798a5726c2de707a5736f6ac70763b4ef26e14bbb3fba0886f6ce66c0f5c99852f24fcc144c04047365925811a3c WHIRLPOOL 606330a126ca4cda2e3c6069097f8dba216ae34af858277b80a6168bbb200c18ccb632ddec1bd9f483b824ef3b9d0c75d7aeeb93c3545fd7022f85c86b3675d9
-MISC ChangeLog 17879 SHA256 b69f8de81e112836ba13d9eefdcbc5a292b3f886f852326886c145ba0530cb30 SHA512 c4662ab44b5c1cd5403622554c91ebad1b9b136e6c4a5663ccad7face856cc29dd9d4461ef87ced3d24ac6f3cd29096e855aac1bc9751ceb3aecc9e825c9a22b WHIRLPOOL 1d7deaf678a403bcf9f0d6799086b793279902028776a4d9a38b84dea67ee8d0d2fef73930e745a76ebbb3fd8f4bd0164c48f589c8ff8945bae98ff4b1e6741e
+EBUILD openntpd-4.0_pre20080406.ebuild 3242 SHA256 c63281f7874ed6cfd767d5bf8f2feacd63f0d2e6e501dd7f8af4b63f91ee78d3 SHA512 04c3843c4cbaf27dd12e5880d6a1a6921db7f2481575f6d5f3fe6e821cc151d568dacd64adb0d239e38c2a7217e28a91f690d88a4d6be26970952dcb424f3464 WHIRLPOOL c0f7447735b237d5777aad88858f738f0395154ebcd3a10a679f8e6280e48ae14b986765071db124b130df735049ec70d61710c766dde05bd4019f7b7532b870
+MISC ChangeLog 18115 SHA256 678eac359007a49b71e9f3d6dbd8fc38a6f7cafbb133015ff6f88429abdf221c SHA512 f54aa7b7f43bd438e15f794ecb04d9da86136f92194438540c111b12a4e95267e03bce756ee56834e7bdb11a6975cb1169d473349832afc172438a6ec18c8a7e WHIRLPOOL 46d35ba87e0f61ef736f23295b89104540dcd6f3558323d5e595eb242f8740d8d8165bcf1cb9f910d0083528c581fe187aa4e918c86c4ad98fb228c04932fc0d
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUs/YAAAoJEOeBhlrCAAWG+LkH/jdX1jorxBa8scrfPHnqW+ES
-G7wQ0ihPaGd4YcieiQCDwSg9lFBVJL1+8liQLixdf84F30cznGBBu6K2S7r86O/C
-Vgy6CEn+12ETcHiD3fqY8VEFQjAg6ILjCDsIA7elUmzZqwPCGtOiGNaf78IzApIt
-qz3MQDPNFYMEmXAHw/fP4pIobFBBlUAea/xgTNmIN7GI6QLt8AHcJNgGRYDSsRfn
-8wxCT4KbwD+PxbDjKEqhawAkId6PwLz/woCXVTlVREG2Ll5wnWfVbvdLs35+VXjO
-UjH8BZNc5RAWMQIPTVZhyWgDP23NZb0j+7GLccMIAjYFXzq8rTLPfLrXDxCgY6c=
-=hM/1
+iQEcBAEBCAAGBQJUtAwBAAoJEOeBhlrCAAWGTSsIAKLUfFbd1kCkQodEkanLeD4E
+RYW8DPzXiDOloDWhKmAp0NikrxtHGmmnxVrDaoDdoq+Zevu6Hs/KqqGhw3j6Ezlq
+bDxsyr8fQX4fCCqyUS3zn2RXNcruU8x9rhbCY7vnYlex0tQEOIr7UfondAEJ8aJZ
+7We0xoxCFVDqpnp/uLMzWTwMQ5IwXmS9cV9NWDw9SBKPh3ltcfToPA+gTCeWUrjp
+HwlaFzUPI0LCtOl9uXbwZWlEHEndxQBvE4iI1I+bIyGhZwt2R1yiEg7y1J0ng+GS
+rD+qtkvAv9pJxxE9ZIgfy7H9V9aL5whjytDGUMZnNZCjgQnKZp9jbSYxtRshzUI=
+=tvAU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/openntpd-20080406-r9.ebuild b/net-misc/openntpd/openntpd-20080406-r9.ebuild
deleted file mode 100644
index 8c7381aed6d6..000000000000
--- a/net-misc/openntpd/openntpd-20080406-r9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r9.ebuild,v 1.4 2014/11/02 09:10:58 swift Exp $
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs systemd user
-
-MY_P="${P/-/_}p"
-DEB_VER="6"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-${DEB_VER}.debian.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ssl selinux"
-
-CDEPEND="ssl? ( dev-libs/openssl )
-	!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]"
-DEPEND="${CDEPEND}
-	virtual/yacc"
-RDEPEND="${CDEPEND}
-	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 flipng 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() {
-	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
-
-	epatch "${WORKDIR}"/debian/patches/*.patch
-	epatch "${FILESDIR}/${P}-pidfile.patch"
-	epatch "${FILESDIR}/${P}-signal.patch"
-	epatch "${FILESDIR}/${P}-dns-timeout.patch"
-	sed -i 's:debian:gentoo:g' ntpd.conf || die
-	eautoreconf # deb patchset touches .ac files and such
-}
-
-src_configure() {
-	econf \
-		--disable-strip \
-		$(use_with !ssl builtin-arc4random) \
-		AR="$(type -p $(tc-getAR))"
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/{var/empty,var}
-
-	newinitd "${FILESDIR}/${PN}.init.d-${PV}-r6" ntpd
-	newconfd "${FILESDIR}/${PN}.conf.d-${PV}-r6" ntpd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-${PV}-r4" ntpd.service
-}
-
-pkg_config() {
-	einfo "Setting up chroot for ntp in ${NTP_HOME}"
-	# remove localtime file from previous installations
-	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
-	mkdir -p "${EROOT%/}${NTP_HOME}"/etc
-	if ! ln "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime ; then
-		cp "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime || die
-		einfo "We could not create a hardlink from /etc/localtime to ${NTP_HOME}/etc/localtime,"
-		einfo "so please run 'emerge --config =${CATEGORY}/${PF}' whenever you changed"
-		einfo "your timezone."
-	fi
-	chown -R root:root "${EROOT%/}${NTP_HOME}" || die
-}
-
-pkg_postinst() {
-	pkg_config
-
-	[[ -f ${EROOT}var/log/ntpd.log ]] && \
-		ewarn "There is an orphaned logfile '${EROOT}var/log/ntpd.log', please remove it!"
-
-	# bug #226491, remove <=openntpd-20080406-r7 trash
-	rm -f "${EROOT%/}${NTP_HOME}"etc/localtime
-	rmdir "${EROOT%/}${NTP_HOME}"etc
-}
-
-pkg_postrm() {
-	# remove localtime file from previous installations
-	rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
-}
diff --git a/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild b/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
index 400237534662..bc042691392a 100644
--- a/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
+++ b/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild,v 1.1 2015/01/12 16:27:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild,v 1.2 2015/01/12 18:01:31 ottxor Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ssl selinux"
 
 CDEPEND="ssl? ( dev-libs/openssl )