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.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 193 insertions, 5 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/Manifest b/sys-apps/man-db/Manifest
index 931923828474..2034774a1753 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX man-db-2.5.6-fix-no-groff.patch 3820 RMD160 1d7ec461d4dec75da532d6050f75aefefa85d87f SHA1 4a43e76227d685ceda9e986739dd757d07b46b1a SHA256 dbf4a3b94266128807036540b482fb2425c9bf1f02daef3ddc9042bd854cdca3
 DIST man-db-2.5.3.tar.gz 1851833 RMD160 9645a6cf996ad29eebcc6193672921db690bbacc SHA1 d3fc901c23b5ecb88afe12733ae93c60c5d2e874 SHA256 c09beb094d2b35f99abed5a6b385863f2d03164416f899b01c8ef97fd1ebf3ef
 DIST man-db-2.5.5.tar.gz 1948612 RMD160 be44bb57cb12502f94e0b38b7598897cdf7a71f5 SHA1 029c6f19084c329be7fdae69143a87a6d3a8dce6 SHA256 ab2b1d1f2597c80784c19ece54e66c3bcff223e8e6bef6335e50066331f12c26
+DIST man-db-2.5.6.tar.gz 2094209 RMD160 fe1cb5ea2aa8bded99ad16591873a1043cd68125 SHA1 e8799313afb31976f9c7a4e34bc4498293a6fef8 SHA256 14e3daf8727f98035cb250d6e4caaf720225c14996377aa7bf8f00248b7f5633
 EBUILD man-db-2.5.3.ebuild 1175 RMD160 06440ca3f28038088bb389c2d794636876358c72 SHA1 8be3ea766c749021ca227000200b3384ad381554 SHA256 2e67ff1727bb907e39e701e36df729895bd73bcd9b720687032aef5b99c56d6b
 EBUILD man-db-2.5.5.ebuild 1175 RMD160 bad7facff78b3460855c8730e0b320e462b8ac59 SHA1 52cf2e1f35d4c7d082c4be37b430305f8508a235 SHA256 b8ddc3321b710d6479122e2e16826983943b09f1e54f7b1c804e4c4de1718cf2
-MISC ChangeLog 1342 RMD160 eeb76a9c8d9d46b1c2729f779d880520375161a2 SHA1 4d943656cc342a143a52ebe8a2c07bb0623f76b8 SHA256 6745442d323bd788c03d2c53a14ec4705a3d0c4a9d95deac53819e83515dd4ad
+EBUILD man-db-2.5.6.ebuild 1306 RMD160 6d876e048cd05bc8ec18f10ffa5b8ed66e8f32ed SHA1 5cc6ebfdaa442fad28c1663e1d73e9169d3ad43a SHA256 db0c963bf3b85feab6e2857d072874e75e8189440d42f29fc6b68a00e777df03
+MISC ChangeLog 1651 RMD160 1e84cfb9cb418de9488c572ca74433d39c4f5ff8 SHA1 85aa900c13faf663a5cdab4bd687154077321fdb SHA256 57171dffae10bacb10e346d9946b19fc7a38a71f7ca9c3fb88469ab6b50314b8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrBzN8ACgkQAiZjviIA2XjqigCeMed/WebWqw89PTWN+7yYBr0t
-quMAnj9qdi+A0oohlVPWKc84SbpnZM+C
-=lzEu
+iEYEARECAAYFAkrGdZQACgkQAiZjviIA2Xjx2gCcCKRrNNef7vkq48bWz4+TvH0A
+SFEAoPKzP64kJ+QmYXdSt/x4zYYqGqdO
+=Xb0r
 -----END PGP SIGNATURE-----
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}
+}