summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-11 00:21:22 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-11 00:21:22 +0000
commit351aefb0eabfaf46d786a33dd3e39bdccba68ecf (patch)
treeadefd1c63b038986c85bb10a6b2011aaa77863c8 /net-misc
parentEAPI=2 version. fix the paths in the installed headers since we change the lo... (diff)
downloadhistorical-351aefb0eabfaf46d786a33dd3e39bdccba68ecf.tar.gz
historical-351aefb0eabfaf46d786a33dd3e39bdccba68ecf.tar.bz2
historical-351aefb0eabfaf46d786a33dd3e39bdccba68ecf.zip
Since the latest revision is already EAPI=2, instead of dying during setup phase, block ntp when the openntp USE flag for that is disabled (don't *depend* on it with it enabled, obviously).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openntpd/ChangeLog10
-rw-r--r--net-misc/openntpd/Manifest14
-rw-r--r--net-misc/openntpd/openntpd-3.9_p1-r2.ebuild11
3 files changed, 24 insertions, 11 deletions
diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 2e5dfb3cd648..ed6b19983bdf 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/openntpd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.43 2009/10/14 13:39:14 bangert Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.44 2010/01/11 00:21:22 flameeyes Exp $
+
+ 11 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ openntpd-3.9_p1-r2.ebuild:
+ Since the latest revision is already EAPI=2, instead of dying during setup
+ phase, block ntp when the openntp USE flag for that is disabled (don't
+ *depend* on it with it enabled, obviously).
14 Oct 2009; Thilo Bangert <bangert@gentoo.org>
files/openntpd.rc-3.9_p1-r2:
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 8a00ab79bc9c..4ef4180b9eec 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff 1279 RMD160 b5009b37267b053841b0d46a07ae2af994cd24ea SHA1 4fee3243fbb5abdaaf29c2359c1287882f7b49cb SHA256 97043f4a19468bc275326e6cd1b8aee8dfe6123746a8e857a5b1fa63f7f9a044
AUX openntpd.conf.d 181 RMD160 0cacb7e31ec0c04c99e9ba01dd82d0ec26b56b8f SHA1 dbf1ed92e8606bd95e579f77235f4d8b249a7081 SHA256 a1cb9dc8fbbaf6f439d6547bce9d59e86e7e13855b037d33bad1f789fb7050f3
AUX openntpd.conf.d-3.9_p1-r2 195 RMD160 8bdab3610793b9b83951584634e465d19dcdda54 SHA1 54ba4a7c2d592181ce38590c49a49768d7c424fa SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf12a73a3745b39322f75773a738
@@ -5,6 +8,13 @@ AUX openntpd.rc 971 RMD160 e021fa4ed389898954b213235daf3ca5473f198b SHA1 8240650
AUX openntpd.rc-3.9_p1-r2 1066 RMD160 3f000ed9fba2ba228e31dbfbc500f23bc9bdd40d SHA1 2e26c9b1da012f12355f7bfffeec37e1f962b7c7 SHA256 66d7fb656b7b3978b27cde92bf41a97f97e6f739ea5b1fb790da4f31c6d2c5c6
DIST openntpd-3.9p1.tar.gz 152700 RMD160 c348004116c78810daa9451f15abcc26788949a8 SHA1 098a435d02886a9e4d34afb15b15fde795eda1e9 SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49
EBUILD openntpd-3.9_p1-r1.ebuild 1325 RMD160 5eb7ac5fc7ed8b1ef96cffd5cde3ab907d4d5bda SHA1 64abd5d33dbb893442f42a851c45d90980d2bf2a SHA256 2a09bea3cd262a41d4e9b57bc65b0f17234d8fcd55d5de47cb9dfcc340325c76
-EBUILD openntpd-3.9_p1-r2.ebuild 1486 RMD160 507e25b5f8c0b7e0da7eeea9a5243a06a389f176 SHA1 f593419eac311e0fe882848e46cfef9040d877bf SHA256 27455abb6b949803d41cd709b15740b11b098a1caf5b38e11d810357362b785a
-MISC ChangeLog 5793 RMD160 9a6acff2456f9970286d69b931a308ec58c83391 SHA1 74878e900cae22a94584a0b80794acc240a33f9f SHA256 803c0bb4a712085c981e4084e8638fe54204e75c5d443d7a09a63e7738e251cd
+EBUILD openntpd-3.9_p1-r2.ebuild 1382 RMD160 adc9deeb85600cd8b749e88e2f168a36739afc01 SHA1 56de311ed01ee23707b9b5d9033cb2b43b2e78ac SHA256 acb7ef703d0eb48e0e3e4d5375838167f953af9ad62209247a4681084ee3c077
+MISC ChangeLog 6077 RMD160 55dec440e508486921aa508d52192ca88344ceb5 SHA1 65f328ef42c20906b4b599914ced8c1e1f5fee7a SHA256 42e03c9d2e3df69cf6de0b82f9bde6e4f3b3d1a01228821070fcc5e1f427ed04
MISC metadata.xml 507 RMD160 31dde8e6744b8a825bd8a763c149663785e7a267 SHA1 9aa7883d59456d95af5032a6b85547b65b74a439 SHA256 b4a289de60d0e1cdf33f8cd2ea669a6b8f1668ed0bb3adbbb79f155bd88a0e5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktKbwoACgkQAiZjviIA2XjUOQCg5/HoRrdUL14UTScfZ8i1KiXG
+mMsAoOiVtHOzMNvuEviFEWiCxOQ0CHH7
+=ja+C
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild b/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild
index a6413d823ed4..e62c628b7231 100644
--- a/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild
+++ b/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild,v 1.1 2009/10/14 08:04:18 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r2.ebuild,v 1.2 2010/01/11 00:21:22 flameeyes Exp $
EAPI="2"
@@ -18,7 +18,8 @@ IUSE="ssl selinux"
RDEPEND="ssl? ( dev-libs/openssl )
selinux? ( sec-policy/selinux-ntp )
- !<=net-misc/ntp-4.2.0-r2"
+ !<=net-misc/ntp-4.2.0-r2
+ !net-misc/ntp[-openntpd]"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
@@ -29,10 +30,6 @@ pkg_setup() {
#make sure user has correct HOME
usermod -d /var/lib/openntpd/chroot ntp
-
- if has_version net-misc/ntp && ! built_with_use net-misc/ntp openntpd ; then
- die "you need to emerge ntp with USE=openntpd"
- fi
}
src_prepare() {