Version bump. Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)

4 files changed, 14 insertions, 80 deletions

diff --git a/net-misc/htpdate/ChangeLog b/net-misc/htpdate/ChangeLog
index b0f6db76c95d..261b615c90ae 100644
--- a/net-misc/htpdate/ChangeLog
+++ b/net-misc/htpdate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/htpdate
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/ChangeLog,v 1.56 2014/01/18 10:38:58 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/ChangeLog,v 1.57 2015/07/25 21:14:29 polynomial-c Exp $
+
+*htpdate-1.1.1 (25 Jul 2015)
+
+  25 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> -htpdate-1.0.4.ebuild,
+  -htpdate-1.0.5.ebuild, +htpdate-1.1.1.ebuild, -files/htpdate.init:
+  Version bump. Removed old.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> htpdate-1.0.7.ebuild:
   Add arm64 love.
diff --git a/net-misc/htpdate/files/htpdate.init b/net-misc/htpdate/files/htpdate.init
deleted file mode 100644
index 090f0586f5ce..000000000000
--- a/net-misc/htpdate/files/htpdate.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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.4 2011/10/09 16:19:16 vapier Exp $
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	if [ -z "${SERVERS}" ] ; then
-		eerror "You need to set at least one http server to use in /etc/conf.d/htpdate"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting htpdate"
-	htpdate ${HTPDATE_OPTS} ${PROXY} ${SERVERS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping htpdate"
-	start-stop-daemon --stop --quiet --pidfile /var/run/htpdate.pid
-	eend $?
-}
diff --git a/net-misc/htpdate/htpdate-1.0.4.ebuild b/net-misc/htpdate/htpdate-1.0.4.ebuild
deleted file mode 100644
index 6e8dd92436d3..000000000000
--- a/net-misc/htpdate/htpdate-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-1.0.4.ebuild,v 1.9 2014/01/18 10:37:30 vapier Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.clevervest.com/htp/"
-SRC_URI="http://www.clevervest.com/htp/archive/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ~ppc64 s390 sh x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	gunzip htpdate.8.gz || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dosbin htpdate || die
-	doman htpdate.8
-	dodoc README Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init htpdate
-}
-
-pkg_postinst() {
-	einfo "If you would like to run htpdate as a daemon set"
-	einfo "appropriate http servers in /etc/conf.d/htpdate!"
-}
diff --git a/net-misc/htpdate/htpdate-1.0.5.ebuild b/net-misc/htpdate/htpdate-1.1.1.ebuild
index 491543da982b..252b376669ab 100644
--- a/net-misc/htpdate/htpdate-1.0.5.ebuild
+++ b/net-misc/htpdate/htpdate-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-1.0.5.ebuild,v 1.2 2013/08/12 07:50:18 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-1.1.1.ebuild,v 1.1 2015/07/25 21:14:29 polynomial-c Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
@@ -20,11 +20,9 @@ RDEPEND=""
 DOC_CONTENTS="If you would like to run htpdate as a daemon, set
 appropriate http servers in /etc/conf.d/htpdate!"
 
-src_unpack() {
-	default
-
-	cd "${S}" || die "change directory to ${S} failed"
-	unpacker htpdate.8.gz
+src_prepare() {
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
 }
 
 src_compile() {