Straight bump to fix bug in init.d script of /usr/bin call without 'need localmount', so startup failed sometimes.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 65 insertions, 5 deletions

diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 94e4419e582e..6de78ae0a3d8 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/adjtimex
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.22 2009/09/23 19:32:56 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.23 2010/03/25 19:28:46 robbat2 Exp $
+
+*adjtimex-1.20-r3 (25 Mar 2010)
+
+  25 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +adjtimex-1.20-r3.ebuild, files/adjtimex.init:
+  Straight bump to fix bug in init.d script of /usr/bin call without 'need
+  localmount', so startup failed sometimes.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> adjtimex-1.16.ebuild,
   adjtimex-1.16-r1.ebuild, adjtimex-1.20.ebuild, adjtimex-1.20-r1.ebuild,
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 36467159201c..b2b0bebe568c 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,7 +1,7 @@
 AUX adjtimex-1.16-pic.patch 315 RMD160 f1554dc83ff26b3c667a2a71e13b17d30485f019 SHA1 38e6eba7802486e482bac63b388bf8ff7d220958 SHA256 1dd729984de9852e3a2ac6f7a525cfb4a1c101c07b736fbf8e3a8ffa8d5c793c
 AUX adjtimex-1.20-fix-syscall.patch 404 RMD160 1d43ea4b75ed71e921399c9ad9a3e5e117098249 SHA1 e6a0025619a4494ec87c0cfe535c6abd20784aa0 SHA256 87911a16bd1762a914157f1637294753407b171e132948798ebb5f8a8b7792c0
 AUX adjtimex-1.20-gentoo-utc.patch 820 RMD160 be3e47073c19ece3a497cc0619842ceda2d5ad79 SHA1 d6a1092cd649fd66d0ca70ab240b543a1455b0a5 SHA256 eb9ab65184e5e7d450968651f76169321b841e1e95bef9211a575b9c5978df2d
-AUX adjtimex.init 733 RMD160 e1bbc62ebef78972cabbb767906abd44b9e39a35 SHA1 c96bce95c5073872b859f0e8623f274b9891000f SHA256 588235997e178a63aca1eb1a57e74a6e8d29a0bb68f2d0bf00d7ec61f3f299a8
+AUX adjtimex.init 750 RMD160 3883cef965d7af1bfe11fffd239c942f848d42fb SHA1 b2f2c079599fe406a377c72373a42f1ef97ebe6f SHA256 e686d4d2450b71f5d9a16b3a11ea5a39e202e45a475373abea9804082b75e793
 DIST adjtimex_1.16-1.diff.gz 31236 RMD160 2322f382c7560fd0337d451acf3da5b57309896e SHA1 e2986afaa0eafc7e73da0752f4440ddead175888 SHA256 026554c0a1baecb993f9ff8b8e4667fb076e84b34ed2218afc65e7dca4552a90
 DIST adjtimex_1.16.orig.tar.gz 66783 RMD160 dfb21f3c862bce3357815cc36ce9b127904aded4 SHA1 8bc9e486cc40a445b0c88fcb1f10d6e10ccda08d SHA256 12693b97098e138370424b09428ebe86ba7fb839f8839f69c25f3e7a1cb4b23f
 DIST adjtimex_1.20-3.diff.gz 37171 RMD160 9b680241a05770bb80be63a4691b2f4af320494c SHA1 f60ddba8eb7fc4f012c4c9e36300dac104e26ab3 SHA256 6ac20d5508170a41d1eb7664810649d23b0a216c9d26173188d6d3ec089f9de8
@@ -11,6 +11,7 @@ EBUILD adjtimex-1.16-r1.ebuild 1379 RMD160 3d631b3ce1bd13e59f4068cedd1cfd5b32b7d
 EBUILD adjtimex-1.16.ebuild 1174 RMD160 143f3c3410b4a02219355f6cc0b928d3cadedb29 SHA1 9b5da26a4ca97a37e9a72eab12ca74e830353f18 SHA256 f9c9eca60522ee4e7084026856cc71ed5517fed0068570ec511195b78b4da41f
 EBUILD adjtimex-1.20-r1.ebuild 1448 RMD160 e05138d92a588e6fd1c768a2070a4545953627e2 SHA1 c3882369bea47cb0c4546cad51a52c534adb2f77 SHA256 efc7b3de01a973a0ec96578ecf59954da98babf2b09d48f281dcef73d9325ef2
 EBUILD adjtimex-1.20-r2.ebuild 1493 RMD160 348a0c0c6cb2b843d991fff7142880988e6d3d23 SHA1 42a89c984dd30b71ffea09e88438c580d7cb2189 SHA256 8b4e5bc2cc9f883d4f20b5bfa4e58fd57821a8ccae0db173997d74ae707c216f
+EBUILD adjtimex-1.20-r3.ebuild 1493 RMD160 781822e528b18ae890b19367a216e4a78e7f39ef SHA1 dcf2bbe8c9758995e58b33ac2c22c4b9e10a1861 SHA256 a3a6533b3b9ef73488a014861c0590f75d16b28f6d205fc314d5a0e75e6b4fc2
 EBUILD adjtimex-1.20.ebuild 1377 RMD160 65f3f2a4b73992eeff19f45803e30de3bf576c30 SHA1 e6a2aba4b529a88b299e2477a8b0d89335a10bdc SHA256 05f811b296706843273d442b82ca1f4983b564fafa05e16a003454b87096440c
-MISC ChangeLog 3096 RMD160 b605293a427ee206e1e408a9609bc8faeec21b84 SHA1 128cab51bf332cf6588cf624c8a9a63393a709d4 SHA256 057945a3ebe70c29949a622a94e34ce60171d79436444191e0afe7e3aaaf5794
+MISC ChangeLog 3351 RMD160 00f25e5b87d06cf3a79a1b08d85cf2193fc84db2 SHA1 6799a8dac89a611780daf692048d69e032d38d99 SHA256 9186e6f2ad5ad545976443be6ab128b593232700b6015b6631a06613c1c64a14
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/net-misc/adjtimex/adjtimex-1.20-r3.ebuild b/net-misc/adjtimex/adjtimex-1.20-r3.ebuild
new file mode 100644
index 000000000000..cc5afc54e036
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.20-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.20-r3.ebuild,v 1.1 2010/03/25 19:28:46 robbat2 Exp $
+
+inherit fixheadtails eutils
+
+DEBIAN_PV="6"
+MY_P="${P/-/_}"
+DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
+DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.diff.gz"
+DEBIAN_SRC="${MY_P}.orig.tar.gz"
+DESCRIPTION="display or set the kernel time variables"
+HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
+SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND} sys-apps/sed"
+
+src_unpack() {
+	unpack ${DEBIAN_SRC}
+	epatch ${DISTDIR}/${DEBIAN_PATCH}
+	cd ${S}
+	for i in debian/adjtimexconfig debian/adjtimexconfig.8 ; do
+		sed -e 's|/etc/default/adjtimex|/etc/conf.d/adjtimex|' \
+			-i.orig ${i}
+		sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \
+			-i.orig ${i}
+	done
+	epatch ${FILESDIR}/${PN}-1.20-gentoo-utc.patch
+	ht_fix_file debian/adjtimexconfig
+	sed -e '/CFLAGS = -Wall -t/,/endif/d' -i Makefile.in
+	epatch ${FILESDIR}/${PN}-1.16-pic.patch
+	epatch ${FILESDIR}/${PN}-1.20-fix-syscall.patch
+}
+
+src_install() {
+	dodoc README* ChangeLog
+	doman adjtimex.8 debian/adjtimexconfig.8
+	dosbin adjtimex debian/adjtimexconfig
+	newinitd ${FILESDIR}/adjtimex.init adjtimex
+}
+
+pkg_postinst() {
+	einfo "Please run adjtimexconfig to create the configuration file"
+}
diff --git a/net-misc/adjtimex/files/adjtimex.init b/net-misc/adjtimex/files/adjtimex.init
index 50c90a53eda3..fd99138e962a 100644
--- a/net-misc/adjtimex/files/adjtimex.init
+++ b/net-misc/adjtimex/files/adjtimex.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/files/adjtimex.init,v 1.4 2008/09/14 05:03:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/files/adjtimex.init,v 1.5 2010/03/25 19:28:47 robbat2 Exp $
 
 DAEMON=adjtimex
 OPTS="--tick ${TICK} --frequency ${FREQ}"
@@ -9,6 +9,7 @@ CONFD="/etc/conf.d/${DAEMON}"
 
 depend() {
 	before ntp-client ntpd
+	need localmount
 }
 
 checkconfig() {