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() {
