Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, www-misc/wsmake/files/, www-misc/wsmake/
Date: Sat, 18 Mar 2023 16:45:35
Message-Id: 1679157779.063129fdf7c4a1d516c3c08fd3263f25901bcc89.soap@gentoo
1 commit: 063129fdf7c4a1d516c3c08fd3263f25901bcc89
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 18 16:42:59 2023 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 18 16:42:59 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063129fd
7
8 www-misc/wsmake: treeclean
9
10 Closes: https://bugs.gentoo.org/726094
11 Closes: https://bugs.gentoo.org/806384
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 profiles/package.mask | 7 ----
15 www-misc/wsmake/Manifest | 1 -
16 .../files/wsmake-0.6.4-fix-const-va_list.patch | 29 --------------
17 www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch | 33 ----------------
18 www-misc/wsmake/metadata.xml | 5 ---
19 www-misc/wsmake/wsmake-0.6.4-r1.ebuild | 44 ----------------------
20 6 files changed, 119 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 0b45ed3496d2..d49117cf9362 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -288,13 +288,6 @@ acct-group/jabber
27 # Commands trigger an assertion and crashes, bug #892487
28 =sys-fs/lvm2-2.03.18
29
30 -# Michał Górny <mgorny@g.o> (2023-01-26)
31 -# Unmaintained. Last release in 2003. The package fails to install
32 -# since Aug 2021 and while a fix would be trivial, there does not seem
33 -# to have been any interest in it during that period.
34 -# Removal on 2023-02-25. Bug #806384.
35 -www-misc/wsmake
36 -
37 # Michał Górny <mgorny@g.o> (2023-01-25)
38 # Unmaintained. Multiple build failure bugs reported. This version
39 # predates 2008.
40
41 diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
42 deleted file mode 100644
43 index 8b30b6ff26f3..000000000000
44 --- a/www-misc/wsmake/Manifest
45 +++ /dev/null
46 @@ -1 +0,0 @@
47 -DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
48
49 diff --git a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
50 deleted file mode 100644
51 index 420bbb61b030..000000000000
52 --- a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
53 +++ /dev/null
54 @@ -1,29 +0,0 @@
55 ---- a/libwsmake/wsUtil.cpp
56 -+++ b/libwsmake/wsUtil.cpp
57 -@@ -710,13 +710,13 @@
58 - }
59 - }
60 -
61 --void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap)
62 -+void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap)
63 - {
64 - if(__wsmake_quiet) return;
65 -
66 - vfprintf(out,output,*ap);
67 - //BV: this does not compile: va_end((void*&)*ap);
68 -- va_end((char*&)*ap);
69 -+ va_end(*ap);
70 - }
71 -
72 - #ifdef DEBUG
73 ---- a/libwsmake/wsUtil.h
74 -+++ b/libwsmake/wsUtil.h
75 -@@ -77,7 +77,7 @@
76 - void __wsmake_print_error(const char *, ...);
77 - void __wsmake_print(const char *, ...);
78 - void __wsmake_print(int, const char *, ...);
79 -- void __wsmake_print_it(FILE *, const char *, const va_list *);
80 -+ void __wsmake_print_it(FILE *, const char *, va_list *);
81 - }
82 -
83 - #endif /* __WSUTIL_H__ */
84
85 diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
86 deleted file mode 100644
87 index 9028c0695546..000000000000
88 --- a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
89 +++ /dev/null
90 @@ -1,33 +0,0 @@
91 -https://bugs.gentoo.org/show_bug.cgi?id=251745
92 -https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982
93 -
94 ---- a/libwsmake/wsSubTag.cpp
95 -+++ b/libwsmake/wsSubTag.cpp
96 -@@ -22,6 +22,7 @@
97 - ***********************************************************************/
98 - #include <cstdio>
99 - #include <cstring>
100 -+#include <cstdlib>
101 -
102 - #include <unistd.h>
103 - #ifdef HAVE_SYS_WAIT_H
104 ---- a/libwsmake/wsWebPage.cpp
105 -+++ b/libwsmake/wsWebPage.cpp
106 -@@ -23,6 +23,7 @@
107 - #include <cassert>
108 - #include <cerrno>
109 - #include <ctime>
110 -+#include <cstdlib>
111 -
112 - #include "wsmake.h"
113 -
114 ---- a/libwsmake/wsUtil.cpp
115 -+++ b/libwsmake/wsUtil.cpp
116 -@@ -28,6 +28,7 @@
117 - #include <cassert>
118 - #include <cerrno>
119 - #include <cstring>
120 -+#include <cstdlib>
121 -
122 - #ifdef HAVE_UTIME_H
123 - #include <utime.h>
124
125 diff --git a/www-misc/wsmake/metadata.xml b/www-misc/wsmake/metadata.xml
126 deleted file mode 100644
127 index 85e4ed814fa2..000000000000
128 --- a/www-misc/wsmake/metadata.xml
129 +++ /dev/null
130 @@ -1,5 +0,0 @@
131 -<?xml version="1.0" encoding="UTF-8"?>
132 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
133 -<pkgmetadata>
134 -<!-- maintainer-needed -->
135 -</pkgmetadata>
136
137 diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
138 deleted file mode 100644
139 index a0bf513caf90..000000000000
140 --- a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
141 +++ /dev/null
142 @@ -1,44 +0,0 @@
143 -# Copyright 1999-2021 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=7
147 -
148 -inherit toolchain-funcs
149 -
150 -DESCRIPTION="Website pre-processor features tag substitution and page ordering"
151 -HOMEPAGE="https://sourceforge.net/projects/wsmake/"
152 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
153 -
154 -LICENSE="GPL-2+ Artistic"
155 -SLOT="0"
156 -KEYWORDS="~amd64 x86"
157 -IUSE="examples"
158 -
159 -PATCHES=(
160 - "${FILESDIR}"/${P}-bv.diff
161 - "${FILESDIR}"/${P}-gcc43.patch # 251745
162 - "${FILESDIR}"/${P}-fix-const-va_list.patch
163 -)
164 -
165 -src_unpack() {
166 - default
167 -
168 - cd "${S}"/doc || die
169 - tar -cf examples.tar examples || die
170 -}
171 -
172 -src_configure() {
173 - tc-export CXX
174 - default
175 -}
176 -
177 -src_install() {
178 - default
179 - dodoc doc/manual.txt
180 -
181 - if use examples; then
182 - rm -r doc/examples/CVS || die
183 - dodoc -r doc/examples
184 - docompress -x /usr/share/doc/${PF}/examples
185 - fi
186 -}