8 files changed, 10 insertions, 186 deletions
diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 43fd02e3ef00..c9f831fd4234 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/adjtimex
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.31 2013/08/10 12:48:49 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.32 2015/04/26 23:01:48 mrueg Exp $
+
+  26 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -adjtimex-1.20-r3.ebuild,
+  -adjtimex-1.29.ebuild, -files/adjtimex-1.16-pic.patch,
+  -files/adjtimex-1.20-fix-syscall.patch, -files/adjtimex-1.20-gentoo-utc.patch,
+  -files/adjtimex-1.29-gentoo-utc.patch, adjtimex-1.29-r1.ebuild:
+  Remove old.
 
   10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> adjtimex-1.29-r1.ebuild:
   Stable for ppc, wrt bug #470558
diff --git a/net-misc/adjtimex/adjtimex-1.20-r3.ebuild b/net-misc/adjtimex/adjtimex-1.20-r3.ebuild
deleted file mode 100644
index d60665a196f5..000000000000
--- a/net-misc/adjtimex/adjtimex-1.20-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.2 2010/03/25 19:30:25 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/adjtimex-1.29-r1.ebuild b/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
index fa78e97a68ff..417afda782b5 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r1.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/adjtimex/adjtimex-1.29-r1.ebuild,v 1.5 2013/08/10 12:48:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.29-r1.ebuild,v 1.6 2015/04/26 23:01:48 mrueg Exp $
 
 EAPI="2"
 
diff --git a/net-misc/adjtimex/adjtimex-1.29.ebuild b/net-misc/adjtimex/adjtimex-1.29.ebuild
deleted file mode 100644
index 8924eeeb56a2..000000000000
--- a/net-misc/adjtimex/adjtimex-1.29.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3 2010/10/28 10:41:08 ssuominen 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"
-}
-
-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.16-pic.patch b/net-misc/adjtimex/files/adjtimex-1.16-pic.patch
deleted file mode 100644
index 320355edd25a..000000000000
--- a/net-misc/adjtimex/files/adjtimex-1.16-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- adjtimex.c.orig	2003-08-24 20:10:05.000000000 -0400
-+++ adjtimex.c	2004-11-16 09:04:53.000000000 -0500
-@@ -40,9 +40,11 @@
- #ifdef __ia64__
- extern int adjtimex(struct timex *);
- #else
-+#ifndef __PIC__
- _syscall1(int, adjtimex, struct timex *, txcp)
- #endif
- #endif
-+#endif
- int F_print = 0;
- 
- #ifndef LOG_PATH
diff --git a/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch b/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch
deleted file mode 100644
index c5ac87df40bb..000000000000
--- a/net-misc/adjtimex/files/adjtimex-1.20-fix-syscall.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar adjtimex-1.20.orig/adjtimex.c adjtimex-1.20/adjtimex.c
---- adjtimex-1.20.orig/adjtimex.c	2007-03-07 11:57:07.767901000 -0800
-+++ adjtimex-1.20/adjtimex.c	2007-03-07 11:57:34.649921951 -0800
-@@ -42,7 +42,7 @@
- extern int adjtimex(struct timex *);
- #else
- #ifndef __PIC__
--_syscall1(int, adjtimex, struct timex *, txcp)
-+#define adjtimex(txcp) syscall(SYS_adjtimex,txcp)
- #endif
- #endif
- #endif
diff --git a/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch
deleted file mode 100644
index de72c320d0e0..000000000000
--- a/net-misc/adjtimex/files/adjtimex-1.20-gentoo-utc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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-1.29-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-gentoo-utc.patch
deleted file mode 100644
index 6c563a1c8272..000000000000
--- a/net-misc/adjtimex/files/adjtimex-1.29-gentoo-utc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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}'`