public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/
@ 2019-01-30 11:50 Michael Haubenwallner
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Haubenwallner @ 2019-01-30 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     cf1d7089b78745643edceb113a8455b63371d789
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 11:49:20 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 11:49:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cf1d7089

sys-apps/help2man: sync, rebase cygwin patch

Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 sys-apps/help2man/Manifest                         |  8 ++--
 .../files/help2man-1.36.4-respect-LDFLAGS.patch    | 11 -----
 .../help2man/files/help2man-1.38.4-linguas.patch   | 53 ----------------------
 ...lp2man-1.47.3.ebuild => help2man-1.47.6.ebuild} | 17 +++----
 ...lp2man-1.46.6.ebuild => help2man-1.47.7.ebuild} | 22 +++++----
 ...lp2man-1.47.4.ebuild => help2man-1.47.8.ebuild} | 16 +++----
 6 files changed, 34 insertions(+), 93 deletions(-)

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 80885a36e9..2fc8570c78 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,4 @@
-DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
-DIST help2man-1.47.3.tar.xz 184832 BLAKE2B fbad208e8f00ace7a87bbfdd7991a5bd3dccc7df1d49a3717cb15e5102df891f24fcdf896f36f1dec07ec547b7522860bc997d1eeb83e8c7b8fd2f967416c80a SHA512 c6c41e6492f7a84a3c8c45473f4fa797d243a10b56bbba6029aec5b84a7b5f5054fb55211f5057a5cade7f7d666f5445c528eb6d519b862fe01d0adc64257501
-DIST help2man-1.47.4-1.40.4-cygwin-nls.patch 5371 SHA256 ceacfbf45855fdd4da8955eeefbec2d2bb3cde4aeb08b73de326bac9d22110bd SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6 WHIRLPOOL 2ea313c74466cf9a52d2d052adf8c6d116ad3e3a9d740da825f203fe0ebb1fd10bc60ef61ef9bbed417fd875a9bb4391122fa54e6a1fb0e4905d571a3e9e92ee
-DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
+DIST help2man-1.40.4-cygwin-nls.patch 5371 BLAKE2B 998988ee4c66d3e029d2279b4acd3c02d68df9fbd0d780670d03a5246e8308d1ba7c0c98e810d9527ed27ac11331a26c2b74dedcd0e722e7d78dd1cf8c95c851 SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6
+DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
+DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14
+DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6

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
deleted file mode 100644
index e6d1f6f081..0000000000
--- a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -102,7 +102,7 @@
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m

diff --git a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch b/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
deleted file mode 100644
index 080166c506..0000000000
--- a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-respect user LINGUAS
-
-+++ 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@
-@@ -56,7 +62,7 @@
- 	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
- 
- install_l10n: install_dirs msg_l10n man_l10n
--	for lang in $(LINGUAS); \
-+	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.47.3.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
similarity index 64%
rename from sys-apps/help2man/help2man-1.47.3.ebuild
rename to sys-apps/help2man/help2man-1.47.6.ebuild
index b06944c215..c6386779e3 100644
--- a/sys-apps/help2man/help2man-1.47.3.ebuild
+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="https://www.gnu.org/software/help2man/"
@@ -11,14 +9,18 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
 	nls? ( dev-perl/Locale-gettext )"
 DEPEND=${RDEPEND}
 
-DOCS="debian/changelog NEWS README THANKS" #385753
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
 
 src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -26,8 +28,7 @@ src_prepare() {
 			-e 's/-shared/-bundle/' \
 			Makefile.in || die
 	fi
-	epatch \
-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+	default
 }
 
 src_configure() {

diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.47.7.ebuild
similarity index 50%
rename from sys-apps/help2man/help2man-1.46.6.ebuild
rename to sys-apps/help2man/help2man-1.47.7.ebuild
index 27f40946d1..c6386779e3 100644
--- a/sys-apps/help2man/help2man-1.46.6.ebuild
+++ b/sys-apps/help2man/help2man-1.47.7.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=4
-inherit eutils
+EAPI=6
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="https://www.gnu.org/software/help2man/"
@@ -11,18 +9,26 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
 	nls? ( dev-perl/Locale-gettext )"
 DEPEND=${RDEPEND}
 
-DOCS="debian/changelog NEWS README THANKS" #385753
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
 }
 
 src_configure() {

diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.8.ebuild
similarity index 70%
rename from sys-apps/help2man/help2man-1.47.4.ebuild
rename to sys-apps/help2man/help2man-1.47.8.ebuild
index d2ced772c3..20cca7decc 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.8.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="https://www.gnu.org/software/help2man/"
@@ -12,19 +10,19 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 CYGWIN_PATCHREV="60ae068c5e01fbed4ee3f86107f7df64d596a864"
 CYGWIN_PATCH="1.40.4-cygwin-nls.patch"
 SRC_URI+=" elibc_Cygwin? (
-https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${P}-${CYGWIN_PATCH}
+https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}
 )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
 	nls? ( dev-perl/Locale-gettext )"
 DEPEND=${RDEPEND}
 
-DOCS="debian/changelog NEWS README THANKS" #385753
+DOCS=( debian/changelog NEWS README THANKS ) #385753
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
@@ -36,8 +34,8 @@ src_prepare() {
 			-e 's/-shared/-bundle/' \
 			Makefile.in || die
 	fi
-	epatch "${PATCHES[@]}"
-	use elibc_Cygwin && epatch "${DISTDIR}/${P}-${CYGWIN_PATCH}"
+	default
+	use elibc_Cygwin && eapply -p2 "${DISTDIR}/${PN}-${CYGWIN_PATCH}"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/
@ 2020-12-08  3:20 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-12-08  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     a50c8f48bd841bd7f17f3110dd1562248d39961c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 03:20:02 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 03:20:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a50c8f48

sys-apps/help2man: adjust Cygwin patch

* Use cygwinports patch again
* Rebase the Makefile hunk

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/help2man/Manifest                         |   1 -
 .../help2man/files/help2man-1.47.16-cygwin.patch   | 165 +++++++++++++++++++++
 sys-apps/help2man/help2man-1.47.16.ebuild          |  18 ++-
 3 files changed, 175 insertions(+), 9 deletions(-)

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 6a284f99aa..f01b7eebe1 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,5 +1,4 @@
 DIST help2man-1.40.4-cygwin-nls.patch 5371 BLAKE2B 998988ee4c66d3e029d2279b4acd3c02d68df9fbd0d780670d03a5246e8308d1ba7c0c98e810d9527ed27ac11331a26c2b74dedcd0e722e7d78dd1cf8c95c851 SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6
-DIST help2man-1.40.4-cygwin-nls.patch-2 5394 BLAKE2B 16381050e40f05659846ce769cd60198af4731a24b1a36e14455a58318e6850a15a560adb25469a53e3b59e83a79110c5d5b616e65224a0bd8b70b23af4564eb SHA512 3129eabaeecb2cf70e031f2473f723bd5cd09e861e30914273fd8c08b5b2fb48a78ee7830d605b009847c9fd7c4a8c51cc3964d2a6d426167fb5d37be49600a0
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14

diff --git a/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch b/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch
new file mode 100644
index 0000000000..e1dd22b8b1
--- /dev/null
+++ b/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch
@@ -0,0 +1,165 @@
+LD_PRELOAD by itself only works with Cygwin builtin functions, but
+textdomain() and friends come from libintl.  In order to override
+those functions, we have to "replace" cygintl-?.dll since functions are
+bound to a DLL name at link time.  Our replacement will be used since
+it is loaded first by LD_PRELOAD.
+
+But as we are making this *the* libintl, we need to provide 
+pass-throughs for the other functions which we're not overriding,
+otherwise Locale::gettext won't load (not to mention the program
+that we're trying to help2man).
+
+--- origsrc/help2man-1.40.4/bindtextdomain.c	2009-11-13 00:01:34.000000000 -0600
++++ src/help2man-1.40.4/bindtextdomain.c	2011-12-29 00:24:33.608078600 -0600
+@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const
+ static char *(*r_bindtextdomain)(char const *, char const *) = 0;
+ static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0;
+ 
++#ifdef __CYGWIN__
++static void *RTLD_NEXT = 0;
++static char *(*r_gettext)(const char *) = 0;
++static char *(*r_dgettext)(const char *, const char *) = 0;
++static char *(*r_dcgettext)(const char *, const char *, int) = 0;
++static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0;
++static char *(*r_dngettext)(const char *, const char *, const char *,
++                            unsigned long int) = 0;
++static char *(*r_dcngettext)(const char *, const char *, const char *,
++                             unsigned long int, int) = 0;
++static char *(*r_setlocale)(int, const char *) = 0;
++
++#define SYM(sym) libintl_ ## sym
++#else
++#define SYM(sym) sym
++#endif
++
+ void setup()
+ {
+     static int done = 0;
+     if (done++)
+         return;
+ 
++#ifdef __CYGWIN__
++    if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY)))
++        die("libintl8 not found");
++#endif
++
+     if (!(e_textdomain = getenv("TEXTDOMAIN")))
+ 	die("TEXTDOMAIN not set");
+ 
+@@ -48,9 +70,19 @@ void setup()
+     if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT,
+     					    "bind_textdomain_codeset")))
+ 	die("can't find symbol \"bind_textdomain_codeset\"");
++
++#ifdef __CYGWIN__
++    r_gettext = dlsym(RTLD_NEXT, "libintl_gettext");
++    r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext");
++    r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext");
++    r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext");
++    r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext");
++    r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext");
++    r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale");
++#endif
+ }
+ 
+-char *textdomain(char const *domainname)
++char *SYM(textdomain)(char const *domainname)
+ {
+     char *r;
+     setup();
+@@ -61,7 +93,7 @@ char *textdomain(char const *domainname)
+     return r;
+ }
+ 
+-char *bindtextdomain(char const *domainname, char const *dirname)
++char *SYM(bindtextdomain)(char const *domainname, char const *dirname)
+ {
+     char const *dir = dirname;
+     setup();
+@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn
+     return r_bindtextdomain(domainname, dir);
+ }
+ 
+-char *bind_textdomain_codeset(char const *domainname, char const *codeset)
++char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset)
+ {
+     char *r;
+     setup();
+@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const
+ 
+     return r;
+ }
++
++#ifdef __CYGWIN__
++
++char *libintl_gettext(const char *msgid)
++{
++    setup();
++    return r_gettext(msgid);
++}
++
++char *libintl_dgettext (const char *domainname, const char *msgid)
++{
++    setup();
++    return r_dgettext(domainname, msgid);
++}
++
++char *libintl_dcgettext (const char *domainname, const char *msgid,
++                         int category)
++{
++    setup();
++    return r_dcgettext (domainname, msgid, category);
++}
++
++char *libintl_ngettext (const char *msgid1, const char *msgid2,
++                        unsigned long int n)
++{
++    setup();
++    return r_ngettext (msgid1, msgid2, n);
++}
++
++char *libintl_dngettext (const char *domainname, const char *msgid1,
++                         const char *msgid2, unsigned long int n)
++{
++    setup();
++    return r_dngettext (domainname, msgid1, msgid2, n);
++}
++
++char *libintl_dcngettext (const char *domainname,
++                          const char *msgid1, const char *msgid2,
++                          unsigned long int n, int category)
++{
++    setup();
++    return r_dcngettext (domainname, msgid1, msgid2, n, category);
++}
++
++char *libintl_setlocale (int i, const char *s)
++{
++    setup();
++    return r_setlocale (i, s);
++}
++
++#endif
+--- src/help2man-1.47.16/Makefile.in
++++ src/help2man-1.47.16/Makefile.in
+@@ -83,7 +83,8 @@ install_base:
+ 
+ install_preload: preload
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
+-	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
++	$(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir)
++	ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so
+ 
+ install_l10n: msg_l10n man_l10n info_l10n
+ 	set -e; \
+@@ -152,7 +153,9 @@ $(target).h2m: $(srcdir)/$(target).h2m.PL
+ 
+ preload: $(preload).so
+ $(preload).so: $(srcdir)/$(preload).c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
++	mkdir -p lib
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS)
++	ln -sf lib/cygintl-8.dll $@
+ 
+ man: $(target).1
+ $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL

diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 9fe158d130..4f6dc6903f 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
@@ -7,13 +7,12 @@ DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="https://www.gnu.org/software/help2man/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
-# Was: https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}
-CYGWIN_PATCHREV="adf3e6f73a4857e55594f140d6282d9ff5362f5a"
-CYGWIN_PATCH="1.40.4-cygwin-nls.patch"
-CYGWIN_REV="-2"
-SRC_URI+=" elibc_Cygwin? (
-	https://raw.githubusercontent.com/msys2/MSYS2-packages/master/help2man/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}${CYGWIN_REV}
-)"
+# Needed to rebase the Makefile hunk, now in files/
+#CYGWIN_PATCHREV="60ae068c5e01fbed4ee3f86107f7df64d596a864"
+#CYGWIN_PATCH="1.40.4-cygwin-nls.patch"
+#SRC_URI+=" elibc_Cygwin? (
+#	https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}
+#)"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -36,8 +35,11 @@ src_prepare() {
 			-e 's/-shared/-bundle/' \
 			Makefile.in || die
 	fi
+
 	default
-	use elibc_Cygwin && eapply -p2 "${DISTDIR}/${PN}-${CYGWIN_PATCH}${CYGWIN_REV}"
+
+	use elibc_Cygwin && eapply -p2 "${FILESDIR}"/${PN}-1.47.16-cygwin.patch
+	#use elibc_Cygwin && eapply -p2 "${DISTDIR}/${PN}-${CYGWIN_PATCH}"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/
@ 2022-01-16  6:29 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-01-16  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     953cbc6f8a30cbde3975c00fcfb7a926a15ad28c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 06:28:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 06:29:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=953cbc6f

sys-apps/help2man: add 1.48.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/help2man/Manifest                         |   1 +
 .../help2man/files/help2man-1.48.5-cygwin.patch    | 167 +++++++++++++++++++++
 sys-apps/help2man/help2man-1.48.5.ebuild           |  44 ++++++
 3 files changed, 212 insertions(+)

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index dc717cbf51..591e813c6c 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1 +1,2 @@
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
+DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1

diff --git a/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch b/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch
new file mode 100644
index 0000000000..aa75d10e38
--- /dev/null
+++ b/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch
@@ -0,0 +1,167 @@
+https://cygwin.com/git-cygwin-packages/?p=git/cygwin-packages/help2man.git;a=blob;f=help2man-preload-intl.patch;h=2fbc34bbc6bc7a36414257a29fee13944f5c087c;hb=b47c3b0de257e3cda4455e16e196e629c69d28e7
+
+LD_PRELOAD by itself only works with Cygwin builtin functions, but
+textdomain() and friends come from libintl.  In order to override
+those functions, we have to "replace" cygintl-?.dll since functions are
+bound to a DLL name at link time.  Our replacement will be used since
+it is loaded first by LD_PRELOAD.
+
+But as we are making this *the* libintl, we need to provide 
+pass-throughs for the other functions which we're not overriding,
+otherwise Locale::gettext won't load (not to mention the program
+that we're trying to help2man).
+
+--- origsrc/help2man-1.48.5/Makefile.in	2020-03-15 04:52:00.000000000 -0600
++++ src/help2man-1.48.5/Makefile.in	2021-09-07 03:10:00.000000000 -0600
+@@ -76,7 +76,8 @@ install_base:
+ 
+ install_preload: preload
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
+-	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
++	$(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir)
++	ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so
+ 
+ install_l10n: msg_l10n man_l10n info_l10n
+ 	set -e; \
+@@ -145,7 +146,9 @@ $(target).h2m: $(srcdir)/$(target).h2m.PL
+ 
+ preload: $(preload).so
+ $(preload).so: $(srcdir)/$(preload).c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
++	mkdir -p lib
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS)
++	ln -sf lib/cygintl-8.dll $@
+ 
+ man: $(target).1
+ $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL
+--- origsrc/help2man-1.48.5/bindtextdomain.c	2009-11-13 00:01:34.000000000 -0600
++++ src/help2man-1.48.5/bindtextdomain.c	2011-12-29 00:24:33.608078600 -0600
+@@ -36,12 +36,34 @@ static char *(*r_textdomain)(char const *) = 0;
+ static char *(*r_bindtextdomain)(char const *, char const *) = 0;
+ static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0;
+ 
++#ifdef __CYGWIN__
++static void *RTLD_NEXT = 0;
++static char *(*r_gettext)(const char *) = 0;
++static char *(*r_dgettext)(const char *, const char *) = 0;
++static char *(*r_dcgettext)(const char *, const char *, int) = 0;
++static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0;
++static char *(*r_dngettext)(const char *, const char *, const char *,
++                            unsigned long int) = 0;
++static char *(*r_dcngettext)(const char *, const char *, const char *,
++                             unsigned long int, int) = 0;
++static char *(*r_setlocale)(int, const char *) = 0;
++
++#define SYM(sym) libintl_ ## sym
++#else
++#define SYM(sym) sym
++#endif
++
+ void setup()
+ {
+     static int done = 0;
+     if (done++)
+         return;
+ 
++#ifdef __CYGWIN__
++    if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY)))
++        die("libintl8 not found");
++#endif
++
+     if (!(e_textdomain = getenv("TEXTDOMAIN")))
+ 	die("TEXTDOMAIN not set");
+ 
+@@ -57,9 +79,19 @@ void setup()
+     if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT,
+     					    "bind_textdomain_codeset")))
+ 	die("can't find symbol \"bind_textdomain_codeset\"");
++
++#ifdef __CYGWIN__
++    r_gettext = dlsym(RTLD_NEXT, "libintl_gettext");
++    r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext");
++    r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext");
++    r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext");
++    r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext");
++    r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext");
++    r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale");
++#endif
+ }
+ 
+-char *textdomain(char const *domainname)
++char *SYM(textdomain)(char const *domainname)
+ {
+     char *r;
+     setup();
+@@ -70,7 +102,7 @@ char *textdomain(char const *domainname)
+     return r;
+ }
+ 
+-char *bindtextdomain(char const *domainname, char const *dirname)
++char *SYM(bindtextdomain)(char const *domainname, char const *dirname)
+ {
+     char const *dir = dirname;
+     setup();
+@@ -80,7 +112,7 @@ char *bindtextdomain(char const *domainname,
+     return r_bindtextdomain(domainname, dir);
+ }
+ 
+-char *bind_textdomain_codeset(char const *domainname, char const *codeset)
++char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset)
+ {
+     char *r;
+     setup();
+@@ -90,3 +122,54 @@ char *bind_textdomain_codeset(char const
+ 
+     return r;
+ }
++
++#ifdef __CYGWIN__
++
++char *libintl_gettext(const char *msgid)
++{
++    setup();
++    return r_gettext(msgid);
++}
++
++char *libintl_dgettext (const char *domainname, const char *msgid)
++{
++    setup();
++    return r_dgettext(domainname, msgid);
++}
++
++char *libintl_dcgettext (const char *domainname, const char *msgid,
++                         int category)
++{
++    setup();
++    return r_dcgettext (domainname, msgid, category);
++}
++
++char *libintl_ngettext (const char *msgid1, const char *msgid2,
++                        unsigned long int n)
++{
++    setup();
++    return r_ngettext (msgid1, msgid2, n);
++}
++
++char *libintl_dngettext (const char *domainname, const char *msgid1,
++                         const char *msgid2, unsigned long int n)
++{
++    setup();
++    return r_dngettext (domainname, msgid1, msgid2, n);
++}
++
++char *libintl_dcngettext (const char *domainname,
++                          const char *msgid1, const char *msgid2,
++                          unsigned long int n, int category)
++{
++    setup();
++    return r_dcngettext (domainname, msgid1, msgid2, n, category);
++}
++
++char *libintl_setlocale (int i, const char *s)
++{
++    setup();
++    return r_setlocale (i, s);
++}
++
++#endif

diff --git a/sys-apps/help2man/help2man-1.48.5.ebuild b/sys-apps/help2man/help2man-1.48.5.ebuild
new file mode 100644
index 0000000000..6f98d5da46
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.48.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+
+	use elibc_Cygwin && eapply -p2 "${FILESDIR}"/${PN}-1.48.5-cygwin.patch
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/
@ 2023-05-28  9:42 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2023-05-28  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     b56363705086818bcc46958fe5e7d6fc15e7ca1d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 09:42:01 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 28 09:42:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b5636370

sys-apps/help2man: migrate to gx86

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/help2man/Manifest                         |   2 -
 .../help2man/files/help2man-1.46.1-linguas.patch   |  67 ---------
 .../help2man/files/help2man-1.47.16-cygwin.patch   | 165 --------------------
 .../help2man/files/help2man-1.48.5-cygwin.patch    | 167 ---------------------
 sys-apps/help2man/help2man-1.47.16.ebuild          |  44 ------
 sys-apps/help2man/help2man-1.48.5.ebuild           |  44 ------
 sys-apps/help2man/metadata.xml                     |   8 -
 7 files changed, 497 deletions(-)

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
deleted file mode 100644
index 591e813c6c..0000000000
--- a/sys-apps/help2man/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1

diff --git a/sys-apps/help2man/files/help2man-1.46.1-linguas.patch b/sys-apps/help2man/files/help2man-1.46.1-linguas.patch
deleted file mode 100644
index b4631bfa7c..0000000000
--- a/sys-apps/help2man/files/help2man-1.46.1-linguas.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-respect user LINGUAS
-
---- help2man-1.46.1/Makefile.in
-+++ help2man-1.46.1/Makefile.in
-@@ -27,8 +27,15 @@
- export VPATH = .:$(srcdir)
- 
- DESTDIR =
--LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
--LINGUAS_TEXI = $(basename $(notdir $(wildcard $(srcdir)/po-texi/*.po)))
-+ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
-+ALL_LINGUAS_TEXI = $(basename $(notdir $(wildcard $(srcdir)/po-texi/*.po)))
-+ifeq ($(LINGUAS),)
-+INSTALL_LINGUAS = $(ALL_LINGUAS)
-+INSTALL_LINGUAS_TEXI = $(ALL_LINGUAS_TEXI)
-+else
-+INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS))
-+INSTALL_LINGUAS_TEXI = $(filter $(LINGUAS),$(ALL_LINGUAS_TEXI))
-+endif
- 
- CC = @CC@
- PERL = @PERL@
-@@ -80,7 +87,7 @@
- 
- install_l10n: install_dirs msg_l10n man_l10n info_l10n
- 	set -e; \
--	for lang in $(LINGUAS); \
-+	for lang in $(INSTALL_LINGUAS); \
- 	do \
- 	    $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 	    $(INSTALL_DATA) $$($(FIND_VPATH) po/$$lang.gmo) \
-@@ -89,7 +96,7 @@
- 	    $(INSTALL_DATA) $$($(FIND_VPATH) $(target).$$lang.1) \
- 		$(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
- 	done; \
--	for lang in $(LINGUAS_TEXI); \
-+	for lang in $(INSTALL_LINGUAS_TEXI); \
- 	do \
- 	    $(INSTALL_DATA) $$($(FIND_VPATH) $(target)-$$lang.info) \
- 		$(DESTDIR)$(infodir)/$(target)-$$lang.info; \
-@@ -151,7 +158,7 @@
- 	$(MAKE) $(target) $(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 $@ $?
-@@ -161,7 +168,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,%,$@); \
-@@ -184,7 +191,7 @@
- $(target).info: $(srcdir)/$(target).texi
- 	$(MAKEINFO) $? -o $@
- 
--info_l10n: $(addprefix $(target)-,$(addsuffix .info,$(LINGUAS_TEXI)))
-+info_l10n: $(addprefix $(target)-,$(addsuffix .info,$(ALL_LINGUAS_TEXI)))
- $(target)-%.info: $(target)-%.texi
- 	$(MAKEINFO) $? -o $@.tmp
- 	$(FIXUP_TEXI_TRANS) -o $@ $@.tmp

diff --git a/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch b/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch
deleted file mode 100644
index e1dd22b8b1..0000000000
--- a/sys-apps/help2man/files/help2man-1.47.16-cygwin.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-LD_PRELOAD by itself only works with Cygwin builtin functions, but
-textdomain() and friends come from libintl.  In order to override
-those functions, we have to "replace" cygintl-?.dll since functions are
-bound to a DLL name at link time.  Our replacement will be used since
-it is loaded first by LD_PRELOAD.
-
-But as we are making this *the* libintl, we need to provide 
-pass-throughs for the other functions which we're not overriding,
-otherwise Locale::gettext won't load (not to mention the program
-that we're trying to help2man).
-
---- origsrc/help2man-1.40.4/bindtextdomain.c	2009-11-13 00:01:34.000000000 -0600
-+++ src/help2man-1.40.4/bindtextdomain.c	2011-12-29 00:24:33.608078600 -0600
-@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const
- static char *(*r_bindtextdomain)(char const *, char const *) = 0;
- static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0;
- 
-+#ifdef __CYGWIN__
-+static void *RTLD_NEXT = 0;
-+static char *(*r_gettext)(const char *) = 0;
-+static char *(*r_dgettext)(const char *, const char *) = 0;
-+static char *(*r_dcgettext)(const char *, const char *, int) = 0;
-+static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0;
-+static char *(*r_dngettext)(const char *, const char *, const char *,
-+                            unsigned long int) = 0;
-+static char *(*r_dcngettext)(const char *, const char *, const char *,
-+                             unsigned long int, int) = 0;
-+static char *(*r_setlocale)(int, const char *) = 0;
-+
-+#define SYM(sym) libintl_ ## sym
-+#else
-+#define SYM(sym) sym
-+#endif
-+
- void setup()
- {
-     static int done = 0;
-     if (done++)
-         return;
- 
-+#ifdef __CYGWIN__
-+    if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY)))
-+        die("libintl8 not found");
-+#endif
-+
-     if (!(e_textdomain = getenv("TEXTDOMAIN")))
- 	die("TEXTDOMAIN not set");
- 
-@@ -48,9 +70,19 @@ void setup()
-     if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT,
-     					    "bind_textdomain_codeset")))
- 	die("can't find symbol \"bind_textdomain_codeset\"");
-+
-+#ifdef __CYGWIN__
-+    r_gettext = dlsym(RTLD_NEXT, "libintl_gettext");
-+    r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext");
-+    r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext");
-+    r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext");
-+    r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext");
-+    r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext");
-+    r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale");
-+#endif
- }
- 
--char *textdomain(char const *domainname)
-+char *SYM(textdomain)(char const *domainname)
- {
-     char *r;
-     setup();
-@@ -61,7 +93,7 @@ char *textdomain(char const *domainname)
-     return r;
- }
- 
--char *bindtextdomain(char const *domainname, char const *dirname)
-+char *SYM(bindtextdomain)(char const *domainname, char const *dirname)
- {
-     char const *dir = dirname;
-     setup();
-@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn
-     return r_bindtextdomain(domainname, dir);
- }
- 
--char *bind_textdomain_codeset(char const *domainname, char const *codeset)
-+char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset)
- {
-     char *r;
-     setup();
-@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const
- 
-     return r;
- }
-+
-+#ifdef __CYGWIN__
-+
-+char *libintl_gettext(const char *msgid)
-+{
-+    setup();
-+    return r_gettext(msgid);
-+}
-+
-+char *libintl_dgettext (const char *domainname, const char *msgid)
-+{
-+    setup();
-+    return r_dgettext(domainname, msgid);
-+}
-+
-+char *libintl_dcgettext (const char *domainname, const char *msgid,
-+                         int category)
-+{
-+    setup();
-+    return r_dcgettext (domainname, msgid, category);
-+}
-+
-+char *libintl_ngettext (const char *msgid1, const char *msgid2,
-+                        unsigned long int n)
-+{
-+    setup();
-+    return r_ngettext (msgid1, msgid2, n);
-+}
-+
-+char *libintl_dngettext (const char *domainname, const char *msgid1,
-+                         const char *msgid2, unsigned long int n)
-+{
-+    setup();
-+    return r_dngettext (domainname, msgid1, msgid2, n);
-+}
-+
-+char *libintl_dcngettext (const char *domainname,
-+                          const char *msgid1, const char *msgid2,
-+                          unsigned long int n, int category)
-+{
-+    setup();
-+    return r_dcngettext (domainname, msgid1, msgid2, n, category);
-+}
-+
-+char *libintl_setlocale (int i, const char *s)
-+{
-+    setup();
-+    return r_setlocale (i, s);
-+}
-+
-+#endif
---- src/help2man-1.47.16/Makefile.in
-+++ src/help2man-1.47.16/Makefile.in
-@@ -83,7 +83,8 @@ install_base:
- 
- install_preload: preload
- 	$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
--	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
-+	$(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir)
-+	ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so
- 
- install_l10n: msg_l10n man_l10n info_l10n
- 	set -e; \
-@@ -152,7 +153,9 @@ $(target).h2m: $(srcdir)/$(target).h2m.PL
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	mkdir -p lib
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS)
-+	ln -sf lib/cygintl-8.dll $@
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL

diff --git a/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch b/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch
deleted file mode 100644
index aa75d10e38..0000000000
--- a/sys-apps/help2man/files/help2man-1.48.5-cygwin.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-https://cygwin.com/git-cygwin-packages/?p=git/cygwin-packages/help2man.git;a=blob;f=help2man-preload-intl.patch;h=2fbc34bbc6bc7a36414257a29fee13944f5c087c;hb=b47c3b0de257e3cda4455e16e196e629c69d28e7
-
-LD_PRELOAD by itself only works with Cygwin builtin functions, but
-textdomain() and friends come from libintl.  In order to override
-those functions, we have to "replace" cygintl-?.dll since functions are
-bound to a DLL name at link time.  Our replacement will be used since
-it is loaded first by LD_PRELOAD.
-
-But as we are making this *the* libintl, we need to provide 
-pass-throughs for the other functions which we're not overriding,
-otherwise Locale::gettext won't load (not to mention the program
-that we're trying to help2man).
-
---- origsrc/help2man-1.48.5/Makefile.in	2020-03-15 04:52:00.000000000 -0600
-+++ src/help2man-1.48.5/Makefile.in	2021-09-07 03:10:00.000000000 -0600
-@@ -76,7 +76,8 @@ install_base:
- 
- install_preload: preload
- 	$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
--	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
-+	$(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir)
-+	ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so
- 
- install_l10n: msg_l10n man_l10n info_l10n
- 	set -e; \
-@@ -145,7 +146,9 @@ $(target).h2m: $(srcdir)/$(target).h2m.PL
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	mkdir -p lib
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS)
-+	ln -sf lib/cygintl-8.dll $@
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL
---- origsrc/help2man-1.48.5/bindtextdomain.c	2009-11-13 00:01:34.000000000 -0600
-+++ src/help2man-1.48.5/bindtextdomain.c	2011-12-29 00:24:33.608078600 -0600
-@@ -36,12 +36,34 @@ static char *(*r_textdomain)(char const *) = 0;
- static char *(*r_bindtextdomain)(char const *, char const *) = 0;
- static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0;
- 
-+#ifdef __CYGWIN__
-+static void *RTLD_NEXT = 0;
-+static char *(*r_gettext)(const char *) = 0;
-+static char *(*r_dgettext)(const char *, const char *) = 0;
-+static char *(*r_dcgettext)(const char *, const char *, int) = 0;
-+static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0;
-+static char *(*r_dngettext)(const char *, const char *, const char *,
-+                            unsigned long int) = 0;
-+static char *(*r_dcngettext)(const char *, const char *, const char *,
-+                             unsigned long int, int) = 0;
-+static char *(*r_setlocale)(int, const char *) = 0;
-+
-+#define SYM(sym) libintl_ ## sym
-+#else
-+#define SYM(sym) sym
-+#endif
-+
- void setup()
- {
-     static int done = 0;
-     if (done++)
-         return;
- 
-+#ifdef __CYGWIN__
-+    if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY)))
-+        die("libintl8 not found");
-+#endif
-+
-     if (!(e_textdomain = getenv("TEXTDOMAIN")))
- 	die("TEXTDOMAIN not set");
- 
-@@ -57,9 +79,19 @@ void setup()
-     if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT,
-     					    "bind_textdomain_codeset")))
- 	die("can't find symbol \"bind_textdomain_codeset\"");
-+
-+#ifdef __CYGWIN__
-+    r_gettext = dlsym(RTLD_NEXT, "libintl_gettext");
-+    r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext");
-+    r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext");
-+    r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext");
-+    r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext");
-+    r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext");
-+    r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale");
-+#endif
- }
- 
--char *textdomain(char const *domainname)
-+char *SYM(textdomain)(char const *domainname)
- {
-     char *r;
-     setup();
-@@ -70,7 +102,7 @@ char *textdomain(char const *domainname)
-     return r;
- }
- 
--char *bindtextdomain(char const *domainname, char const *dirname)
-+char *SYM(bindtextdomain)(char const *domainname, char const *dirname)
- {
-     char const *dir = dirname;
-     setup();
-@@ -80,7 +112,7 @@ char *bindtextdomain(char const *domainname,
-     return r_bindtextdomain(domainname, dir);
- }
- 
--char *bind_textdomain_codeset(char const *domainname, char const *codeset)
-+char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset)
- {
-     char *r;
-     setup();
-@@ -90,3 +122,54 @@ char *bind_textdomain_codeset(char const
- 
-     return r;
- }
-+
-+#ifdef __CYGWIN__
-+
-+char *libintl_gettext(const char *msgid)
-+{
-+    setup();
-+    return r_gettext(msgid);
-+}
-+
-+char *libintl_dgettext (const char *domainname, const char *msgid)
-+{
-+    setup();
-+    return r_dgettext(domainname, msgid);
-+}
-+
-+char *libintl_dcgettext (const char *domainname, const char *msgid,
-+                         int category)
-+{
-+    setup();
-+    return r_dcgettext (domainname, msgid, category);
-+}
-+
-+char *libintl_ngettext (const char *msgid1, const char *msgid2,
-+                        unsigned long int n)
-+{
-+    setup();
-+    return r_ngettext (msgid1, msgid2, n);
-+}
-+
-+char *libintl_dngettext (const char *domainname, const char *msgid1,
-+                         const char *msgid2, unsigned long int n)
-+{
-+    setup();
-+    return r_dngettext (domainname, msgid1, msgid2, n);
-+}
-+
-+char *libintl_dcngettext (const char *domainname,
-+                          const char *msgid1, const char *msgid2,
-+                          unsigned long int n, int category)
-+{
-+    setup();
-+    return r_dcngettext (domainname, msgid1, msgid2, n, category);
-+}
-+
-+char *libintl_setlocale (int i, const char *s)
-+{
-+    setup();
-+    return r_setlocale (i, s);
-+}
-+
-+#endif

diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
deleted file mode 100644
index e04d52721d..0000000000
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-
-	use elibc_Cygwin && eapply -p2 "${FILESDIR}"/${PN}-1.47.16-cygwin.patch
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/help2man/help2man-1.48.5.ebuild b/sys-apps/help2man/help2man-1.48.5.ebuild
deleted file mode 100644
index 0e344537a3..0000000000
--- a/sys-apps/help2man/help2man-1.48.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-
-	use elibc_Cygwin && eapply -p2 "${FILESDIR}"/${PN}-1.48.5-cygwin.patch
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
deleted file mode 100644
index 73dda144f9..0000000000
--- a/sys-apps/help2man/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-05-28  9:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-30 11:50 [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/ Michael Haubenwallner
  -- strict thread matches above, loose matches on Subject: below --
2020-12-08  3:20 Sam James
2022-01-16  6:29 Sam James
2023-05-28  9:42 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox