[gentoo-commits] repo/gentoo:master commit in: net-misc/adjtimex/

[gentoo-commits] repo/gentoo:master commit in: net-misc/adjtimex/

[Mikle Kolyada]

commit:     21d7e8bfa7ea26e434e45cc88b7382cbb9185e88
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:22:03 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 09:22:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d7e8bf

net-misc/adjtimex: Drop old

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-misc/adjtimex/Manifest                |  1 -
 net-misc/adjtimex/adjtimex-1.29-r1.ebuild | 58 -------------------------------
 2 files changed, 59 deletions(-)

diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index a92dcb53e26..53222636902 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,3 +1,2 @@
 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

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 9f8febb49e4..00000000000
--- 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"
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/adjtimex/

[Mikle Kolyada]

commit:     f1355bb112638eb9ec93e2a49c761a2cd7327129
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:21:03 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 09:22:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1355bb1

net-misc/adjtimex: mark stable

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-misc/adjtimex/adjtimex-1.29-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
index c93afec77da..30a3debd7a3 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"

[gentoo-commits] repo/gentoo:master commit in: net-misc/adjtimex/

[Conrad Kostecki]

commit:     f3f5fb45287ce8288eb6d5341a6567b1fc873011
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 13:34:09 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 15:48:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f5fb45

net-misc/adjtimex: add soft blocker against net-misc/sntpd[adjtimex]

Bug: https://bugs.gentoo.org/887151
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../adjtimex/{adjtimex-1.29-r2.ebuild => adjtimex-1.29-r3.ebuild}    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild
similarity index 95%
rename from net-misc/adjtimex/adjtimex-1.29-r2.ebuild
rename to net-misc/adjtimex/adjtimex-1.29-r3.ebuild
index 5ac80ba347a5..519a776f5a9d 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,6 +10,7 @@ MY_P="${P/-/_}"
 DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
 DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.debian.tar.xz"
 DEBIAN_SRC="${MY_P}.orig.tar.gz"
+
 DESCRIPTION="Display or set the kernel time variables"
 HOMEPAGE="https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex"
 SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
@@ -19,6 +20,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
 
+RDEPEND="!net-misc/sntpd[adjtimex]"
+
 src_unpack() {
 	unpack "${DEBIAN_SRC}"
 	cd "${S}" || die "Failed to cd ${S}"