1 |
commit: cee69b8f71b0bde09a4e74e9a8190c69feb80289 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 5 14:08:33 2021 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 5 14:08:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee69b8f |
7 |
|
8 |
sys-apps/man-db-2.9.3-r2: revbump for Prefix |
9 |
|
10 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
.../files/man-db-2.9.3-darwin-libdb-intl.patch | 28 +++++++++++++ |
14 |
.../{man-db-9999.ebuild => man-db-2.9.3-r2.ebuild} | 49 +++++++++++++++++++--- |
15 |
sys-apps/man-db/man-db-9999.ebuild | 42 ++++++++++++++++++- |
16 |
3 files changed, 112 insertions(+), 7 deletions(-) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..a7df3c62fd0 |
21 |
--- /dev/null |
22 |
+++ b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch |
23 |
@@ -0,0 +1,28 @@ |
24 |
+libdb: link against libintl |
25 |
+ |
26 |
+necessary since gettext is used for translations |
27 |
+ |
28 |
+Signed-off-by: Fabian Groffen <grobian@g.o> |
29 |
+ |
30 |
+--- a/libdb/Makefile.am |
31 |
++++ b/libdb/Makefile.am |
32 |
+@@ -43,7 +43,7 @@ |
33 |
+ db_xdbm.h \ |
34 |
+ mydbm.h |
35 |
+ |
36 |
+-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) |
37 |
++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) |
38 |
+ |
39 |
+ libmandb_la_LDFLAGS = \ |
40 |
+ -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined |
41 |
+--- a/libdb/Makefile.in |
42 |
++++ b/libdb/Makefile.in |
43 |
+@@ -1541,7 +1541,7 @@ |
44 |
+ db_xdbm.h \ |
45 |
+ mydbm.h |
46 |
+ |
47 |
+-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) |
48 |
++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL) |
49 |
+ libmandb_la_LDFLAGS = \ |
50 |
+ -avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined |
51 |
+ |
52 |
|
53 |
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-2.9.3-r2.ebuild |
54 |
similarity index 73% |
55 |
copy from sys-apps/man-db/man-db-9999.ebuild |
56 |
copy to sys-apps/man-db/man-db-2.9.3-r2.ebuild |
57 |
index cf3711365b0..fc6eaf54888 100644 |
58 |
--- a/sys-apps/man-db/man-db-9999.ebuild |
59 |
+++ b/sys-apps/man-db/man-db-2.9.3-r2.ebuild |
60 |
@@ -1,9 +1,9 @@ |
61 |
-# Copyright 1999-2020 Gentoo Authors |
62 |
+# Copyright 1999-2021 Gentoo Authors |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
|
65 |
EAPI=7 |
66 |
|
67 |
-inherit systemd |
68 |
+inherit systemd prefix |
69 |
|
70 |
DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" |
71 |
HOMEPAGE="http://www.nongnu.org/man-db/" |
72 |
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then |
73 |
EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" |
74 |
else |
75 |
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" |
76 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
77 |
+ 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" |
78 |
fi |
79 |
|
80 |
LICENSE="GPL-3" |
81 |
@@ -36,6 +36,8 @@ BDEPEND=" |
82 |
nls? ( |
83 |
>=app-text/po4a-0.45 |
84 |
sys-devel/gettext |
85 |
+ virtual/libiconv |
86 |
+ virtual/libintl |
87 |
) |
88 |
" |
89 |
RDEPEND=" |
90 |
@@ -47,7 +49,9 @@ RDEPEND=" |
91 |
PDEPEND="manpager? ( app-text/manpager )" |
92 |
|
93 |
PATCHES=( |
94 |
- "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch |
95 |
+ "${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch |
96 |
+ "${FILESDIR}"/man-db-2.9.3-clock_gettime64.patch |
97 |
+ "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch |
98 |
) |
99 |
|
100 |
pkg_setup() { |
101 |
@@ -84,21 +88,56 @@ src_prepare() { |
102 |
|
103 |
eautoreconf |
104 |
fi |
105 |
+ |
106 |
+ hprefixify src/man_db.conf.in |
107 |
+ if use prefix ; then |
108 |
+ { |
109 |
+ echo "#" |
110 |
+ echo "# Added settings for Gentoo Prefix" |
111 |
+ [[ ${CHOST} == *-darwin* ]] && \ |
112 |
+ echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" |
113 |
+ echo "MANDATORY_MANPATH /usr/share/man" |
114 |
+ } >> src/man_db.conf.in |
115 |
+ fi |
116 |
} |
117 |
|
118 |
src_configure() { |
119 |
+ # set sections we want to search by default |
120 |
+ local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" |
121 |
+ sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" |
122 |
+ case ${CHOST} in |
123 |
+ *-solaris*) |
124 |
+ # Solaris tends to use sections named after the pkgs that |
125 |
+ # owns them, in particular for libc functions we want those |
126 |
+ # sections |
127 |
+ local s |
128 |
+ for s in $(cd /usr/share/man/ && echo man*) ; do |
129 |
+ s=${s#man} |
130 |
+ [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" |
131 |
+ done |
132 |
+ ;; |
133 |
+ esac |
134 |
+ |
135 |
export ac_cv_lib_z_gzopen=$(usex zlib) |
136 |
local myeconfargs=( |
137 |
--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
138 |
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
139 |
--disable-setuid #662438 |
140 |
--enable-cache-owner=man |
141 |
- --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" |
142 |
+ --with-sections="${sections}" |
143 |
$(use_enable nls) |
144 |
$(use_enable static-libs static) |
145 |
$(use_with seccomp libseccomp) |
146 |
--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) |
147 |
) |
148 |
+ case ${CHOST} in |
149 |
+ *-solaris*|*-darwin*) |
150 |
+ myeconfargs+=( |
151 |
+ $(use_with nls libiconv-prefix ${EPREFIX}/usr) |
152 |
+ $(use_with nls libintl-prefix ${EPREFIX}/usr) |
153 |
+ ) |
154 |
+ ;; |
155 |
+ esac |
156 |
econf "${myeconfargs[@]}" |
157 |
|
158 |
# Disable color output from groff so that the manpager can add it. #184604 |
159 |
|
160 |
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild |
161 |
index cf3711365b0..fd450d16d1a 100644 |
162 |
--- a/sys-apps/man-db/man-db-9999.ebuild |
163 |
+++ b/sys-apps/man-db/man-db-9999.ebuild |
164 |
@@ -1,4 +1,4 @@ |
165 |
-# Copyright 1999-2020 Gentoo Authors |
166 |
+# Copyright 1999-2021 Gentoo Authors |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
|
169 |
EAPI=7 |
170 |
@@ -36,6 +36,8 @@ BDEPEND=" |
171 |
nls? ( |
172 |
>=app-text/po4a-0.45 |
173 |
sys-devel/gettext |
174 |
+ virtual/libiconv |
175 |
+ virtual/libintl |
176 |
) |
177 |
" |
178 |
RDEPEND=" |
179 |
@@ -48,6 +50,7 @@ PDEPEND="manpager? ( app-text/manpager )" |
180 |
|
181 |
PATCHES=( |
182 |
"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch |
183 |
+ "${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch |
184 |
) |
185 |
|
186 |
pkg_setup() { |
187 |
@@ -84,21 +87,56 @@ src_prepare() { |
188 |
|
189 |
eautoreconf |
190 |
fi |
191 |
+ |
192 |
+ hprefixify src/man_db.conf.in |
193 |
+ if use prefix ; then |
194 |
+ { |
195 |
+ echo "#" |
196 |
+ echo "# Added settings for Gentoo Prefix" |
197 |
+ [[ ${CHOST} == *-darwin* ]] && \ |
198 |
+ echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" |
199 |
+ echo "MANDATORY_MANPATH /usr/share/man" |
200 |
+ } >> src/man_db.conf.in |
201 |
+ fi |
202 |
} |
203 |
|
204 |
src_configure() { |
205 |
+ # set sections we want to search by default |
206 |
+ local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" |
207 |
+ sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" |
208 |
+ case ${CHOST} in |
209 |
+ *-solaris*) |
210 |
+ # Solaris tends to use sections named after the pkgs that |
211 |
+ # owns them, in particular for libc functions we want those |
212 |
+ # sections |
213 |
+ local s |
214 |
+ for s in $(cd /usr/share/man/ && echo man*) ; do |
215 |
+ s=${s#man} |
216 |
+ [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" |
217 |
+ done |
218 |
+ ;; |
219 |
+ esac |
220 |
+ |
221 |
export ac_cv_lib_z_gzopen=$(usex zlib) |
222 |
local myeconfargs=( |
223 |
--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
224 |
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
225 |
--disable-setuid #662438 |
226 |
--enable-cache-owner=man |
227 |
- --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" |
228 |
+ --with-sections="${sections}" |
229 |
$(use_enable nls) |
230 |
$(use_enable static-libs static) |
231 |
$(use_with seccomp libseccomp) |
232 |
--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) |
233 |
) |
234 |
+ case ${CHOST} in |
235 |
+ *-solaris*|*-darwin*) |
236 |
+ myeconfargs+=( |
237 |
+ $(use_with nls libiconv-prefix ${EPREFIX}/usr) |
238 |
+ $(use_with nls libintl-prefix ${EPREFIX}/usr) |
239 |
+ ) |
240 |
+ ;; |
241 |
+ esac |
242 |
econf "${myeconfargs[@]}" |
243 |
|
244 |
# Disable color output from groff so that the manpager can add it. #184604 |