Version bump. Respect LDFLAGS (bug #334677). Respect CC.

Package-Manager: portage-2.2_rc69/cvs/Linux i686

4 files changed, 96 insertions, 2 deletions

diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 997668eca627..fe2d8c383770 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/adjtimex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.24 2010/03/25 19:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.25 2010/08/26 20:41:52 jer Exp $
+
+*adjtimex-1.29 (26 Aug 2010)
+
+  26 Aug 2010; Jeroen Roovers <jer@gentoo.org> +adjtimex-1.29.ebuild,
+  +files/adjtimex-1.29-gentoo-utc.patch:
+  Version bump. Respect LDFLAGS (bug #334677). Respect CC.
 
   25 Mar 2010; Robin H. Johnson <robbat2@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 9e2e1a1cbbe2..8f90ae076dc4 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,9 +1,13 @@
 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-1.29-gentoo-utc.patch 748 RMD160 7089eb035f8c785f47c4c96118b75466a9bf5244 SHA1 b6f6b6d23df91cfcb34680ed6d8f1827bb0cad33 SHA256 2a16ca8e20e70e15c6dea5c286412fd005a5a2d4a1216d4cf815459396c26bdd
 AUX adjtimex.init 750 RMD160 3883cef965d7af1bfe11fffd239c942f848d42fb SHA1 b2f2c079599fe406a377c72373a42f1ef97ebe6f SHA256 e686d4d2450b71f5d9a16b3a11ea5a39e202e45a475373abea9804082b75e793
 DIST adjtimex_1.20-6.diff.gz 41386 RMD160 4eadc992d525f624007c4ccacdf7b744d09924e5 SHA1 f6dbc973866a50aa06e10f44c0347fa50b7ea634 SHA256 f405c4126cd6ef42dd1d1c3f21c4827e388b8637737dd2ffe0b000db55050579
 DIST adjtimex_1.20.orig.tar.gz 53923 RMD160 44f6dd62e9fbf7ee4237d21d79dfd32a7a6c7027 SHA1 2f869c8ffb72cb89421288058c7c1cac6e193a15 SHA256 3ca9119e3497554c0170aba234aa752535f741e383fb35775caab11c088a1415
+DIST adjtimex_1.29-2.diff.gz 51735 RMD160 d329d28c879f097f51589ed536fa95912df7d588 SHA1 abe509d6e6648edeabf03cd1d2aa9f3f49010190 SHA256 54293c8aff704a8077b4d0ec31e8a21cf8de93e145e0e8644ec91e132da6e577
+DIST adjtimex_1.29.orig.tar.gz 85551 RMD160 3beaf077e4ca1b6f5b6611679ef48ab04eda70a1 SHA1 6487bf55378008c3739eed892f2783502114ed15 SHA256 04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a
 EBUILD adjtimex-1.20-r3.ebuild 1505 RMD160 bd8980de6f7302a1d5b772fba8d3fe8961d708c5 SHA1 d30bf7567388fd43f47e7cec6a02836013626695 SHA256 d06e17a209051518fd9360f6b1ae2e96de3861381de14a5b96bfa5e80a7217e9
-MISC ChangeLog 3596 RMD160 56454d99e12d70771f1db66acb5cc9a78503008b SHA1 6bd72a83cfeb61d418a6835ddecdb94d71980d75 SHA256 3b8685ad50accb4aacb3fa225851fcdaaedef1a72a97072aa5dcaa81db35e8bf
+EBUILD adjtimex-1.29.ebuild 1630 RMD160 63178768badf37a9acb7d8f818cca545ef17415b SHA1 6abd18c440fe9d9d4ff1c6364ae43d5c5723c3fb SHA256 3e9f2141f4098f1ca2810a66444e8cb62c34cb2f5d910c8bfb0b834c4ecaa8a4
+MISC ChangeLog 3793 RMD160 f79459a53b4b407854f871e08e543c3aafb539aa SHA1 56bf01fc3c7fe25acece31c8f2344d0d2fba77d8 SHA256 90c9ed29272d9752cadb3b7bb83408527ba82410cc043cf67a1968ac6c3a82a7
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/net-misc/adjtimex/adjtimex-1.29.ebuild b/net-misc/adjtimex/adjtimex-1.29.ebuild
new file mode 100644
index 000000000000..35cd551af5c1
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.29.ebuild
@@ -0,0 +1,61 @@
+# 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.29.ebuild,v 1.1 2010/08/26 20:41:52 jer Exp $
+
+EAPI="2"
+
+inherit eutils fixheadtails toolchain-funcs
+
+DEBIAN_PV="2"
+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=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_prepare() {
+	cd ${WORKDIR}
+	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}"/${P}-gentoo-utc.patch
+	ht_fix_file debian/adjtimexconfig
+	sed -i \
+		-e '/CFLAGS = -Wall -t/,/endif/d' \
+		-e '/$(CC).* -o/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		Makefile.in || die "sed Makefile.in"
+	#epatch "${FILESDIR}"/${PN}-1.16-pic.patch
+	#epatch "${FILESDIR}"/${PN}-1.20-fix-syscall.patch
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+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-1.29-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-gentoo-utc.patch
new file mode 100644
index 000000000000..6c563a1c8272
--- /dev/null
+++ b/net-misc/adjtimex/files/adjtimex-1.29-gentoo-utc.patch
@@ -0,0 +1,23 @@
+--- a/debian/adjtimexconfig
++++ b/debian/adjtimexconfig
+@@ -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 --force-adjust >/etc/adj.adjust
++/usr/sbin/adjtimex  ${params} --adjust --force-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}'`