gentoo resync : 31.12.2017 (final resync this year)

4 files changed, 79 insertions, 10 deletions

diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index c1696ebbabdc..3b73edb20c02 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -1,4 +1,5 @@
-AUX rlog-1.3.7-gcc-4.3.patch 199 BLAKE2B da3f30d44d024c4b32ce22f7e4e5b13280f5c365939725d97e57d149bcb1f02e16d16f3ca0d0c8df8860677c12686428d5e807402a2739eeba06f453baad7a39 SHA512 6f1df1b960e7ecbf4ffc24f71f6f9c6293a501cb181e453771480a38c84e7a47ec37766e7d98d24225f52d95312a5af600bbb9e19c0424f8b5f8e9f236c95f51
+AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d
+AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
-EBUILD rlog-1.4.ebuild 521 BLAKE2B f536b2e7a1f51aca7f09fbb75a4bfab9d21841c275b7eeda2469631d05acbd89bab2014148330795f9523b2710743e776e9bf59fd4e4e18275b5691f5cbefbad SHA512 09907de502f2b3865a8e7ef082afb5bb83597d3633a4a6265778a447a8a5a522cd49d3013f5e46fc400f4f8c9efd3a2c68de95f1a9de1ec8c71352f10a64bbdd
+EBUILD rlog-1.4.ebuild 580 BLAKE2B e428c653b3fdf30a7d0d49932981fb0352ea77aba0739bb111e20a01972eb6e0711c3e1b25c0874e32a33a80267256c90f1b7fb0831eb0d0b66d89da371f282f SHA512 cfed6a79af238dbdace3fdf28a0042ba711cdad6070aa2e3ff3ba7e28e481e7ce6223bc3b82f276e96c0b6f8602dcc59cd74c8660617d57ed6d7b38fc127e24f
 MISC metadata.xml 323 BLAKE2B 24c50af72b0366021e5909c8c82cd536a8cff3ff1ec24e5120810782bec14088b0a2c60f46ecc819a08e009a98b38c58f89c4c1b2886604e8583f3c3eb23a943 SHA512 5a15daf1a6599a6b93b64475aa4dec483281d4d1622fb24bfab2a27c4806846027a16bffb910d0881621879a6209d8d00c816b37a0397983d1d1e951fa32a006
diff --git a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
index 5e4bb91bf1e3..07770791cd77 100644
--- a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
+++ b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- rlog/RLogChannel.cpp
-+++ rlog/RLogChannel.cpp
+--- a/rlog/RLogChannel.cpp
++++ b/rlog/RLogChannel.cpp
 @@ -20,6 +20,7 @@
  #include "RLogChannel.h"
  #include "rlog.h"
diff --git a/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..b7959a79cd02
--- /dev/null
+++ b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch
@@ -0,0 +1,59 @@
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,15 +1,13 @@
+ 
+ SOURCES = index.dox channel.dox component.dox
+ 
+-docdir = $(datadir)/doc
+-pkgdocdir = $(docdir)/$(PACKAGE)
+ #pkghtmldir = $(pkgdocdir)/html
+ 
+ 
+ # have both html and html/index.html to force build of index.html if necessary
+ EXTRA_DIST = latex/refman.pdf html html/index.html $(SOURCES)
+ 
+-pkgdoc_DATA = \
++pdf_DATA = \
+     latex/refman.pdf
+ 
+ #pkghtml_DATA = \
+@@ -17,22 +15,21 @@
+ 
+ if BUILD_DOCS
+ latex/refman.pdf: html/index.html
+-	-cd latex && make
++	$(MAKE) -C latex
+ 
+ html/index.html: ../Doxyfile $(SOURCES)
+-	-rm -rf html
+-	-cd .. && @DOXYGEN@ Doxyfile
++	rm -rf html && $(DOXYGEN) Doxyfile
+ 
+ clean-local:
+-	-rm -rf html
+-	-rm -rf latex
++	rm -rf html
++	rm -rf latex
+ endif
+ 
+ all-local: html/index.html
+ 
+-install-data-local: all-local
+-	-echo installing to ${DESTDIR}${pkgdocdir}/html
+-	/bin/sh ../mkinstalldirs ${DESTDIR}${pkgdocdir}/html
+-	install html/* ${DESTDIR}${pkgdocdir}/html
++install-data-hook: all-local
++	-echo installing to $(DESTDIR)$(htmldir)
++	/bin/sh ../mkinstalldirs $(DESTDIR)$(htmldir)
++	install html/* $(DESTDIR)$(htmldir)
+ 
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,6 +10,3 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = librlog.pc
+ 
+-documentation:
+-	cd docs && make
+-
diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild
index c24fabb7a48c..0a937d761f36 100644
--- a/dev-libs/rlog/rlog-1.4.ebuild
+++ b/dev-libs/rlog/rlog-1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="A C++ logging library"
 HOMEPAGE="http://www.arg0.net/rlog"
@@ -13,11 +14,19 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc sparc x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
+	"${FILESDIR}"/${PN}-1.4-fix-build-system.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
+	default
+	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog README
+	default
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }