From 30c2cb2c8971dc95b672303f9191d166d622fe47 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2022 03:19:10 +0000 Subject: gentoo auto-resync : 06:11:2022 - 03:19:10 --- sys-apps/man2html/Manifest | 4 +- .../files/man-1.6g-clang-15-configure.patch | 24 +++++----- sys-apps/man2html/man2html-1.6g-r1.ebuild | 52 ---------------------- sys-apps/man2html/man2html-1.6g-r2.ebuild | 52 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 65 deletions(-) delete mode 100644 sys-apps/man2html/man2html-1.6g-r1.ebuild create mode 100644 sys-apps/man2html/man2html-1.6g-r2.ebuild (limited to 'sys-apps/man2html') diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest index 8e1f55e99c47..9c0a953833b5 100644 --- a/sys-apps/man2html/Manifest +++ b/sys-apps/man2html/Manifest @@ -1,8 +1,8 @@ AUX man-1.6-cross-compile.patch 1747 BLAKE2B 4fca1280617283151ddf037d12b97d65ac35adff109d932b9b0b7700de15be195990b56db9c90d1eb8a88a4885f733b9e3383f063ca30a7300fdd9b2274e845f SHA512 6155dc5f530c1d3bbe50291e61555b6f63515e3198388ffa66d1c3d3b359ad1f6d143d99607a27aefdc710867b668a86608eafa68151752cf9cdfb5c25ac192a AUX man-1.6f-man2html-compression-2.patch 1741 BLAKE2B 51baebadffcc5f58eb7b980c0eddac550ecc98a682ced9ca0ffae6318a806536e42ae5f13d1d061ddd2d41f6ef792f2eb6eac1c1a00e2a8f730de54a3b6589f5 SHA512 85dfdffaaddefff9bfb7b92ab274dcc2e88d880d11c67b0690ff4a92a2a6d3a3b65ad4d425f09bfd042b041b316ec9cb6d1ba6e0a4c13fdf71c9524c50ffe7d0 -AUX man-1.6g-clang-15-configure.patch 2578 BLAKE2B 488cad5a684fff0187159823e8e0b0bddeade907acb082ee4e238b3b1826e3c028ec17518526c6b1b67290c8c15e6617b321d09fffb8de6d248f4ef017274300 SHA512 0cc9a6f6bbb9cee9ca7c3acc1c71788e79982ee57012bb15a5f529d3d120e117a0cc4c91dec2f395542b4b347fa7b9a4c7b8fd2ad2ae5ae330e3d9617847b0fa +AUX man-1.6g-clang-15-configure.patch 2654 BLAKE2B 902ad27f926c73a0abd002d27f66a8c274acce535e93d108e68faa7d3eb8b6577765b27ba22b6e913b0ac9cac33aabd7b7abfcf4a12578b78eded07bd886a72a SHA512 7d9690c99444f8da49d10bdbe2cec6a03126e43b06bc658ceb201a1898846d00b5e1baa8afda64d91e31eee15dfcdf3c7e9ee27485a0a0389b552f7aa9b6943b AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b -EBUILD man2html-1.6g-r1.ebuild 1158 BLAKE2B 36cb072f1c810b5220410a75b990e69c21961616dd577e0cdfa9342c0fc2528078957196528e68e1c2d8b89d8e2156fd67240f52458d83be075be37da3d2d01f SHA512 18e3b662d1e1783d6368a75a83856a0c28b709fd4707e7c260f9802a75a21266d62a30c8fad88e3e6de624b60543ff52802a5d03ca8f5d1210f6c8b706c753c2 +EBUILD man2html-1.6g-r2.ebuild 1158 BLAKE2B 36cb072f1c810b5220410a75b990e69c21961616dd577e0cdfa9342c0fc2528078957196528e68e1c2d8b89d8e2156fd67240f52458d83be075be37da3d2d01f SHA512 18e3b662d1e1783d6368a75a83856a0c28b709fd4707e7c260f9802a75a21266d62a30c8fad88e3e6de624b60543ff52802a5d03ca8f5d1210f6c8b706c753c2 EBUILD man2html-1.6g.ebuild 1103 BLAKE2B 5db03510f781f75825ccb1ee61342ef3f4bc9f58dc3d6485c6f9d884cae669377d41342020fd18a429a05feca4e79c5936445e7c667e9f8d0c9bea0e6f3b0388 SHA512 13728b5069e2221f7c2482a2ed7f3139eca26a5dfa006a665ab02587e3d94f945570d67f2410cd33dd27bf32005f54f55d658c21517a84aff7001cfd4128c6da MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/man2html/files/man-1.6g-clang-15-configure.patch b/sys-apps/man2html/files/man-1.6g-clang-15-configure.patch index 783693059e2f..c15617b56e84 100644 --- a/sys-apps/man2html/files/man-1.6g-clang-15-configure.patch +++ b/sys-apps/man2html/files/man-1.6g-clang-15-configure.patch @@ -5,7 +5,7 @@ echo "#include #include -main() { exit(0); strerror(0); }" > conftest.c -+int main() { exit(0); strerror(0); }" > conftest.c ++int main(void) { exit(0); strerror(0); }" > conftest.c eval $compile if test -s conftest && ./conftest 2>/dev/null; then DEFS="$DEFS -DSTDC_HEADERS" @@ -15,7 +15,7 @@ echo "#include -main() { exit(0); }" > conftest.c +#include -+int main() { exit(0); }" > conftest.c ++int main(void) { exit(0); }" > conftest.c eval $compile if test -s conftest && ./conftest 2>/dev/null; then DEFS="$DEFS -DTERMIOS_HEADER" @@ -26,7 +26,7 @@ +#include #ifdef _POSIX_VERSION -main() { exit(0); } -+int main() { exit(0); } ++int main(void) { exit(0); } #else # error no _POSIX_VERSION #endif" > conftest.c @@ -36,7 +36,7 @@ echo "#include -main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c +#include -+int main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c ++int main(void) { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c eval $compile if test -s conftest ; then : else DEFS="$DEFS -DUSG" @@ -46,36 +46,38 @@ echo '#include -main() { uid_t x; exit(0); }' > conftest.c +#include -+int main() { uid_t x; exit(0); }' > conftest.c ++int main(void) { uid_t x; exit(0); }' > conftest.c eval $compile if test -s conftest ; then : else -@@ -300,7 +304,7 @@ char *alloca (); +@@ -300,7 +304,8 @@ char *alloca (); #endif #endif #endif -main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c -+int main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c ++#include ++int main(void) { char *p = (char *) alloca(1); exit(0); }' > conftest.c eval $compile if test -s conftest ; then : elif test -d /usr/ucblib; then LIBS="$LIBS -L/usr/ucblib -lucb" -@@ -312,7 +316,7 @@ rm -f conftest conftest.c +@@ -312,7 +317,8 @@ rm -f conftest conftest.c if [ $usenls = true ]; then echo checking for nls echo '#include - main() {nl_catd catfd; exit(0); }' > conftest.c -+ int main() {nl_catd catfd; exit(0); }' > conftest.c ++ #include ++ int main(void) {nl_catd catfd; exit(0); }' > conftest.c eval $compile if test -s conftest && ./conftest 2>/dev/null; then : else -@@ -329,8 +333,9 @@ echo checking for getopt.h +@@ -329,8 +335,9 @@ echo checking for getopt.h echo '#define _GNU_SOURCE #include #include +#include struct option long_opts[] = { { "", no_argument, NULL, 0 } }; -main() { exit(0); }' > conftest.c -+int main() { exit(0); }' > conftest.c ++int main(void) { exit(0); }' > conftest.c eval $compile if test -s conftest ; then manpathoption="--path" diff --git a/sys-apps/man2html/man2html-1.6g-r1.ebuild b/sys-apps/man2html/man2html-1.6g-r1.ebuild deleted file mode 100644 index e9d4766f3b43..000000000000 --- a/sys-apps/man2html/man2html-1.6g-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -MY_P="man-${PV}" - -DESCRIPTION="Standard commands to read man pages" -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" -SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND="!sys-apps/man" - -PATCHES=( - "${FILESDIR}"/man-1.6f-man2html-compression-2.patch - "${FILESDIR}"/man-1.6-cross-compile.patch - "${FILESDIR}"/man-1.6g-compress.patch #205147 - "${FILESDIR}"/man-1.6g-clang-15-configure.patch -) - -src_configure() { - tc-export CC BUILD_CC - - # Just a stub to disable configure check. man2html doesn't use it. - export COMPRESS=true - edo ./configure \ - -confdir=/etc \ - +sgid +fhs \ - +lang none -} - -src_compile() { - emake {src,man2html}/Makefile - emake -C src version.h - emake -C man2html -} - -src_install() { - # A little faster to run this by hand than `emake install`. - cd man2html || die - - dobin man2html - doman man2html.1 - dodoc README TODO -} diff --git a/sys-apps/man2html/man2html-1.6g-r2.ebuild b/sys-apps/man2html/man2html-1.6g-r2.ebuild new file mode 100644 index 000000000000..e9d4766f3b43 --- /dev/null +++ b/sys-apps/man2html/man2html-1.6g-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +MY_P="man-${PV}" + +DESCRIPTION="Standard commands to read man pages" +HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" +SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND="!sys-apps/man" + +PATCHES=( + "${FILESDIR}"/man-1.6f-man2html-compression-2.patch + "${FILESDIR}"/man-1.6-cross-compile.patch + "${FILESDIR}"/man-1.6g-compress.patch #205147 + "${FILESDIR}"/man-1.6g-clang-15-configure.patch +) + +src_configure() { + tc-export CC BUILD_CC + + # Just a stub to disable configure check. man2html doesn't use it. + export COMPRESS=true + edo ./configure \ + -confdir=/etc \ + +sgid +fhs \ + +lang none +} + +src_compile() { + emake {src,man2html}/Makefile + emake -C src version.h + emake -C man2html +} + +src_install() { + # A little faster to run this by hand than `emake install`. + cd man2html || die + + dobin man2html + doman man2html.1 + dodoc README TODO +} -- cgit v1.2.3