From 02da3e9e68a35879d2360dcd38a362b19a39faee Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 22 Jun 2010 19:18:37 +0000 Subject: [PATCH] Version bump #325039 by Samuli Suominen. Fix LINGUAS handling #205954 by Arvid Norlander. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/help2man/ChangeLog | 9 ++- sys-apps/help2man/Manifest | 13 ++-- .../files/help2man-1.38.2-build.patch | 77 +++++++++++++++++++ sys-apps/help2man/help2man-1.38.2.ebuild | 41 ++++++++++ 4 files changed, 134 insertions(+), 6 deletions(-) create mode 100644 sys-apps/help2man/files/help2man-1.38.2-build.patch create mode 100644 sys-apps/help2man/help2man-1.38.2.ebuild 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 +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/Manifest b/sys-apps/help2man/Manifest index deb7006a4c3d..87abbb31ff43 100644 --- a/sys-apps/help2man/Manifest +++ b/sys-apps/help2man/Manifest @@ -2,16 +2,19 @@ Hash: SHA256 AUX help2man-1.36.4-respect-LDFLAGS.patch 319 RMD160 49025c654a41baa124ef7b43bf77814f50eeacc1 SHA1 7c5d6a35ea9e3de84e2ce5f0556bc02e1fd3de0a SHA256 294432c03b1d2996c21f250589b1fb7581de2e5c3ede0a9d5038d6d1cf258e1b +AUX help2man-1.38.2-build.patch 2369 RMD160 b115243f938f921b0f1080b98cdf709575c4bd60 SHA1 2dd75cab6dafa75ba2d1ba78fb0394c53aad7e96 SHA256 d082f70e77528ca764f5f6371d60e806846565df50af18487844b3d2f42e17a9 DIST help2man-1.36.4.tar.gz 85630 RMD160 1c2e18f86c2d689dbc4bbc1d85e60a2273308c42 SHA1 f3ffd89d50ee158589f2d0ccdc476d2ac3ebff70 SHA256 a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2 DIST help2man-1.37.1.tar.gz 107414 RMD160 781d9293fda549c152c7ff0ee929eda62acc8139 SHA1 db81161620ec8adf547a7e5a5d252036ca0d3b58 SHA256 3b44a91ef8e722c570a2a2d0e3f1cd249aac25dd2b2692c7792d87b30ed61561 +DIST help2man-1.38.2.tar.gz 136509 RMD160 8edf87341eef27195006a264d29685b0f85ae099 SHA1 6f0109589eca3286c2619b03efd3f85433696039 SHA256 952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1 EBUILD help2man-1.36.4-r1.ebuild 1076 RMD160 4ecd4cc352a89829ae48388a85e009f0e9927b79 SHA1 7122932441a471044607fcedcd3ef486f5ab9378 SHA256 8d70180fb9d2dc61cadbcfd42609cb57ada7dd8618ea636a0d287b79c5984013 EBUILD help2man-1.37.1.ebuild 1092 RMD160 fd128aeb1381280a9e365adc5150dda7702229ad SHA1 5d6f6320deb12b2b6b64fa643b878d27710be0d2 SHA256 3fd11a2670a4a424f07b186b42e0ba296773a50207e2853fbaf22b85919aee8e -MISC ChangeLog 4914 RMD160 8b34f85522820dd2bd6036732a732c85719a0839 SHA1 fdc9a312a5123b2d7e4b26802922d4b2f5f449d0 SHA256 ee04865fb5aaaa3001b16ca25940d74d7431e5438eb7b256d1991e254663c227 +EBUILD help2man-1.38.2.ebuild 1072 RMD160 5a650bad7c5a605e312cd5fc9673ce53e20f7777 SHA1 97c9728a442fcb2bb7b07af919b617eb0b6da5b6 SHA256 14ff17f49870da269281ca973d1741f11e9f03a2bfb76c2277f465260743ada6 +MISC ChangeLog 5154 RMD160 8af73e9cdf365fe3706982b45a1b9ecf61394a64 SHA1 dea5d0971bfa4c559b5605c101679d2df16379e9 SHA256 f5c30c952934fac0fe9e7b67c62974d27ff7a539810d15a82aa7cbe65b479a79 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAktKqfsACgkQTwhj9JtAlp7M2QD8CNG/uuT0O7i4AWcmaH/NhyBv -TqWeGlVRXjXT0fGAD0oBAJhn2LmwvTxDzX8MD9B0124n+jf9Nzn7c5QoC7PJ0Zin -=Qroh +iF4EAREIAAYFAkwhDIcACgkQTwhj9JtAlp5K4AEAvmsRneRRJ3zzSQUMNmtKArih +pIEgzg0SKsQ6sQs5h3oBAL4zffvn5/RJksEwKft0sBEsv8v3bKQTb7vPIWUGkBJD +=oTfN -----END PGP SIGNATURE----- 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 +} -- 2.26.2