commit: 1e9c49c966c7b92eac6e385325887382f7ad0a99 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Jan 25 17:36:34 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 25 22:53:19 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9c49c9
sys-process/fcron: honor --docdir Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/45517 Closes: https://github.com/gentoo/gentoo/pull/45517 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-process/fcron/fcron-3.4.0-r1.ebuild | 6 +- sys-process/fcron/files/fcron-3.4.0-docdir.patch | 80 ++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/sys-process/fcron/fcron-3.4.0-r1.ebuild b/sys-process/fcron/fcron-3.4.0-r1.ebuild index b8c58dc1779c..42a8a2b5e644 100644 --- a/sys-process/fcron/fcron-3.4.0-r1.ebuild +++ b/sys-process/fcron/fcron-3.4.0-r1.ebuild @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/fcron-3.1.1-noreadline.patch "${FILESDIR}"/fcron-3.2.1-musl-getopt-order.patch "${FILESDIR}"/fcron-3.4.0-order.patch + "${FILESDIR}"/fcron-3.4.0-docdir.patch ) pkg_setup() { @@ -183,11 +184,6 @@ src_install() { local DOCS=( "${WORKDIR}/crontab" ) einstalldocs - - if [[ ${PR} != r0 ]]; then - mv "${ED}"/usr/share/doc/{${P}/*,${PF}/} || die - rmdir "${ED}"/usr/share/doc/${P} || die - fi } pkg_postinst() { diff --git a/sys-process/fcron/files/fcron-3.4.0-docdir.patch b/sys-process/fcron/files/fcron-3.4.0-docdir.patch new file mode 100644 index 000000000000..35497bfdb2b4 --- /dev/null +++ b/sys-process/fcron/files/fcron-3.4.0-docdir.patch @@ -0,0 +1,80 @@ +https://github.com/yo8192/fcron/pull/45 + +Use standard autoconf's --docdir + +--- a/configure.in ++++ b/configure.in +@@ -398,26 +398,6 @@ PROC=$proc + AC_DEFINE_UNQUOTED(PROC, "$proc") + fi + +-docdir="${datadir}/doc" +-AC_MSG_CHECKING(location of doc directory) +-AC_ARG_WITH(docdir, +-[ --with-docdir=PATH Directory containing documentation.], +-[ case "$withval" in +- no) +- AC_MSG_ERROR(Need DOCDIR.) +- ;; +- yes) +- ;; +- *) +- docdir="$withval" +- ;; +- esac ]) +- +-AC_MSG_RESULT($docdir) +-DOCDIR="$docdir" +-AC_SUBST(DOCDIR) +- +- + dnl systemd init system + SYSTEMD_DIR="no" + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -16,7 +16,7 @@ SRCDIR = @srcdir@ + prefix = @prefix@ + datarootdir = @datarootdir@ + DESTMAN = @mandir@ +-DESTDOC = @DOCDIR@ ++DESTDOC = @docdir@ + + INSTALL = @INSTALL@ + JADE = @JADE@ +@@ -134,11 +134,11 @@ install-staged: doc-if-none clean + done ; \ + done ) + +- @(echo "Installing documentation files in $(DESTDIR)$(DESTDOC)/fcron-$(VERSION)...") +- @(if test ! -d $(DESTDIR)$(DESTDOC)/fcron-$(VERSION); then $(INSTALL) -m 755 -d $(DESTDIR)$(DESTDOC)/fcron-$(VERSION) ; fi) ++ @(echo "Installing documentation files in $(DESTDIR)$(DESTDOC)...") ++ @(if test ! -d $(DESTDIR)$(DESTDOC); then $(INSTALL) -m 755 -d $(DESTDIR)$(DESTDOC) ; fi) + + @(for l in $(LANGUAGES); do \ +- DIR=$(DESTDIR)$(DESTDOC)/fcron-$(VERSION) ; \ ++ DIR=$(DESTDIR)$(DESTDOC) ; \ + if test ! -d $$DIR/$$l; then \ + $(INSTALL) -m 755 -d $$DIR/$$l ; \ + fi ; \ +@@ -173,10 +173,8 @@ perms: + done + chown $(ROOTNAME) $(DESTDIR)$(DESTDOC) + chgrp $(ROOTGROUP) $(DESTDIR)$(DESTDOC) +- chown $(ROOTNAME) $(DESTDIR)$(DESTDOC)/fcron-$(VERSION) +- chgrp $(ROOTGROUP) $(DESTDIR)$(DESTDOC)/fcron-$(VERSION) + for l in $(LANGUAGES); do \ +- DIR=$(DESTDIR)$(DESTDOC)/fcron-$(VERSION)/$$l ; \ ++ DIR=$(DESTDIR)$(DESTDOC)/$$l ; \ + chown $(ROOTNAME) $$DIR ; \ + chgrp $(ROOTGROUP) $$DIR ; \ + for i in txt HTML; do \ +@@ -189,7 +187,7 @@ perms: + + + uninstall: +- rm -fR $(DESTDOC)/fcron-$(VERSION) ++ rm -fR $(DESTDOC) + @(echo "Removing man pages ...") + @(for l in $(LANGUAGES); do \ + if test "x$$l" = "xen"; then \
