gentoo resync : 01.12.2017

8 files changed, 76 insertions, 42 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index d7e3f2a1bc89..3b8e32342a02 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/gurlchecker/Manifest b/www-misc/gurlchecker/Manifest
index 14b056086cdc..874d529f8466 100644
--- a/www-misc/gurlchecker/Manifest
+++ b/www-misc/gurlchecker/Manifest
@@ -3,4 +3,4 @@ AUX gurlchecker-0.13.1-gnutls.patch 883 BLAKE2B 9408e033afea7e0723b47a6018b95a1a
 AUX gurlchecker-0.13.1-ldflags.patch 1239 BLAKE2B 15dc351014b7e95348dd98075d81722a3b8bb059ccd63b50ac4c1e914d8a360ad3e4f8e90a48c1d10cd832516dd2b2c47b5f2532013bae2220a3825358e51a72 SHA512 30adb4d68850b02e2e10f0fc8da815adc996031809920006d7193227412db9d3125520ec608392bf52eb5438167a3bc256852faa2646bdba049cfe3b63571ced
 DIST gurlchecker-0.13.1.tar.gz 709336 SHA256 a94283094a0ca7f6833cade0ef7a043fd97d0cfe55c0072d9bf508165ca45aeb SHA512 25f76f4b0b84467a5751156fbd8497f25e057202a36fe33b24c91e42906f67dd7dbd21531682b050c534862fa4e62ceb0908d19f44926ac335d628cc9919a746 WHIRLPOOL 9c0c29516240fb16d719ba4406a0a3f772dc11a38971a4b339fa1714afaf7ecc8129bb3a06590fc9d21dea61c6d5aa852e4e3ea5f11fe5aab336d7a957773c75
 EBUILD gurlchecker-0.13.1-r2.ebuild 1658 BLAKE2B 8e15044006a49e6d836dafa98af40867a74c379202708dd111c2cda8300a7020aca0d4bab9f768d112a4bf843d58b1003183d3e74161ffd18f5b75616d42723c SHA512 6209d4af406ae43dc9c1a2349c5af16dfd24bf2e6c9f4dd023ab36ab6cac2b596ebc5a44cb20c8ad13a70e008a3c6f09d358fb211c5ecff6b282fe6ebca69e1f
-MISC metadata.xml 563 BLAKE2B 09830f29d7142b6d300e03bc20eb71db238d5b3e9484c2603754c56e5b1d29dd007ada88873343ad229db9e1c8b727cf4c33cde5b221669cd2b7e99894b9ea73 SHA512 330f08664d2af12a42184973cf33d0de05ae6d8cd56ead8936dc96c5c0c79f2909bf9d2f8e48e826326e9c0696e7eaf7c0fd170305819a0c6151f224a9269ed1
+MISC metadata.xml 570 BLAKE2B a8c7ef6d088f13a9e123008c7d47d42cbf3a92311ef53e93a43d5ab1c47e3fb57548a3c1e8ccbc901b0e2b6bb6191db94f5a5fb372d46dc6170834742c4e14b0 SHA512 69c4c3b9152c7527868023d6d14e2b047d0a8ba8802036c59cc77aae84402fd0f5ddad28855402256dfa9e788643e798082932aa4a61afc6dacb1aaccd07f82b
diff --git a/www-misc/gurlchecker/metadata.xml b/www-misc/gurlchecker/metadata.xml
index 407bd35a3d8d..1948827bbc94 100644
--- a/www-misc/gurlchecker/metadata.xml
+++ b/www-misc/gurlchecker/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
-	<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
-</use>
-<longdescription>
-  gURLChecker is a graphical web links checker for GNU/Linux and
-  other POSIX OS. It can work on a whole site, a single local page
-  or a browser bookmarks file.
-</longdescription>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
+		<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
+	</use>
+	<longdescription>
+		gURLChecker is a graphical web links checker for GNU/Linux and
+		other POSIX OS. It can work on a whole site, a single local page
+		or a browser bookmarks file.
+	</longdescription>
 </pkgmetadata>
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
index 82b0e6f1978e..467af84045ff 100644
--- a/www-misc/wsmake/Manifest
+++ b/www-misc/wsmake/Manifest
@@ -1,5 +1,6 @@
-AUX wsmake-0.6.4-bv.diff 308 BLAKE2B edf6b2250e611fb13a2c8a3f8a5dc61a32640c42f5efe9c36f3b69e4b36d83ca291dc5d8cb4d24680ee8c1e6bfb47bdecd49cd73e315c2c60abaacc0d5b5f54e SHA512 4ce6d02261097a2ff15f4bfe00ef46566ea8c429e8c1e0d99b0889d3f0631299462b9abd4ede2065b789ff119ecde818188d00c22e3028f96872e8a1122b0761
-AUX wsmake-0.6.4-gcc43.patch 771 BLAKE2B c46aad44a8002743e61272d3db750095dd914214f714ce814073ae8fe003638a0e00f7f20412805307a9e61c513a7194b4fd78bcd6c8cad6baec279dfc2b6138 SHA512 452d050b3b48247444760e57aa7668018934f6d3d23a0615ea261bba3ac012c10f3fb599aee8610240a46264b7eb1e7d24b79c29a49d8d0dea2f0b57f02e5174
-DIST wsmake-0.6.4.tar.bz2 351688 SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4 WHIRLPOOL a72eae2811936ed27cbdc63fec9bbf25999dbfdc95d0cdf81e357fc5bb130b10571332520e6aae2537707c0a40d08aff6995276487eb4d0b66e70014a44db5ab
-EBUILD wsmake-0.6.4.ebuild 765 BLAKE2B 7991fe80df4f57836733dfd17d6eff0cb3f7f2b7fb2e1fa24346f811e046fbd0998f08e3764f0362b77518180e4885e2649a3bd9df9179b2b358c78282059969 SHA512 26f1f1256fe652c828929ced2fae3d83e78a25201922f05d9cfab27f2b562111b16e27f499bf1d18916d22b987351f9b15d75b1b8e43b1fff097986944dca778
+AUX wsmake-0.6.4-bv.diff 257 BLAKE2B bc346eb93541ab6e5a66b9fa69abbd3614492e23f2b1b6001ba9a5ba5d7494be8130f3e8c7b65e42ec0fe57b9951d72984b99cd7aab7515d93dc87d68be73ac4 SHA512 8f0e154960fd0d12507007e1482f641f1ab39efc9b3614e55c6e56fab78b6895b8dbdb6684ce55ddc117304a1ba9b88ca6866ea50131ee2aadcd947fede69303
+AUX wsmake-0.6.4-fix-const-va_list.patch 781 BLAKE2B e73ff7c6c7fb2edd44c0d174ac3a738fe4aab3e15622eec5e6e3c3d7eb68a700b733548ab0c1e06f5304c092ba0813915b4ad2836c6b18c63418934b581f05ec SHA512 ceae38c3fc09f8e88d4ba9eb64467df5266b8332b365fe217354bf362343fa074e1e4407303d93de7f82b444a02f79d719dc0173156254501eba9144975f6867
+AUX wsmake-0.6.4-gcc43.patch 771 BLAKE2B 0eb6b683f2a50a3f7e65175fa4de9100109733e924d9a846fdeaaa0f80f8bb50f48f2750f798aa1160db8e0e8f1b188e83f6f214c5419930d62712de52d17817 SHA512 d155fd9b7bfe27bff396c2adaad39b9bcaa876d5a5b7dc77d0bb6932e548a65b088f79c36570036c7a06b1f1ae3d433716e696f57cea1bb74ac4fdb48fb9bee8
+DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
+EBUILD wsmake-0.6.4.ebuild 710 BLAKE2B 1ce9095841329b095e4a89a7a1194d32b2f318314bc06906440f71c573b9d7603ad66ea08d734fb232615de0ab29cb6a0ec0666911b7cf45d7bf49fd93aa290a SHA512 8a6a731562dea404f639ef6d7f8597a86061d1bc260cdfc5e0aebe6b0a218eb36503e66081cfcd63bc3368e45961338052c68d68a8b4280c5feab63dd5fdc512
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 d10aa5769c2d..15cdf05f5d25 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 000000000000..420bbb61b030
--- /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 0ecfe62003f5..9028c0695546 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&aid=2520894&group_id=5982&atid=105982
 
---- libwsmake/wsSubTag.cpp
-+++ libwsmake/wsSubTag.cpp.new
+--- a/libwsmake/wsSubTag.cpp
++++ b/libwsmake/wsSubTag.cpp
 @@ -22,6 +22,7 @@
   ***********************************************************************/
  #include <cstdio>
@@ -11,8 +11,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&
  
  #include <unistd.h>
  #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 <cassert>
  #include <cerrno>
@@ -21,8 +21,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_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 <cassert>
  #include <cerrno>
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
index 7299d6dc862b..83c599488943 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"
+SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/${P}.tar.bz2"
 
-KEYWORDS="x86"
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-IUSE=""
+KEYWORDS="x86"
+IUSE="examples"
 
-src_unpack () {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}"/${P}-bv.diff
-	epatch "${FILESDIR}"/${P}-gcc43.patch	# 251745
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-bv.diff
+	"${FILESDIR}"/${P}-gcc43.patch	# 251745
+	"${FILESDIR}"/${P}-fix-const-va_list.patch
+)
 
-src_compile () {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	cd doc
+src_unpack() {
+	default
+
+	cd "${S}"/doc || die
 	tar -cf examples.tar examples || die
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
-	cd doc
-	dodoc manual.txt examples.tar
+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
 }