touchups

Package-Manager: portage-2.1_rc2-r3

3 files changed, 50 insertions, 30 deletions

diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 9b7b81db6e30..6de759fcfa75 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,24 +1,42 @@
-MD5 ec1040e32fb394f4666c480ad75fc4c8 ChangeLog 3181
-RMD160 4617ef16d4e0a52a02bd50ebf0c6c0c6d8a48d35 ChangeLog 3181
-SHA256 b32ad84d49f0af0909e5b74ffa2356a308ae01286c9248291efae1aaca498783 ChangeLog 3181
-MD5 0a8feb6a7e073e64c6efb82188d6007d files/digest-htpdate-0.9.0 238
-RMD160 6a7d77c7edb54d23cb7519ca445bbd44a8d00454 files/digest-htpdate-0.9.0 238
-SHA256 59bfdf92e850eee613183f28930ed8aa04bd8c6e56f0ff833bc8e3e9c48d9302 files/digest-htpdate-0.9.0 238
-MD5 6d38dc8a7fc38b9949bc745c5e0e199b files/digest-htpdate-0.9.1-r1 238
-RMD160 1eae51fab5f2a887c0d3cc5fda794d1d2839b5b2 files/digest-htpdate-0.9.1-r1 238
-SHA256 09473df0699c396292e78f99a47a033e63e838650ce5f89c46864bc4eef4603a files/digest-htpdate-0.9.1-r1 238
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX htpdate.conf 356 RMD160 c965b479e4fd40b2dd572a02578499f101e44d56 SHA1 6324f31beb84c829df775b7909e78d864041944c SHA256 b09ba6abc1a7eec4423aa89468d4887b994ebc4e84cc55ba938ae26ea71084a2
 MD5 d76b66afc8c4bce8a68ff163fb28f59c files/htpdate.conf 356
 RMD160 c965b479e4fd40b2dd572a02578499f101e44d56 files/htpdate.conf 356
 SHA256 b09ba6abc1a7eec4423aa89468d4887b994ebc4e84cc55ba938ae26ea71084a2 files/htpdate.conf 356
-MD5 b7ec80c98a548a101b0bb1f702662225 files/htpdate.init 800
-RMD160 63b0e469069e86b4afca6c6012a50deab1300567 files/htpdate.init 800
-SHA256 a88fe72b6dd62cf8287e31fcdd8be15449c636bd6469455b7cf2f9d81a96247e files/htpdate.init 800
+AUX htpdate.init 755 RMD160 ed76b8e96a87b037f781b7c588acb87cb180f10b SHA1 31573166ffe316de1402e7025fb72d149513b286 SHA256 76a3af3cb5838987fd7e6389334053fa67e26371945ea54c1d695a71bc85beb2
+MD5 9c1ad47c5426b66deec0f19eb1ffbc5c files/htpdate.init 755
+RMD160 ed76b8e96a87b037f781b7c588acb87cb180f10b files/htpdate.init 755
+SHA256 76a3af3cb5838987fd7e6389334053fa67e26371945ea54c1d695a71bc85beb2 files/htpdate.init 755
+DIST htpdate-0.9.0.tar.gz 12988 RMD160 4afbe58bc9b7dfb8d4132a7b928412017bb23c82 SHA256 53a32f901c99eafa5e3c4d1c30f6e220194be1054a92378d2305bea158137585
+DIST htpdate-0.9.1.tar.gz 13486 RMD160 74e977d55346b766e14e73a3e1216d1fc2a275da SHA256 7a87514f7c053789a06476668ff1d6c284098a901887812912f6347bb12ec9af
+EBUILD htpdate-0.9.0.ebuild 736 RMD160 f7b014cb7de7e5e1a9f30b33e35d7887eddef5c4 SHA1 eaee3e805376995ee7ad122f6f12cc2fb67de7dc SHA256 9ceb3ebc8212db358b6070e2afa77f24498902e2e1456aad147e1fd9b63e2591
 MD5 ad0f2624dee3271c651e577d5670ece2 htpdate-0.9.0.ebuild 736
 RMD160 f7b014cb7de7e5e1a9f30b33e35d7887eddef5c4 htpdate-0.9.0.ebuild 736
 SHA256 9ceb3ebc8212db358b6070e2afa77f24498902e2e1456aad147e1fd9b63e2591 htpdate-0.9.0.ebuild 736
-MD5 9dbe8a54a737327183416baeff4c4a70 htpdate-0.9.1-r1.ebuild 971
-RMD160 90613d0342fa2d96b814daaf09062de54e1bc173 htpdate-0.9.1-r1.ebuild 971
-SHA256 d2aa9a7e2bb09cafc6633fc2f7a224f84d8dcd99ac5c76f36098f68cbf01183a htpdate-0.9.1-r1.ebuild 971
+EBUILD htpdate-0.9.1-r1.ebuild 991 RMD160 732d3bc566b4f26da1774915990cb961283cb8c1 SHA1 12fb427f3808bd76f1981e00d488f4fd9748f36a SHA256 d6e3559e9c3e08f6ba34d04671e67ceb5222988cc129b33fd45892120ca35e14
+MD5 3f4a474fb96eb119cd8a200e8d547c59 htpdate-0.9.1-r1.ebuild 991
+RMD160 732d3bc566b4f26da1774915990cb961283cb8c1 htpdate-0.9.1-r1.ebuild 991
+SHA256 d6e3559e9c3e08f6ba34d04671e67ceb5222988cc129b33fd45892120ca35e14 htpdate-0.9.1-r1.ebuild 991
+MISC ChangeLog 3181 RMD160 4617ef16d4e0a52a02bd50ebf0c6c0c6d8a48d35 SHA1 014a3544e77e7a0a782d480eb8e35c24c98ed222 SHA256 b32ad84d49f0af0909e5b74ffa2356a308ae01286c9248291efae1aaca498783
+MD5 ec1040e32fb394f4666c480ad75fc4c8 ChangeLog 3181
+RMD160 4617ef16d4e0a52a02bd50ebf0c6c0c6d8a48d35 ChangeLog 3181
+SHA256 b32ad84d49f0af0909e5b74ffa2356a308ae01286c9248291efae1aaca498783 ChangeLog 3181
+MISC metadata.xml 256 RMD160 7ba7e5dfce95b75377cf4a30745dcc4dbde95086 SHA1 f94dd3063baa0db02c98317f36dc243ffd2bbb50 SHA256 f4325cb611d6c7b7e2f87f8c89d325eb086df309605b53de578d6f8bc62b07ae
 MD5 ff2b63df63e17d0b2714390e4c9ff1e1 metadata.xml 256
 RMD160 7ba7e5dfce95b75377cf4a30745dcc4dbde95086 metadata.xml 256
 SHA256 f4325cb611d6c7b7e2f87f8c89d325eb086df309605b53de578d6f8bc62b07ae metadata.xml 256
+MD5 0a8feb6a7e073e64c6efb82188d6007d files/digest-htpdate-0.9.0 238
+RMD160 6a7d77c7edb54d23cb7519ca445bbd44a8d00454 files/digest-htpdate-0.9.0 238
+SHA256 59bfdf92e850eee613183f28930ed8aa04bd8c6e56f0ff833bc8e3e9c48d9302 files/digest-htpdate-0.9.0 238
+MD5 6d38dc8a7fc38b9949bc745c5e0e199b files/digest-htpdate-0.9.1-r1 238
+RMD160 1eae51fab5f2a887c0d3cc5fda794d1d2839b5b2 files/digest-htpdate-0.9.1-r1 238
+SHA256 09473df0699c396292e78f99a47a033e63e838650ce5f89c46864bc4eef4603a files/digest-htpdate-0.9.1-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEdxgP2+ySkm8kpY0RAiS/AJ47lOX5bu1QlSD3ZLWPULX4ny5SvgCfVkyP
+LQ+lI0/AwEyw4aVhTDI95o8=
+=Fpt2
+-----END PGP SIGNATURE-----
diff --git a/net-misc/htpdate/files/htpdate.init b/net-misc/htpdate/files/htpdate.init
index b40e83596b2e..c4b0418fe6c6 100644
--- a/net-misc/htpdate/files/htpdate.init
+++ b/net-misc/htpdate/files/htpdate.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/files/htpdate.init,v 1.1 2006/04/09 05:50:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/files/htpdate.init,v 1.2 2006/05/26 14:57:28 vapier Exp $
 
 depend() {
 	need net
@@ -9,23 +9,24 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -n "${SERVERS}" ] ; then
-                eerror "You need to set at least one http server to use in /etc/conf.d/htpdate"
+	if [[ -z ${SERVERS} ]] ; then
+		eerror "You need to set at least one http server to use in /etc/conf.d/htpdate"
 		return 1
-        fi
+	fi
 }
 
 start() {
 	checkconfig || return 1
 	ebegin "Starting htpdate"
-	start-stop-daemon --quiet --start --pidfile /var/run/htpdate.pid --exec /usr/sbin/htpdate \
-	-- -D ${HTPDATE_OPTS} ${PROXY} ${SERVERS}
+	start-stop-daemon \
+		--quiet --start --pidfile /var/run/htpdate.pid \
+		--exec /usr/sbin/htpdate \
+			-- -D ${HTPDATE_OPTS} ${PROXY} ${SERVERS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping htpdate"
 	start-stop-daemon --stop --quiet --pidfile /var/run/htpdate.pid
-	rm -f /var/run/htpdate.pid
 	eend $?
 }
diff --git a/net-misc/htpdate/htpdate-0.9.1-r1.ebuild b/net-misc/htpdate/htpdate-0.9.1-r1.ebuild
index f38dee159e10..b8acf1f4a295 100644
--- a/net-misc/htpdate/htpdate-0.9.1-r1.ebuild
+++ b/net-misc/htpdate/htpdate-0.9.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-0.9.1-r1.ebuild,v 1.1 2006/04/09 05:50:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-0.9.1-r1.ebuild,v 1.2 2006/05/26 14:57:28 vapier Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
 HOMEPAGE="http://www.clevervest.com/htp/"
@@ -19,19 +19,20 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	gunzip htpdate.8.gz || die
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
 }
 
-src_install () {
+src_install() {
 	dosbin htpdate || die
-	doman htpdate.8.gz || die
-	dodoc README Changelog || die
+	doman htpdate.8
+	dodoc README Changelog
 
-	newconfd ${FILESDIR}/htpdate.conf htpdate
-	newinitd ${FILESDIR}/htpdate.init htpdate
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init htpdate
 }
 
 pkg_postinst() {