From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B92AC1382C5 for ; Fri, 5 Feb 2021 14:09:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EADACE08FE; Fri, 5 Feb 2021 14:09:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCCF8E08FE for ; Fri, 5 Feb 2021 14:09:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56648342B91 for ; Fri, 5 Feb 2021 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 819BB4A8 for ; Fri, 5 Feb 2021 14:09:02 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1612534134.cee69b8f71b0bde09a4e74e9a8190c69feb80289.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/, sys-apps/man-db/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch sys-apps/man-db/man-db-2.9.3-r2.ebuild sys-apps/man-db/man-db-9999.ebuild X-VCS-Directories: sys-apps/man-db/files/ sys-apps/man-db/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: cee69b8f71b0bde09a4e74e9a8190c69feb80289 X-VCS-Branch: master Date: Fri, 5 Feb 2021 14:09:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37de614c-a8ca-415b-ae47-706edfb63f2a X-Archives-Hash: f60153e32fb6ccb00e9cd99e776be906 commit: cee69b8f71b0bde09a4e74e9a8190c69feb80289 Author: Fabian Groffen gentoo org> AuthorDate: Fri Feb 5 14:08:33 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Feb 5 14:08:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee69b8f sys-apps/man-db-2.9.3-r2: revbump for Prefix Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../files/man-db-2.9.3-darwin-libdb-intl.patch | 28 +++++++++++++ .../{man-db-9999.ebuild => man-db-2.9.3-r2.ebuild} | 49 +++++++++++++++++++--- sys-apps/man-db/man-db-9999.ebuild | 42 ++++++++++++++++++- 3 files changed, 112 insertions(+), 7 deletions(-) diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch new file mode 100644 index 00000000000..a7df3c62fd0 --- /dev/null +++ b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch @@ -0,0 +1,28 @@ +libdb: link against libintl + +necessary since gettext is used for translations + +Signed-off-by: Fabian Groffen + +--- a/libdb/Makefile.am ++++ b/libdb/Makefile.am +@@ -43,7 +43,7 @@ + db_xdbm.h \ + mydbm.h + +-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) ++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) + + libmandb_la_LDFLAGS = \ + -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined +--- a/libdb/Makefile.in ++++ b/libdb/Makefile.in +@@ -1541,7 +1541,7 @@ + db_xdbm.h \ + mydbm.h + +-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) ++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) + libmandb_la_LDFLAGS = \ + -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined + diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-2.9.3-r2.ebuild similarity index 73% copy from sys-apps/man-db/man-db-9999.ebuild copy to sys-apps/man-db/man-db-2.9.3-r2.ebuild index cf3711365b0..fc6eaf54888 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-2.9.3-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit systemd +inherit systemd prefix DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" HOMEPAGE="http://www.nongnu.org/man-db/" @@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" else SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3" @@ -36,6 +36,8 @@ BDEPEND=" nls? ( >=app-text/po4a-0.45 sys-devel/gettext + virtual/libiconv + virtual/libintl ) " RDEPEND=" @@ -47,7 +49,9 @@ RDEPEND=" PDEPEND="manpager? ( app-text/manpager )" PATCHES=( - "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch + "${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch + "${FILESDIR}"/man-db-2.9.3-clock_gettime64.patch + "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch ) pkg_setup() { @@ -84,21 +88,56 @@ src_prepare() { eautoreconf fi + + hprefixify src/man_db.conf.in + if use prefix ; then + { + echo "#" + echo "# Added settings for Gentoo Prefix" + [[ ${CHOST} == *-darwin* ]] && \ + echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" + echo "MANDATORY_MANPATH /usr/share/man" + } >> src/man_db.conf.in + fi } src_configure() { + # set sections we want to search by default + local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" + sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" + case ${CHOST} in + *-solaris*) + # Solaris tends to use sections named after the pkgs that + # owns them, in particular for libc functions we want those + # sections + local s + for s in $(cd /usr/share/man/ && echo man*) ; do + s=${s#man} + [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" + done + ;; + esac + export ac_cv_lib_z_gzopen=$(usex zlib) local myeconfargs=( --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --disable-setuid #662438 --enable-cache-owner=man - --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" + --with-sections="${sections}" $(use_enable nls) $(use_enable static-libs static) $(use_with seccomp libseccomp) --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) ) + case ${CHOST} in + *-solaris*|*-darwin*) + myeconfargs+=( + $(use_with nls libiconv-prefix ${EPREFIX}/usr) + $(use_with nls libintl-prefix ${EPREFIX}/usr) + ) + ;; + esac econf "${myeconfargs[@]}" # Disable color output from groff so that the manpager can add it. #184604 diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index cf3711365b0..fd450d16d1a 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,8 @@ BDEPEND=" nls? ( >=app-text/po4a-0.45 sys-devel/gettext + virtual/libiconv + virtual/libintl ) " RDEPEND=" @@ -48,6 +50,7 @@ PDEPEND="manpager? ( app-text/manpager )" PATCHES=( "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch + "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch ) pkg_setup() { @@ -84,21 +87,56 @@ src_prepare() { eautoreconf fi + + hprefixify src/man_db.conf.in + if use prefix ; then + { + echo "#" + echo "# Added settings for Gentoo Prefix" + [[ ${CHOST} == *-darwin* ]] && \ + echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" + echo "MANDATORY_MANPATH /usr/share/man" + } >> src/man_db.conf.in + fi } src_configure() { + # set sections we want to search by default + local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" + sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" + case ${CHOST} in + *-solaris*) + # Solaris tends to use sections named after the pkgs that + # owns them, in particular for libc functions we want those + # sections + local s + for s in $(cd /usr/share/man/ && echo man*) ; do + s=${s#man} + [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" + done + ;; + esac + export ac_cv_lib_z_gzopen=$(usex zlib) local myeconfargs=( --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --disable-setuid #662438 --enable-cache-owner=man - --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" + --with-sections="${sections}" $(use_enable nls) $(use_enable static-libs static) $(use_with seccomp libseccomp) --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) ) + case ${CHOST} in + *-solaris*|*-darwin*) + myeconfargs+=( + $(use_with nls libiconv-prefix ${EPREFIX}/usr) + $(use_with nls libintl-prefix ${EPREFIX}/usr) + ) + ;; + esac econf "${myeconfargs[@]}" # Disable color output from groff so that the manpager can add it. #184604