Version bump, with a patch to work with heirloom-doctools… for the most part. Note that man pages will not look as good as with sys-apps/man at least.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 186 insertions, 1 deletions

diff --git a/sys-apps/man-db/ChangeLog b/sys-apps/man-db/ChangeLog
index 779017695425..c3e945f8681d 100644
--- a/sys-apps/man-db/ChangeLog
+++ b/sys-apps/man-db/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/man-db
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.8 2009/09/29 09:01:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.9 2009/10/02 21:50:28 flameeyes Exp $
+
+*man-db-2.5.6 (02 Oct 2009)
+
+  02 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +man-db-2.5.6.ebuild, +files/man-db-2.5.6-fix-no-groff.patch:
+  Version bump, with a patch to work with heirloom-doctools… for the most
+  part. Note that man pages will not look as good as with sys-apps/man at
+  least.
 
   29 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> man-db-2.5.3.ebuild,
   man-db-2.5.5.ebuild:
diff --git a/sys-apps/man-db/files/man-db-2.5.6-fix-no-groff.patch b/sys-apps/man-db/files/man-db-2.5.6-fix-no-groff.patch
new file mode 100644
index 000000000000..0f7f338ba114
--- /dev/null
+++ b/sys-apps/man-db/files/man-db-2.5.6-fix-no-groff.patch
@@ -0,0 +1,126 @@
+Index: man-db-2.5.6/src/man.c
+===================================================================
+--- man-db-2.5.6.orig/src/man.c
++++ man-db-2.5.6/src/man.c
+@@ -257,15 +257,19 @@ error_t argp_err_exit_status = FAIL;
+ 
+ static const char args_doc[] = N_("[SECTION] PAGE...");
+ 
++# ifdef TROFF_IS_GROFF
++#  define MAYBE_HIDDEN 0
++# else
++#  define MAYBE_HIDDEN OPTION_HIDDEN
++# endif
++
+ /* Please keep these options in the same order as in parse_opt below. */
+ static struct argp_option options[] = {
+ 	{ "config-file",	'C',	N_("FILE"),	0,		N_("use this user configuration file") },
+ 	{ "debug",		'd',	0,		0,		N_("emit debugging messages") },
+ 	{ "default",		'D',	0,		0,		N_("reset all options to their default values") },
+-#ifdef TROFF_IS_GROFF
+-	{ "warnings",  OPT_WARNINGS,    N_("WARNINGS"), OPTION_ARG_OPTIONAL,
++	{ "warnings",  OPT_WARNINGS,    N_("WARNINGS"), MAYBE_HIDDEN | OPTION_ARG_OPTIONAL,
+ 									N_("enable warnings from groff") },
+-#endif /* TROFF_IS_GROFF */
+ 
+ 	{ 0,			0,	0,		0,		N_("Main modes of operation:"),					10 },
+ 	{ "whatis",		'f',	0,		0,		N_("equivalent to whatis") },
+@@ -312,11 +316,6 @@ static struct argp_option options[] = {
+ 	{ "troff",		't',	0,		0,		N_("use %s to format pages"),					32 },
+ 	{ "troff-device",	'T',	N_("DEVICE"),	OPTION_ARG_OPTIONAL,
+ 									N_("use %s with selected device") },
+-# ifdef TROFF_IS_GROFF
+-#  define MAYBE_HIDDEN 0
+-# else
+-#  define MAYBE_HIDDEN OPTION_HIDDEN
+-# endif
+ 	{ "html",		'H',	N_("BROWSER"),	MAYBE_HIDDEN | OPTION_ARG_OPTIONAL,
+ 									N_("use %s or BROWSER to display HTML output"),			33 },
+ 	{ "gxditview",		'X',	N_("RESOLUTION"),
+@@ -362,8 +361,8 @@ static error_t parse_opt (int key, char 
+ 			colon_sep_section_list = manp = NULL;
+ 			return 0;
+ 
+-#ifdef TROFF_IS_GROFF
+ 		case OPT_WARNINGS:
++#ifdef TROFF_IS_GROFF
+ 			{
+ 				char *s = xstrdup
+ 					(arg ? arg : default_roff_warnings);
+@@ -380,8 +379,8 @@ static error_t parse_opt (int key, char 
+ 
+ 				free (s);
+ 			}
+-			return 0;
+ #endif /* TROFF_IS_GROFF */
++			return 0;
+ 
+ 		case 'f':
+ 			external = WHATIS;
+@@ -1596,18 +1595,23 @@ static pipeline *make_roff_command (cons
+ 								  NULL);
+ 					command_arg (cmd, tmpdev);
+ 					free (tmpdev);
+-				} else if (gxditview) {
++				}
++#ifdef TROFF_IS_GROFF
++				else if (gxditview) {
+ 					char *tmpdev = appendstr (NULL, "-TX",
+ 								  gxditview,
+ 								  NULL);
+ 					command_arg (cmd, tmpdev);
+ 					free (tmpdev);
+ 				}
++#endif /* TROFF_IS_GROFF */
+ 			}
+ 
+ 			if (wants_post) {
++#ifdef TROFF_IS_GROFF
+ 				if (gxditview)
+ 					command_arg (cmd, "-X");
++#endif /* TROFF_IS_GROFF */
+ 
+ 				if (roff_device && STREQ (roff_device, "ps"))
+ 					/* Tell grops to guess the page
+Index: man-db-2.5.6/configure.ac
+===================================================================
+--- man-db-2.5.6.orig/configure.ac
++++ man-db-2.5.6/configure.ac
+@@ -213,6 +213,7 @@ else
+ 	AC_CHECK_PROGS(troff, troff gtroff)
+ 	TROFF=troff
+ fi
++AC_SUBST([TROFF])
+ if test -n "$troff"
+ then
+ 	AC_DEFINE(HAS_TROFF, 1, [Define if you have troff.])
+Index: man-db-2.5.6/manual/Makefile.am
+===================================================================
+--- man-db-2.5.6.orig/manual/Makefile.am
++++ man-db-2.5.6/manual/Makefile.am
+@@ -59,13 +59,13 @@ $(MANUAL).pp: $(ME_FILES) version
+ 	$(SOELIM) -I$(srcdir) man_db.me | tbl > $@
+ 
+ .pp.dvi:
+-	groff -me -Tdvi $< > $@
++	$(TROFF) -me -Tdvi $< > $@
+ 
+ .pp.ps:
+-	groff -me -Tps $< > $@
++	$(TROFF) -me -Tps $< > $@
+ 
+ .pp.tdvi:
+-	troff -me -Tdvi $< | grodvi -d > $@
++	$(TROFF) -me -Tdvi $< | grodvi -d > $@
+ 
+ .tdvi.tps:
+ 	dvips -f -t a4 $< > $@
+@@ -74,7 +74,7 @@ $(MANUAL).pp: $(ME_FILES) version
+ 	nroff -me $< > $@
+ 
+ .pp.html:
+-	groff -me -Thtml -P-I$* $< > $@
++	$(TROFF) -me -Thtml -P-I$* $< > $@
+ 
+ # Automake defines these targets already, so we need to use -local.
+ dvi-local: $(MANUAL).dvi
diff --git a/sys-apps/man-db/man-db-2.5.6.ebuild b/sys-apps/man-db/man-db-2.5.6.ebuild
new file mode 100644
index 000000000000..caacc70ed6ff
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.5.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.5.6.ebuild,v 1.1 2009/10/02 21:50:28 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+SRC_URI="http://download.savannah.nongnu.org/releases/man-db/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb +gdbm nls"
+
+RDEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
+	|| ( sys-apps/groff >=app-doc/heirloom-doctools-080407-r2 )
+	!sys-apps/man"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+PROVIDE="virtual/man"
+
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-no-groff.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local db="gdbm"
+	use berkdb && ! use gdbm && db="db"
+	econf \
+		--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" \
+		$(use_enable nls) \
+		--with-db=${db} \
+		|| die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc README docs/{ChangeLog,HACKING,NEWS,TODO}
+}