gentoo resync : 31.12.2017 (final resync this year)

3 files changed, 31 insertions, 27 deletions

diff --git a/dev-libs/xmlrpc-epi/Manifest b/dev-libs/xmlrpc-epi/Manifest
index 72f6b9533643..792dc88aca9d 100644
--- a/dev-libs/xmlrpc-epi/Manifest
+++ b/dev-libs/xmlrpc-epi/Manifest
@@ -1,3 +1,4 @@
+AUX xmlrpc-epi-0.54.2-fix-build-system.patch 370 BLAKE2B eedf67329806af7ab1674cb81c20feff2d2e155a2294838a9183ae33ff37ba71a5f95daf783e2d07621f31a4a015548fa56838b6a610fdd4369b3f1697d6a093 SHA512 993ff2f38d7a1b8f1acf45212607e0499c0b7072152c9c2e30b9cb86fa67108644bf62f69aa954c245d86577c6a2fae0a77a1e6e473e21abbb4b396c67ab22f9
 DIST xmlrpc-epi-0.54.2.tar.bz2 348478 BLAKE2B 43f460445d129def3ca238747598ffd43c51e6d28ac3065bf8e0bc7b888dca77d71960346bd79b9d200d81d17df4f37be39f049f67f356f746b58d5b965c9ddb SHA512 2a8e818bd0eff4d1b0ad0c1cb26f93bc65d941096cf9f4555d1969c69601c452ab26edccee511b06efc9927c5deb7bd2a93fe44da23e5e4f78f6c77ca8e1e9c5
-EBUILD xmlrpc-epi-0.54.2.ebuild 1226 BLAKE2B 2e39c3ad98ea24b3ae8e734b9e2a95c40fa141138d05f51689ec7bb86af434eeac923429586202a369cedf62cd9aaf93963bc2d72c738f1fa30745b7d5858260 SHA512 c7f3cc72cadc1c163959b86a009902ccf50070ca7062004746e11dad79b3323b8f3111651c056343c12a6803a08aa33777d603cf7bde9920a2245968b948acf7
+EBUILD xmlrpc-epi-0.54.2.ebuild 961 BLAKE2B ba6d88bbd4876a6d265fdb7c65befaae2351923d619d07cc126f585338c411e03c08819518e5acff0f9be64b909971b0adbebad55670e338446d7758da554149 SHA512 1f9d6f2a0c8f0f593d40b9b52b2485f7a257e56e10ef15f869b60d0c7ae7f6ff26695dcf95e75b8ae586155c330f085251faba7be15b744279412118e0d3150c
 MISC metadata.xml 247 BLAKE2B 2c8eebb25dce4086826f2899e097abfd82be265330efaccf1b0a70dc6ddd7db762b9c7705869f43b6778474ac42c3fe2ea538d9ef75d16ad4bf54086378f2b1f SHA512 9d95e81a0ea01ed0693e8aaff3c55cffc38aa7d6dedad6212e7d0914791702da5b7434f13deee6fd8b05744002b3d8e60ede232ed1b7b6addd54cd09d50a6824
diff --git a/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
new file mode 100644
index 000000000000..0772836e6bae
--- /dev/null
+++ b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -218,8 +218,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src sample
+-DIST_SUBDIRS = src sample
++SUBDIRS = src
++DIST_SUBDIRS = src
+ ACLOCAL_AMFLAGS = -I m4
+ CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl
+ CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
diff --git a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
index c3a93596ff91..45df6e8ea284 100644
--- a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
+++ b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit multilib
+EAPI=6
 
 DESCRIPTION="Epinions implementation of XML-RPC protocol in C"
 HOMEPAGE="http://xmlrpc-epi.sourceforge.net/"
@@ -12,40 +10,32 @@ SRC_URI="mirror://sourceforge/xmlrpc-epi/${P}.tar.bz2"
 LICENSE="Epinions"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
-IUSE="examples static-libs"
+IUSE="static-libs"
 
-DEPEND="dev-libs/expat"
+DEPEND="dev-libs/expat:="
 RDEPEND="${DEPEND}"
 
-# NOTES:
-# to prevent conflict with xmlrpc-c, headers are installed in
-# 	/usr/include/${PN} instead of /usr/include (bug 274291)
-
-src_prepare() {
-	# do not build examples
-	sed -i -e "s:sample::" Makefile.in || die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.54.2-fix-build-system.patch )
 
 src_configure() {
+	# NOTES:
+	# to prevent conflict with xmlrpc-c, headers are installed in
+	# 	/usr/include/${PN} instead of /usr/include (bug 274291)
 	econf \
-		--includedir=/usr/include/${PN} \
-		--disable-dependency-tracking \
+		--includedir="${EPREFIX}"/usr/include/${PN} \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	if ! use static-libs; then
-		# remove useless la files
-		rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "rm failed"
+		# remove useless .la files
+		find "${D}" -name '*.la' -delete || die
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins sample/*.c sample/*.php || die "doins failed"
-		doins -r sample/tests || die "doins failed"
-	fi
+	docinto examples
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc sample/*.c sample/*.php
+	dodoc -r sample/tests
 }