[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/, www-misc/wsmake/files/
commit: e1ec4b00ab1bbc561067b3bb8fc49cc3d1f63a0d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 3 12:25:34 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 3 13:18:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ec4b00 www-misc/wsmake: Drop 0.6.4 (r0), EAPI6-- Closes: https://bugs.gentoo.org/799680 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> www-misc/wsmake/files/wsmake-0.6.4-bv.diff | 13 --- www-misc/wsmake/wsmake-0.6.4.ebuild| 37 -- 2 files changed, 50 deletions(-) diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff deleted file mode 100644 index 15cdf05f5d2..000 --- a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff +++ /dev/null @@ -1,13 +0,0 @@ a/libwsmake/wsUtil.cpp -+++ b/libwsmake/wsUtil.cpp -@@ -714,7 +714,8 @@ - if(__wsmake_quiet) return; - - vfprintf(out,output,*ap); -- va_end((void*&)*ap); -+ //BV: this does not compile: va_end((void*&)*ap); -+ va_end((char*&)*ap); - } - - #ifdef DEBUG - diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild deleted file mode 100644 index 42834c03580..000 --- a/www-misc/wsmake/wsmake-0.6.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Website pre-processor features tag substitution and page ordering" -HOMEPAGE="https://sourceforge.net/projects/wsmake/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+ Artistic" -SLOT="0" -KEYWORDS="x86" -IUSE="examples" - -PATCHES=( - "${FILESDIR}"/${P}-bv.diff - "${FILESDIR}"/${P}-gcc43.patch # 251745 - "${FILESDIR}"/${P}-fix-const-va_list.patch -) - -src_unpack() { - default - - cd "${S}"/doc || die - tar -cf examples.tar examples || die -} - -src_install() { - default - dodoc doc/manual.txt - - if use examples; then - rm -r doc/examples/CVS || die - dodoc -r doc/examples - docompress -x /usr/share/doc/${PF}/examples - fi -}
[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/
commit: 6d4721ba2845829534917f482ecddea263c36a78 Author: Sam James gentoo org> AuthorDate: Fri Jul 2 04:08:54 2021 + Commit: Sam James gentoo org> CommitDate: Fri Jul 2 04:08:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4721ba www-misc/wsmake: Stabilize 0.6.4-r1 x86, #799680 Signed-off-by: Sam James gentoo.org> www-misc/wsmake/wsmake-0.6.4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild index eda35ea9e99..a0bf513caf9 100644 --- a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild +++ b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ Artistic" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="examples" PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/
commit: 71b9a8b687b45c4c34bdd79187aa21c644953097 Author: Michał Górny gentoo org> AuthorDate: Mon Jul 15 15:27:14 2019 + Commit: Michał Górny gentoo org> CommitDate: Mon Jul 15 15:27:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b9a8b6 www-misc/wsmake: Sort KEYWORDS Signed-off-by: Michał Górny gentoo.org> www-misc/wsmake/wsmake-0.6.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild index 69070d30091..eda35ea9e99 100644 --- a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild +++ b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ Artistic" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="examples" PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/
commit: 00178d4fd44394bd8db6ac0a42b360d1432a2335 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Apr 22 09:00:49 2019 + Commit: David Seifert gentoo org> CommitDate: Tue Apr 23 09:23:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00178d4f www-misc/wsmake: fix HOMEPAGE, SRC_URI, LICENSE Closes: https://github.com/gentoo/gentoo/pull/11783 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: David Seifert gentoo.org> www-misc/wsmake/wsmake-0.6.4.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild index 83c59948894..42834c03580 100644 --- a/www-misc/wsmake/wsmake-0.6.4.ebuild +++ b/www-misc/wsmake/wsmake-0.6.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -DESCRIPTION="Website Pre-processor" -HOMEPAGE="http://www.wsmake.org/; -SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/${P}.tar.bz2; +DESCRIPTION="Website pre-processor features tag substitution and page ordering" +HOMEPAGE="https://sourceforge.net/projects/wsmake/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="GPL-2 Artistic" +LICENSE="GPL-2+ Artistic" SLOT="0" KEYWORDS="x86" IUSE="examples"
[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/
commit: f8bf34a250973038e1614c6bc0b0f4e5cf468ff8 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Apr 22 09:04:31 2019 + Commit: David Seifert gentoo org> CommitDate: Tue Apr 23 09:23:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bf34a2 www-misc/wsmake: EAPI=7, add amd64, fix calling g++ directly Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: David Seifert gentoo.org> www-misc/wsmake/wsmake-0.6.4-r1.ebuild | 44 ++ 1 file changed, 44 insertions(+) diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild new file mode 100644 index 000..69070d30091 --- /dev/null +++ b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Website pre-processor features tag substitution and page ordering" +HOMEPAGE="https://sourceforge.net/projects/wsmake/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+ Artistic" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="examples" + +PATCHES=( + "${FILESDIR}"/${P}-bv.diff + "${FILESDIR}"/${P}-gcc43.patch # 251745 + "${FILESDIR}"/${P}-fix-const-va_list.patch +) + +src_unpack() { + default + + cd "${S}"/doc || die + tar -cf examples.tar examples || die +} + +src_configure() { + tc-export CXX + default +} + +src_install() { + default + dodoc doc/manual.txt + + if use examples; then + rm -r doc/examples/CVS || die + dodoc -r doc/examples + docompress -x /usr/share/doc/${PF}/examples + fi +}
[gentoo-commits] repo/gentoo:master commit in: www-misc/wsmake/, www-misc/wsmake/files/
commit: 3418e2f50b631976d5943802e112e9a5be8c4f8c Author: David Seifert gentoo org> AuthorDate: Mon Nov 27 10:41:00 2017 + Commit: David Seifert gentoo org> CommitDate: Mon Nov 27 11:20:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3418e2f5 www-misc/wsmake: Port to EAPI 6 Package-Manager: Portage-2.3.16, Repoman-2.3.6 www-misc/wsmake/Manifest | 2 +- www-misc/wsmake/files/wsmake-0.6.4-bv.diff | 4 +-- .../files/wsmake-0.6.4-fix-const-va_list.patch | 29 +++ www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch | 12 +++ www-misc/wsmake/wsmake-0.6.4.ebuild| 42 -- 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest index 9910f5607ec..8b30b6ff26f 100644 --- a/www-misc/wsmake/Manifest +++ b/www-misc/wsmake/Manifest @@ -1 +1 @@ -DIST wsmake-0.6.4.tar.bz2 351688 SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4 WHIRLPOOL a72eae2811936ed27cbdc63fec9bbf25999dbfdc95d0cdf81e357fc5bb130b10571332520e6aae2537707c0a40d08aff6995276487eb4d0b66e70014a44db5ab +DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4 diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff index d10aa5769c2..15cdf05f5d2 100644 --- a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff +++ b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff @@ -1,5 +1,5 @@ libwsmake/wsUtil.cpp.orig Sat Sep 1 22:09:13 2001 -+++ libwsmake/wsUtil.cpp Tue Sep 3 20:19:04 2002 +--- a/libwsmake/wsUtil.cpp b/libwsmake/wsUtil.cpp @@ -714,7 +714,8 @@ if(__wsmake_quiet) return; 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 new file mode 100644 index 000..420bbb61b03 --- /dev/null +++ b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch @@ -0,0 +1,29 @@ +--- a/libwsmake/wsUtil.cpp b/libwsmake/wsUtil.cpp +@@ -710,13 +710,13 @@ + } + } + +-void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap) ++void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap) + { + if(__wsmake_quiet) return; + + vfprintf(out,output,*ap); + //BV: this does not compile: va_end((void*&)*ap); +- va_end((char*&)*ap); ++ va_end(*ap); + } + + #ifdef DEBUG +--- a/libwsmake/wsUtil.h b/libwsmake/wsUtil.h +@@ -77,7 +77,7 @@ + void __wsmake_print_error(const char *, ...); + void __wsmake_print(const char *, ...); + void __wsmake_print(int, const char *, ...); +- void __wsmake_print_it(FILE *, const char *, const va_list *); ++ void __wsmake_print_it(FILE *, const char *, va_list *); + } + + #endif /* __WSUTIL_H__ */ diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch index 0ecfe62003f..9028c069554 100644 --- a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch +++ b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch @@ -1,8 +1,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=251745 https://sourceforge.net/tracker/index.php?func=detail=2520894_id=5982=105982 libwsmake/wsSubTag.cpp -+++ libwsmake/wsSubTag.cpp.new +--- a/libwsmake/wsSubTag.cpp b/libwsmake/wsSubTag.cpp @@ -22,6 +22,7 @@ ***/ #include @@ -11,8 +11,8 @@ https://sourceforge.net/tracker/index.php?func=detail=2520894_id=5982; #include #ifdef HAVE_SYS_WAIT_H libwsmake/wsWebPage.cpp -+++ libwsmake/wsWebPage.cpp.new +--- a/libwsmake/wsWebPage.cpp b/libwsmake/wsWebPage.cpp @@ -23,6 +23,7 @@ #include #include @@ -21,8 +21,8 @@ https://sourceforge.net/tracker/index.php?func=detail=2520894_id=5982; #include "wsmake.h" libwsmake/wsUtil.cpp -+++ libwsmake/wsUtil.cpp.new +--- a/libwsmake/wsUtil.cpp b/libwsmake/wsUtil.cpp @@ -28,6 +28,7 @@ #include #include diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild index 7299d6dc862..83c59948894 100644 --- a/www-misc/wsmake/wsmake-0.6.4.ebuild +++ b/www-misc/wsmake/wsmake-0.6.4.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit eutils +EAPI=6 DESCRIPTION="Website Pre-processor" HOMEPAGE="http://www.wsmake.org/; -SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2;