Bump debian patch version. Bug #98934, use --utc where needed.

(Portage version: 2.1_pre6-r7)

6 files changed, 121 insertions, 5 deletions

diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index ae1a169041f3..5876df8794da 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/adjtimex
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.12 2005/12/03 23:19:13 robbat2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.13 2006/03/26 00:50:17 robbat2 Exp $
+
+*adjtimex-1.20-r1 (26 Mar 2006)
+
+  26 Mar 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/adjtimex-1.20-gentoo-utc.patch, files/adjtimex.init,
+  +adjtimex-1.20-r1.ebuild:
+  Bump debian patch version. Bug #98934, use --utc where needed.
 
 *adjtimex-1.20 (03 Dec 2005)
 
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 2d5b5e3b8733..60537c29c547 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,10 +1,39 @@
 MD5 d6d9ba1b822346c1523eb872133a6c7b ChangeLog 1540
+RMD160 982bc2d0dbc91e87d627ea6a1884c960fbd3c2f4 ChangeLog 1540
+SHA256 8d744527ceb8e8f76330f554491cb27aaf2e36864a326d1e7480b790bc1d7982 ChangeLog 1540
 MD5 d2831b58771c94ba5c8472346576af42 adjtimex-1.16-r1.ebuild 1410
+RMD160 e9d12edbc0bff888c416a72edcfd1e573c7d430b adjtimex-1.16-r1.ebuild 1410
+SHA256 8518541a7fbedfd91d1acd1e62d9ffc5ae538317984da309121183b553a9241b adjtimex-1.16-r1.ebuild 1410
 MD5 b4005173a2d5d68d4a04503503663674 adjtimex-1.16.ebuild 1205
+RMD160 aa8a6cdebfaf4ab8971b8e5727d61723aabc4188 adjtimex-1.16.ebuild 1205
+SHA256 cf15a35be22c4b1c4365399e004c4f6a6204bdf293ee2b278d856eb547f0ef1b adjtimex-1.16.ebuild 1205
+MD5 edf42961f469a484130fd8be1052abe7 adjtimex-1.20-r1.ebuild 1476
+RMD160 95ec66d2dd15295658cee0094ed8d8e80da48fc3 adjtimex-1.20-r1.ebuild 1476
+SHA256 ef9ca2791c908f9f71fb2a1cb7a5d2ae86132e7e918736c286e3f129213d3136 adjtimex-1.20-r1.ebuild 1476
 MD5 b081642c0c04753b6eb6d26a01a14fdb adjtimex-1.20.ebuild 1408
+RMD160 79fb26f036b7f150983b37cb4f5867e2719b7821 adjtimex-1.20.ebuild 1408
+SHA256 5be2a47eeb064b7d0068119afb2b6a2729197c8e301bf917d612832281fc794f adjtimex-1.20.ebuild 1408
 MD5 a7a3b52817fb5f425852e1cbc523b485 files/adjtimex-1.16-pic.patch 315
-MD5 644aa729406bc03a2df4f6dc23da298f files/adjtimex.init 687
+RMD160 f1554dc83ff26b3c667a2a71e13b17d30485f019 files/adjtimex-1.16-pic.patch 315
+SHA256 1dd729984de9852e3a2ac6f7a525cfb4a1c101c07b736fbf8e3a8ffa8d5c793c files/adjtimex-1.16-pic.patch 315
+MD5 1fb28900109030b90537a9bc71e5a849 files/adjtimex-1.20-gentoo-utc.patch 820
+RMD160 be3e47073c19ece3a497cc0619842ceda2d5ad79 files/adjtimex-1.20-gentoo-utc.patch 820
+SHA256 eb9ab65184e5e7d450968651f76169321b841e1e95bef9211a575b9c5978df2d files/adjtimex-1.20-gentoo-utc.patch 820
+MD5 180423f52fd903b0de12226ff1736e9d files/adjtimex.init 685
+RMD160 c7615cbb112e2ec8c5839f66ce7ab9a7002db052 files/adjtimex.init 685
+SHA256 e2c6acb89ce02d08465deb60e4ba038adb4fdaec974ebc53eca12296747f69d1 files/adjtimex.init 685
 MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16 136
+RMD160 4c01ab9255b2cd339f19965e44facb54de27ee96 files/digest-adjtimex-1.16 136
+SHA256 e8bd210190cc724c2fc73f71dafc36b0d48380a0b2114c12ed30612e609c3322 files/digest-adjtimex-1.16 136
 MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16-r1 136
+RMD160 4c01ab9255b2cd339f19965e44facb54de27ee96 files/digest-adjtimex-1.16-r1 136
+SHA256 e8bd210190cc724c2fc73f71dafc36b0d48380a0b2114c12ed30612e609c3322 files/digest-adjtimex-1.16-r1 136
 MD5 9192569c9db0abd28feec76c7ae46944 files/digest-adjtimex-1.20 136
+RMD160 00e7186828159d95395b454effca1c0e823c7998 files/digest-adjtimex-1.20 136
+SHA256 d4cf2828d6182ff235325ad7d3a36964ca7267589aebf7c8f044cada80a12f10 files/digest-adjtimex-1.20 136
+MD5 b87712920ef805dd94c6eba0b699ad15 files/digest-adjtimex-1.20-r1 500
+RMD160 fd851d539dc14199d1141c5103f6c799f342fa3f files/digest-adjtimex-1.20-r1 500
+SHA256 a0a2b83f14f59be8bd2091e5b1c9d156676643a2082f407a2b27d04861603e4a files/digest-adjtimex-1.20-r1 500
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
+SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
diff --git a/net-misc/adjtimex/adjtimex-1.20-r1.ebuild b/net-misc/adjtimex/adjtimex-1.20-r1.ebuild
new file mode 100644
index 000000000000..9d5b0a48b910
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.20-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.20-r1.ebuild,v 1.1 2006/03/26 00:50:17 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="virtual/libc"
+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
+}
+
+src_install() {
+	dodoc README* ChangeLog
+	doman adjtimex.8 debian/adjtimexconfig.8
+	dosbin adjtimex debian/adjtimexconfig
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/adjtimex.init adjtimex
+}
+
+pkg_postinst() {
+	einfo "Please run adjtimexconfig to create the configuration file"
+}
diff --git a/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch
new file mode 100644
index 000000000000..de72c320d0e0
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch
@@ -0,0 +1,23 @@
+--- adjtimex-1.20/debian/adjtimexconfig	2006-03-25 16:38:26.817571030 -0800
++++ adjtimex-1.20/debian/adjtimexconfig.new	2006-03-25 16:40:57.028173528 -0800
+@@ -3,6 +3,11 @@
+ conffile=/etc/conf.d/adjtimex
+ startfile=/etc/init.d/adjtimex
+ 
++# Get UTC setting
++source /etc/conf.d/clock
++params=''
++[ "$CLOCK" == "UTC" ] && params='--utc'
++
+ echo -n "Comparing clocks (this will take 70 sec)..."
+ 
+ # Get the parameters
+@@ -11,7 +16,7 @@
+ baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
+ hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
+ /usr/sbin/adjtimex  --tick $baseline  --frequency 0
+-/usr/sbin/adjtimex  --adjust  >/etc/adj.adjust
++/usr/sbin/adjtimex  ${params} --adjust  >/etc/adj.adjust
+ echo "done."
+ ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
+ freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`
diff --git a/net-misc/adjtimex/files/adjtimex.init b/net-misc/adjtimex/files/adjtimex.init
index 3cab4713a0f0..7b6b0a86d017 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.2 2004/07/14 23:53:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/files/adjtimex.init,v 1.3 2006/03/26 00:50:17 robbat2 Exp $
 
 DAEMON=adjtimex
 OPTS="--tick ${TICK} --frequency ${FREQ}"
@@ -10,7 +10,7 @@ CONFD="/etc/conf.d/${DAEMON}"
 checkconfig() {
     if [ ! -f "${CONFD}" ]; then
         eerror "Configuration file not found!"
-        eerror "You should run adjtimexconfig to create it."
+        eerror "You must run adjtimexconfig to create it."
         return 1
     fi
 }
diff --git a/net-misc/adjtimex/files/digest-adjtimex-1.20-r1 b/net-misc/adjtimex/files/digest-adjtimex-1.20-r1
new file mode 100644
index 000000000000..e12ad48a0431
--- /dev/null
+++ b/net-misc/adjtimex/files/digest-adjtimex-1.20-r1
@@ -0,0 +1,6 @@
+MD5 07d6ceeea76e6bda8be82f79f51e64cb adjtimex_1.20-6.diff.gz 41386
+RMD160 4eadc992d525f624007c4ccacdf7b744d09924e5 adjtimex_1.20-6.diff.gz 41386
+SHA256 f405c4126cd6ef42dd1d1c3f21c4827e388b8637737dd2ffe0b000db55050579 adjtimex_1.20-6.diff.gz 41386
+MD5 00b56c266e707b8c753dfe1d33745226 adjtimex_1.20.orig.tar.gz 53923
+RMD160 44f6dd62e9fbf7ee4237d21d79dfd32a7a6c7027 adjtimex_1.20.orig.tar.gz 53923
+SHA256 3ca9119e3497554c0170aba234aa752535f741e383fb35775caab11c088a1415 adjtimex_1.20.orig.tar.gz 53923