Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/help2man/files/
Date: Sat, 04 Feb 2017 21:22:06
Message-Id: 1486243164.42fdba9f4c0262ff05fd9e7582dc70e90ffc0539.soap@gentoo
1 commit: 42fdba9f4c0262ff05fd9e7582dc70e90ffc0539
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 3 14:49:00 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 21:19:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fdba9f
7
8 sys-apps/help2man: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3791
11
12 .../files/help2man-1.36.4-respect-LDFLAGS.patch | 11 -----
13 .../help2man/files/help2man-1.38.4-linguas.patch | 53 ----------------------
14 2 files changed, 64 deletions(-)
15
16 diff --git a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch b/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch
17 deleted file mode 100644
18 index e6d1f6f..00000000
19 --- a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch
20 +++ /dev/null
21 @@ -1,11 +0,0 @@
22 ---- Makefile.in
23 -+++ Makefile.in
24 -@@ -102,7 +102,7 @@
25 -
26 - preload: $(preload).so
27 - $(preload).so: $(srcdir)/$(preload).c
28 -- $(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
29 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
30 -
31 - man: $(target).1
32 - $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
33
34 diff --git a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch b/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
35 deleted file mode 100644
36 index 080166c..00000000
37 --- a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
38 +++ /dev/null
39 @@ -1,53 +0,0 @@
40 -respect user LINGUAS
41 -
42 -+++ b/Makefile.in
43 -@@ -16,7 +16,12 @@
44 - export VPATH = .:$(srcdir)
45 -
46 - DESTDIR =
47 --LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
48 -+ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
49 -+ifeq ($(LINGUAS),)
50 -+INSTALL_LINGUAS = $(ALL_LINGUAS)
51 -+else
52 -+INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS))
53 -+endif
54 -
55 - CC = @CC@
56 - PERL = @PERL@
57 -@@ -56,7 +62,7 @@
58 - $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
59 -
60 - install_l10n: install_dirs msg_l10n man_l10n
61 -- for lang in $(LINGUAS); \
62 -+ for lang in $(INSTALL_LINGUAS); \
63 - do \
64 - $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
65 - $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \
66 -@@ -124,7 +130,7 @@
67 - $(MAKE) $(target).h2m
68 - ./$(target) --include=$(target).h2m --output=$@ ./$(target)
69 -
70 --msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))
71 -+msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(ALL_LINGUAS)))
72 - po/%.gmo: $(srcdir)/po/%.po
73 - test -d po || mkdir po
74 - $(MSGFMT) -o $@ $?
75 -@@ -134,7 +140,7 @@
76 - $(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
77 - $(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo
78 -
79 --man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
80 -+man_l10n: $(addprefix $(target).,$(addsuffix .1,$(ALL_LINGUAS)))
81 - $(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \
82 - $(srcdir)/po/%.po
83 - lang=$(patsubst $(target).%.1,%,$@); \
84 -@@ -164,7 +170,7 @@
85 - ./config.status
86 -
87 - update-po: $(srcdir)/po/$(target).pot
88 -- for lang in $(LINGUAS); \
89 -+ for lang in $(ALL_LINGUAS); \
90 - do \
91 - echo -n "Updating $$lang "; \
92 - msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \