gentoo resync : 02.08.2019

3 files changed, 2 insertions, 62 deletions

diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 712fbe8d8137..fe8983b95864 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -2,8 +2,6 @@ AUX adjtimex-1.29-r1-gentoo-utc.patch 1053 BLAKE2B 1f17ac2e1a508a3b54f7a1bb59de0
 AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e44a956b02830c80d3e2edecd5dcff9daacf869ff1f1e3613afb42c222287565a5c296f72d0729e5a928a58180039bc5e282 SHA512 7917ae69ff554c3b7de8be65f3758e9bcf80f5875afeca8d9ff81d1fa4bf4783f65c98b28d4d705fe585fb7a23b7e64af7d9145eb9286c24d7fdf2053a04e5f3
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
-DIST adjtimex_1.29-2.diff.gz 51735 BLAKE2B a59efafa03527ca8cb54994bfe49bec3638b2d76dcb505fcbe3be9e112326223c7f6009f7e527b0ff1a265e7af3c190894b8e3c41c6cf4e31dc2832a093bc38a SHA512 cc78cf9fd93cb243019952f877cb9730a5755d87336fc1a956162e957fd579de3770cb6bbba58ac9b6d350ee631ed294303360d0aa4153b12a31eb1bb4e35924
 DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649
-EBUILD adjtimex-1.29-r1.ebuild 1433 BLAKE2B ff7df3097d3f56875e11368ee4af2dfae5acc1552e1c7eadcf9acf7b22a5b653ccfdef3facf9c3e79fdd1726d88649086f8f0ce32efc34adc0ec2882aede9b26 SHA512 a2b56c1667fb329513638ed10d99e04ae14f6e374646b9802899f4094da2fe21e8d45e0d61cb422fb12f61cb40b9542d9ebe3ab6429504cd1a710408b9db6b6e
-EBUILD adjtimex-1.29-r2.ebuild 1701 BLAKE2B 9f8a6233fa3f4e0d73a796b453ed5fc98ddd9e644907ceec7857ad3d27e410b47e0c27ffeed7f379a521bfe57fc2d97f16ae9c9bdd3054c4aeb87daee62004f3 SHA512 3509d41b1a781edafd53ec7af7039fd6d680ff22880585e7008bc985c253d764c085da5d01fb9f666af3db702c482a7284d0e4f87a882cb6d1441a86469d9b9b
+EBUILD adjtimex-1.29-r2.ebuild 1697 BLAKE2B 79da53d245763702bd0a776b649c63798ba0fe9f687a22e93135fa71c272998abf3b015ecf48e59596921c7b5872c4d044b0dc51bd44d7c345c97d8603b17d44 SHA512 6ed381643753735baba92be81ea311764305facd4cec1d999171f5281082ac990b64885732d5576a7a4458f053e4527bea6e8d857403a317dd8d35c78e941c9d
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild b/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
deleted file mode 100644
index 9f8febb49e45..000000000000
--- a/net-misc/adjtimex/adjtimex-1.29-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/${PN}-1.29-r1-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/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
index c93afec77daf..30a3debd7a35 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"