From a152c669e7ec3bb6ae13b747b985e2ece3b58b0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jun 2023 01:25:35 +0100 Subject: gentoo auto-resync : 24:06:2023 - 01:25:35 --- sys-power/Manifest.gz | Bin 5062 -> 5060 bytes sys-power/nut/Manifest | 1 - .../files/nut-2.8.0-fix-man-page-generation.patch | 64 --------------------- 3 files changed, 65 deletions(-) delete mode 100644 sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch (limited to 'sys-power') diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz index 5694e44cd31d..30daac08fc6b 100644 Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index d993323a3e5e..07d389236486 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -8,7 +8,6 @@ AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950a AUX nut-2.7.4-nut-scanner.patch 1615 BLAKE2B dd672f2996ca650a6456084dc92d6a9c6ea1b0fe2d1b812bffcfdefda5e797f3f89e19e325f5a2d9ba066b077b9855d2403e111038bd4024f255f2fee243f500 SHA512 5db031aa5c74e4987824b2ac7a5f6e073de16b8958104ceabb7482a6c6b7779d8380fc30b6189ca2cfee9ab795a7413e537d093b0a338aee73d3385b54d280d7 AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b AUX nut-2.7.4-slibtool.patch 2470 BLAKE2B 6baadd663f83209f3abbb4a6b83f170df56da07bb679f6e47571151406c879cfe9a0dbe17fa72678ca66fdcd07ad07bfb8a38e4821cf529e9367a71fad18de69 SHA512 9dfa6c38a56dcf6d743e4ea4eb46ff5e4a81e77eb79df97921662e00c6f4bee4f70a845c3e49ef5ecda31e0e90b8e7f5b450a9c3cd8c5742b093409b894556a8 -AUX nut-2.8.0-fix-man-page-generation.patch 2116 BLAKE2B a7842137c2a5d8103bdb456f576948494697b37c7c8ac9a0e960fe32af50302625ef7bebe4a82252dda8a01503854dfd4fa822d06384eb59efb95466ba946fd4 SHA512 bbeb61a804e39e1a061ad19d28b852214195a9b3a5f70f0841871a197ca25dbf618799298d83898560c843425df9c4bbe20f8b4d6fcd2499af57350b162ba8da AUX nut-2.8.0-init.d-upsd 667 BLAKE2B f3ec275cd401df017428c3772fb3f0d51b66173e3d08fdd844e8499bd216b455d6a2846e991c53285092eafc1ad3f43665185c853a438f5331ecd95c2c8c2e30 SHA512 4a58aea9b0119c6ba0949a5d8365cf8785aa49050fb9cb6f6e0ac4d12d1b8e947823d0c41b64500f453fdf236dee6cf60f812c76a65bff9b2ea0f2b713852dc3 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1 AUX nut.powerfail.initd 1305 BLAKE2B 88bd2a1b5b3fbb2ab9ea4d408e4cc57399702c587ec8314c5b78aa5ce03d4de0f4850ecd580140bf5a42947853f7f64953e0a2859fb1f83de185682d6b600500 SHA512 9e171fc192efaa16e554725b6bf40377e648400f6f6e860d436218289fadcf96c7209fed76129d0dfec912dc5702cca11c90fea072767135fe1a2ba8e11ef2ac diff --git a/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch b/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch deleted file mode 100644 index ff224a4774bf..000000000000 --- a/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c0d9ce265c6ca627039845d9544ebbdf87a00f7f Mon Sep 17 00:00:00 2001 -From: Timo Kokkonen -Date: Mon, 11 Jul 2022 20:41:12 +0300 -Subject: [PATCH] docs: man: upsd: Fix driver list when building only some of - drivers - -There are two issues that come up in man page generation when only -some of the drivers are built. - -First is that during configure phase DRIVER_MAN_LIST is collected by -searching any .8 files matching the driver names. This does not work -very well as during the first configure call these files don't exist -yet as none of them are compiled yet. Searching the .txt files where -they are built from works better. - -Second issue is that SRC_DRIVERS_PAGES list needs to contain the -source files where the driver list is generated from. If only some -drivers are built, this needs to be populated from the list of files -we collected to DRIVER_MAN_LIST during configure phase. - -Adding these entries will ensure manpage generation will not fail if -only some of the drivers are built - -Signed-off-by: Timo Kokkonen ---- - configure.ac | 4 ++-- - docs/man/Makefile.am | 6 ++++++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3aa26c24e..a49ca4417 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1745,8 +1745,8 @@ if test "${WITH_MANS}" = "yes"; then - else - DRIVER_MAN_LIST="" - for i in ${DRIVER_BUILD_LIST}; do -- if test -f ${srcdir}/docs/man/$i.8; then -- DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.8" -+ if test -f ${srcdir}/docs/man/$i.txt; then -+ DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.txt" - fi - done - AC_MSG_RESULT(${DRIVER_MAN_LIST}) -diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am -index 0d693a355..a7345264b 100644 ---- a/docs/man/Makefile.am -+++ b/docs/man/Makefile.am -@@ -695,6 +695,12 @@ SRC_DRIVERS_PAGES = \ - $(SRC_MODBUS_PAGES) \ - $(SRC_LINUX_I2C_PAGES) - -+if SOME_DRIVERS -+SRC_DRIVERS_PAGES += \ -+ $(DRIVER_MAN_LIST) -+endif -+ -+ - # distribute everything, even those not installed by default - # Note that 'dist' target requires AsciiDoc! - SRC_ALL_PAGES = \ --- -2.35.1 - -- cgit v1.2.3