From f3f5fb45287ce8288eb6d5341a6567b1fc873011 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Tue, 20 Dec 2022 14:34:09 +0100
Subject: net-misc/adjtimex: add soft blocker against net-misc/sntpd[adjtimex]

Bug: https://bugs.gentoo.org/887151
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 net-misc/adjtimex/adjtimex-1.29-r2.ebuild | 68 -----------------------------
 net-misc/adjtimex/adjtimex-1.29-r3.ebuild | 71 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 68 deletions(-)
 delete mode 100644 net-misc/adjtimex/adjtimex-1.29-r2.ebuild
 create mode 100644 net-misc/adjtimex/adjtimex-1.29-r3.ebuild

(limited to 'net-misc/adjtimex')

diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
deleted file mode 100644
index 5ac80ba347a5..000000000000
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit fixheadtails toolchain-funcs
-
-DEBIAN_PV="10"
-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}
-	${DEBIAN_URI}/${DEBIAN_SRC}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-
-src_unpack() {
-	unpack "${DEBIAN_SRC}"
-	cd "${S}" || die "Failed to cd ${S}"
-	unpack "${DEBIAN_PATCH}"
-}
-
-src_prepare() {
-	# Debian series first
-	DEBPATCHDIR="${S}"/debian/patches/
-	for f in $(cat "$DEBPATCHDIR/series") ; do
-		eapply "$DEBPATCHDIR"/$f
-	done
-
-	# Then gentoo changes
-	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
-
-	eapply "${FILESDIR}"/${PN}-1.29-r2-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"
-
-	eapply_user
-}
-
-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-r3.ebuild b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild
new file mode 100644
index 000000000000..519a776f5a9d
--- /dev/null
+++ b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit fixheadtails toolchain-funcs
+
+DEBIAN_PV="10"
+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}
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
+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}"
+	unpack "${DEBIAN_PATCH}"
+}
+
+src_prepare() {
+	# Debian series first
+	DEBPATCHDIR="${S}"/debian/patches/
+	for f in $(cat "$DEBPATCHDIR/series") ; do
+		eapply "$DEBPATCHDIR"/$f
+	done
+
+	# Then gentoo changes
+	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
+
+	eapply "${FILESDIR}"/${PN}-1.29-r2-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"
+
+	eapply_user
+}
+
+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"
+}
-- 
cgit v1.2.3-65-gdbad