3 files changed, 126 insertions, 1 deletions
diff --git a/sys-apps/help2man/ChangeLog b/sys-apps/help2man/ChangeLog
index 5f6c5ffd4db1..ab903f53b3a7 100644
--- a/sys-apps/help2man/ChangeLog
+++ b/sys-apps/help2man/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/help2man
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.42 2010/01/11 04:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.43 2010/06/22 19:18:37 vapier Exp $
+
+*help2man-1.38.2 (22 Jun 2010)
+
+  22 Jun 2010; Mike Frysinger <vapier@gentoo.org> +help2man-1.38.2.ebuild,
+  +files/help2man-1.38.2-build.patch:
+  Version bump #325039 by Samuli Suominen. Fix LINGUAS handling #205954 by
+  Arvid Norlander.
 
 *help2man-1.37.1 (11 Jan 2010)
 
diff --git a/sys-apps/help2man/files/help2man-1.38.2-build.patch b/sys-apps/help2man/files/help2man-1.38.2-build.patch
new file mode 100644
index 000000000000..b640b7690b21
--- /dev/null
+++ b/sys-apps/help2man/files/help2man-1.38.2-build.patch
@@ -0,0 +1,77 @@
+respect user LINGUAS
+
+fix parallel build install
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,7 +16,12 @@
+ export VPATH = .:$(srcdir)
+ 
+ DESTDIR =
+-LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
++ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
++ifeq ($(LINGUAS),)
++INSTALL_LINGUAS = $(ALL_LINGUAS)
++else
++INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS))
++endif
+ 
+ CC = @CC@
+ PERL = @PERL@
+@@ -39,12 +44,13 @@
+ all: $(target) man info @extra_make_all@
+ 
+ install: all install_base @extra_make_install@
+-install_base:
++install_dirs:
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ 
++install_base: install_dirs
+ 	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DATA) $(call vpath_file,$(target).1) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_DATA) $(call vpath_file,/$(target).info) \
+@@ -56,11 +62,11 @@
+ 		$(DESTDIR)$(infodir)/$(target).info; \
+ 	fi
+ 
+-install_preload: preload
++install_preload: install_dirs preload
+ 	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
+ 
+-install_l10n: msg_l10n man_l10n
+-	for lang in $(LINGUAS); \
++install_l10n: install_dirs msg_l10n man_l10n
++	for lang in $(INSTALL_LINGUAS); \
+ 	do \
+ 	    $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 	    $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \
+@@ -124,7 +130,7 @@
+ 	$(MAKE) $(target).h2m
+ 	./$(target) --include=$(target).h2m --output=$@ ./$(target)
+ 
+-msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))
++msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(ALL_LINGUAS)))
+ po/%.gmo: $(srcdir)/po/%.po
+ 	test -d po || mkdir po
+ 	$(MSGFMT) -o $@ $?
+@@ -134,7 +140,7 @@
+ 	$(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
+ 	$(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo
+ 
+-man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
++man_l10n: $(addprefix $(target).,$(addsuffix .1,$(ALL_LINGUAS)))
+ $(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \
+     $(srcdir)/po/%.po
+ 	lang=$(patsubst $(target).%.1,%,$@); \
+@@ -164,7 +170,7 @@
+ 	./config.status
+ 
+ update-po: $(srcdir)/po/$(target).pot
+-	for lang in $(LINGUAS); \
++	for lang in $(ALL_LINGUAS); \
+ 	do \
+ 	    echo -n "Updating $$lang "; \
+ 	    msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \
diff --git a/sys-apps/help2man/help2man-1.38.2.ebuild b/sys-apps/help2man/help2man-1.38.2.ebuild
new file mode 100644
index 000000000000..6221f7af4b1a
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.38.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.38.2.ebuild,v 1.1 2010/06/22 19:18:37 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="http://www.gnu.org/software/help2man"
+SRC_URI="mirror://gnu/help2man/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="nls elibc_glibc"
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( nls? (
+		dev-perl/Locale-gettext
+		>=sys-devel/gettext-0.12.1-r1
+	) )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.36.4-respect-LDFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.38.2-build.patch
+}
+
+src_configure() {
+	local myconf
+	use elibc_glibc \
+		&& myconf="${myconf} $(use_enable nls)" \
+		|| myconf="${myconf} --disable-nls"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog NEWS README THANKS
+}