commit: 4f8276b62df21feeffcde29360cea05607060c9e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 10 03:30:42 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 10 03:33:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8276b6
net-misc/adjtimex: update EAPI 7 -> 8, update to Debian patchset 12 Closes: https://bugs.gentoo.org/922489 Closes: https://bugs.gentoo.org/948503 Bug: https://bugs.gentoo.org/676292 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/adjtimex/Manifest | 1 + net-misc/adjtimex/adjtimex-1.29-r4.ebuild | 74 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest index 53222636902a..8d73903f2d9a 100644 --- a/net-misc/adjtimex/Manifest +++ b/net-misc/adjtimex/Manifest @@ -1,2 +1,3 @@ DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b +DIST adjtimex_1.29-12.debian.tar.xz 34428 BLAKE2B adea31b56d173305f84577a279d6b68e7925b08ba248349882c25015e6f3a66c7ed047327d5c8d4bc5ed98ce3c312209ce3382638c7f4af077a351ef43c147cb SHA512 405ccd45c264822bd0da994a0b85b7eaf24b90decb4d2d85ca08c52c5a93da209006ab850158bac6cb552b2a485e7951850ce5ee17c9b7069c71a073caea903e DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649 diff --git a/net-misc/adjtimex/adjtimex-1.29-r4.ebuild b/net-misc/adjtimex/adjtimex-1.29-r4.ebuild new file mode 100644 index 000000000000..44280f355806 --- /dev/null +++ b/net-misc/adjtimex/adjtimex-1.29-r4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fixheadtails toolchain-funcs + +DEBIAN_PV="12" +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/ + local f + 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} || die + sed -e 's|^/sbin/adjtimex |/usr/sbin/adjtimex |' \ + -i.orig ${i} || die + 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" +}
