Fix bug 335159. Thanks Kevin Pyle and Michael Mair-Keimberger. Clean out cruft.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

5 files changed, 58 insertions, 81 deletions

diff --git a/net-misc/rdate/ChangeLog b/net-misc/rdate/ChangeLog
index 302280444f16..cc020fa43518 100644
--- a/net-misc/rdate/ChangeLog
+++ b/net-misc/rdate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdate
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/ChangeLog,v 1.50 2011/04/24 04:17:43 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/ChangeLog,v 1.51 2013/03/02 18:17:11 titanofold Exp $
+
+*rdate-1.4-r4 (02 Mar 2013)
+
+  02 Mar 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/rdate-initd-1.4-r2, +rdate-1.4-r4.ebuild, -files/rdate-initd:
+  Fix bug 335159. Thanks Kevin Pyle and Michael Mair-Keimberger. Clean out
+  cruft.
 
   24 Apr 2011; Mike Frysinger <vapier@gentoo.org> rdate-1.4-r3.ebuild:
   Respect env build settings.
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 811ed94a7e59..8be9d63a641d 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rdate-confd 617 RMD160 0bf0ef6eb816a71ecb31126aa3ce3e7812a16313 SHA1 fda784d7028e50cda02e015127a94e1941764d83 SHA256 752cc6705a3c9fd6e85e00965d55d4ce36cb5a30b14456503ccd6be1797726ec
-AUX rdate-initd 837 RMD160 e2e33bcf07a84ab9a0227f928e5bf02175b902b6 SHA1 532d46415bc69a2674918dfa0ed2008337ab6037 SHA256 217bd1e2e23e31d860796168f4d29b4411501b24377f065c56ad3e13efa4dec0
-AUX rdate-initd-1.4-r2 707 RMD160 eaa1b83c075d05061419f16fadbcedb42bd23512 SHA1 231863210f730b21e88d5d5cfe4d8a1ba0112134 SHA256 dd8c40e2af527cec8b23fdf7f88490242661db3e26012124d5ad27158db49309
-AUX rdate-initd-1.4-r3 639 RMD160 d2911de431699f500ba5ef84d09a0907df965a55 SHA1 4c1d1c9b4f4c0a5da10fc2d07716f30898ac39c1 SHA256 64947ef6add9817eefcfc37967d0f1bc757461645ebe180e9da68396222772a8
-DIST rdate-1.4.tar.gz 11500 RMD160 13cfa099f6c36c589cea8325d64cce85578dfa07 SHA1 bad85e74a1523f8548105d7700ed63e9886b9979 SHA256 c8b4a026fa13f22bffe96fe0800b6ac67de72e9f62dfe5b74f1910a9179da4ee
-EBUILD rdate-1.4-r3.ebuild 858 RMD160 3a7bbe5997558100136c8d64ba4833f18f01cbd2 SHA1 74d909c18943eec9902d29493dfb6b8aa9e2474e SHA256 2223a18421d46d33bc52e277717621711dfdf673cec7d1b747674ec2ee020c52
-MISC ChangeLog 6879 RMD160 a289fdd7a460e9512475fc7b2d59701be8df261e SHA1 a35bbff03c1f42a2c3d81c828908869bb62c6a93 SHA256 c1b63b91707c665019a18009cbe8d1d5c143a8c5c89b7f31ee6c0e4fc174524f
-MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
+AUX rdate-confd 617 SHA256 752cc6705a3c9fd6e85e00965d55d4ce36cb5a30b14456503ccd6be1797726ec SHA512 4ed69ca7883539c15423661d63d55a7255a1fb52110b43414ec280d00651c047cf81fb6d5306291c287d586cbd1dc14494cfe071e52a67c6c1da1271aff9f73d WHIRLPOOL 921a8f79addeacc15a0cba9d139b82bf277e3c940d89adc1c63eda5215a031638e1b18e21b53dfaf590c693c5f79afc1aa1bb2e6f629125ed0459c35d0d1bac1
+AUX rdate-initd-1.4-r3 639 SHA256 64947ef6add9817eefcfc37967d0f1bc757461645ebe180e9da68396222772a8 SHA512 c0c9820fa46cf8094aa97515aeeb77c6ccfee04f1224d0a27e3e2879230a15e65699356f9a454f4c6fd3522f0a389c47a31fbf7eedc4bea2156e43f3578fbf17 WHIRLPOOL 9d4d1790c0a8f0e7998336a31b69c64fd1a5993b42733fceedc746577c7d8ed734ba067e62ac3b9681af137da151ca5a8d823b6a6ee498512a23ab6dccf0b763
+DIST rdate-1.4.tar.gz 11500 SHA256 c8b4a026fa13f22bffe96fe0800b6ac67de72e9f62dfe5b74f1910a9179da4ee SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996 WHIRLPOOL 31f048ebaeabde6776beae972d44e2454b1903563939e8a233f5ceb8d9c04f082bae01d390854b060a52cfa19bc82d9caa93bf5c79b9343b7f9283806ac7e8bd
+EBUILD rdate-1.4-r3.ebuild 858 SHA256 2223a18421d46d33bc52e277717621711dfdf673cec7d1b747674ec2ee020c52 SHA512 d60a0ba47427536e9ac2e3e3620f209c8e2376d7ebf710738d1ce3bc56f65364d647ec294272108781d68126bd67a3d89bb01ef66f3f55b8a968e892e07ed971 WHIRLPOOL aa5a7015d22380c7c9f792081a9fa93fa9bc2042ddb0cb54547943cb06ef81655a5162dcb825c4e675d19b47497c48ce955872bb5dcba280905657ee07aee8d6
+EBUILD rdate-1.4-r4.ebuild 928 SHA256 063a3543e1d577a2fd1a5bafdcbe6258e9670eb684c22af98fd0a0960a7a0e26 SHA512 ef9c5535eacd4a4fc3877d007d461e44bff1037a729e7db242f3478b8f9cc3f1d15c8e9533ad8e4f54574488dcb04e2a47a8138af87a1ae4b5c580a5de2af5c5 WHIRLPOOL af545d4815f56f6c9b1ad678e09ef7b27baeb2be3bde23ee57a84258624e9b67922e004d23115c985484ce07e6a877436509476b4f8831ab53733211a15075da
+MISC ChangeLog 7124 SHA256 37d626c6f27d1c03b3da8bc452c12d37f6827c9fbbb272851a0a884841318165 SHA512 c7137837b0721fc3f5a59a06e71e29776550883e9bb2a67505cf3132d83e143f0c7515c9132bc3a993600c1cc21f0b9a0e654d8cdacdc97a8f97bce8f97f8639 WHIRLPOOL bb8158ce6a30de01b1054a180b2527840f2facbad98be42a4a6469ffc0f58a952a053231e676370f30ee3ab3b4ccadb558a695907d4986f74666867703210cbd
+MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRUACgkQfXuS5UK5QB2P4gQAjxYfZ29uZ/TWAeopGiCMhjuX
-rlVwP8T2kLeOOMIfZE2c5px2iwRGYiXvsUb8iuCz5crnbiAv+Yb7lURN991oeZ8e
-KwsOy1TWM/NrbGfMoKFYeovlmMATbCX3D/LZqCdjfSVFrn8eYB4NCa9cvaOgRHQE
-HAtIc8G46b8uporxlh4=
-=4n4F
+iF4EAREIAAYFAlEyQiwACgkQVxOqA9G7/aBlGAD9FefVOReie2xrLZiHs0oa6CJy
+G4PWlKoHc4m2TUApGXoA/3n/rgCuYJQOawkibqrv4D8CM0jTp+hIrZxTVDSU2Kwe
+=bxOY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rdate/files/rdate-initd b/net-misc/rdate/files/rdate-initd
deleted file mode 100644
index 6b96bbc30c6f..000000000000
--- a/net-misc/rdate/files/rdate-initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-initd,v 1.1 2005/05/17 21:19:07 robbat2 Exp $
-
-depend() {
-	before cron
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ -z "${RDATE_SERVER}" ] ; then
-		eerror "Please edit /etc/conf.d/rdate"
-		eerror "I need to know what server to use!"
-		return 1
-	fi
-	if [ -z "${RDATE_OPTS}" ] ; then
-		eerror "Please edit /etc/conf.d/rdate"
-		eerror "I need to know what options to use!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Setting clock via rdate"
-	/usr/bin/rdate -s ${RDATE_OPTS} ${RDATE_SERVER} >/dev/null &
-	local pid=$!
-	(sleep ${RDATE_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
-	wait ${pid}
-	eend $? "Failed to set clock"
-}
diff --git a/net-misc/rdate/files/rdate-initd-1.4-r2 b/net-misc/rdate/files/rdate-initd-1.4-r2
deleted file mode 100644
index 0805eadd9a3c..000000000000
--- a/net-misc/rdate/files/rdate-initd-1.4-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-initd-1.4-r2,v 1.1 2006/11/13 10:38:19 robbat2 Exp $
-
-depend() {
-	before cron
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ -z "${RDATE_SERVER}" ] ; then
-		eerror "Please edit /etc/conf.d/rdate"
-		eerror "I need to know what server to use!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Setting clock via rdate"
-	/usr/bin/rdate -s ${RDATE_OPTS} ${RDATE_SERVER} >/dev/null &
-	local pid=$!
-	(sleep ${RDATE_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
-	wait ${pid}
-	eend $? "Failed to set clock"
-}
diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild
new file mode 100644
index 000000000000..7879e7cd8498
--- /dev/null
+++ b/net-misc/rdate/rdate-1.4-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-1.4-r4.ebuild,v 1.1 2013/03/02 18:17:11 titanofold Exp $
+
+EAPI="5"
+
+inherit flag-o-matic
+
+DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
+SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS=/d' \
+		-e '/^rdate: /,+1d' \
+		-e '/\tinstall/s:\([^ ]\+\)$:$(DESTDIR)&:' \
+		Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use ipv6 && append-cppflags "-DINET6"
+	tc-export CC
+	emake
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}