gentoo resync : 24.02.2018

4 files changed, 52 insertions, 85 deletions

diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
index 144befde76e6..21a5e325c091 100644
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -1,4 +1,3 @@
-DIST xmlwrapp-0.7.1.tar.gz 1453771 BLAKE2B 33889ef53e8c154b10a1e8d3f0ff4ceaa6de9c68f61230028aeea86bb41be2eba9e464ad6717f57ee572297d218d1077108bb3fea5b54ce1d92a2620cadf8d70 SHA512 73aaa9821f861edaab8e83d97414c9525ae7f6281a4812d8df6239e10ec76dd941cc0a8ed4769469084f694642c2f0c978f6c7477c63f99735a8cc9d98d7b9a0
-EBUILD xmlwrapp-0.7.1-r1.ebuild 1052 BLAKE2B 459cc281854fd5991e0a4297eb29bca461ab0894e545f81554b689747ae3d94918cb133507bad328105b3585fd8a867ca9dd8e6b4e6849c11d847c0a6f7637ec SHA512 6d83701c4a47bc19664cf21fcc846eb9f765883070671e2d85521f05a129295eacb3b4257009dcbacdcf24bdd8f3eb9a7249a0c57d6d8a938e9789af91e382d3
-EBUILD xmlwrapp-0.7.1.ebuild 814 BLAKE2B 16b419fdfc6111f4c55f0a2306dbb528479044da62db6c9ba8e124b8c043c6f29f1336017cf53a52bd055e872ee24f7a513f62a3c36877ff96f11cd520dc9fc8 SHA512 aa7bf487d2ae7491d6a6fdbd3fd1b846878fc51a1187450cbccc488b5689c80683ce0f068ab7c720538546a683a79c8e9884c4edb84c68c39f3214052a1872fe
+DIST xmlwrapp-0.8.1.tar.gz 1470707 BLAKE2B 213923b5e74f79a6d966ded4b9c9dfb5e6906bc44dd5d79099ee146f852233675d59f33908ee4a2c844332e1b3f7b064770ddcdcd2cea0745bdac6e1329ec3de SHA512 f6415c7cbbe209f7ee148eff4ee5aca4f210b2ab420dbc89b2cdbca1f270097c362ecb456b0cc72cbebc8688fbc66ee3a94c1019d80e7211a9ebe44ddbd535eb
+EBUILD xmlwrapp-0.8.1.ebuild 1225 BLAKE2B 3be2e1162a50143aa2b2011cedbad361bbf413368b1e023881e8f06b5f39fe661b5693534e79924c3e33ae55462a828d7c0f5d336e463ad04c3364cf664a5803 SHA512 6992478f7ebf0fb04fc8724e96cfc231fa51046c10f4eae6910a61238a7a9e2b73f6f7ce4a7b4b999d0bb085b764f1c32ec41aae8416f923203ea36d1be4707b
 MISC metadata.xml 447 BLAKE2B 9ed79c4b6d20ad64a578e294021028b2469e9eb9ee4e93f528a572f418c93c13c2e1ad5594907dccb4470e22725860f24938fa78565f799ec2ef80810ef8cada SHA512 42783cd8d7990ae0aa06c28087c78f59b83940e6e871cf4146cf1212e4503f9cc11fd67720d8a7d7245e85cf727435304460b79a43adf4a1cbf46e5f593510f4
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild
deleted file mode 100644
index 0d4d77795537..000000000000
--- a/dev-libs/xmlwrapp/xmlwrapp-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/boost:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	dev-libs/libxslt[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/boost-m4"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# Unbundle boost.m4
-	rm admin/boost.m4 || die
-
-	sed -i -e '/XMLWRAPP_VISIBILITY/d' configure.ac || die
-
-	eapply_user
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default_src_install
-	prune_libtool_files
-}
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild
deleted file mode 100644
index fef05812a76d..000000000000
--- a/dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
new file mode 100644
index 000000000000..ed8327256b08
--- /dev/null
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
+HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/6.4" # subslot = SONAME(libxmlwrapp.so) + SONAME(libxsltwrapp.so)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/boost:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=[${MULTILIB_USEDEP}]
+	dev-libs/libxslt:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	sys-devel/boost-m4"
+
+src_prepare() {
+	default
+
+	# Unbundle boost.m4, rely on
+	# sys-devel/boost-m4 instead
+	rm admin/boost.m4 || die
+
+	sed -i -e '/XMLWRAPP_VISIBILITY/d' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 619804
+	local -x CXXFLAGS="${CXXFLAGS}"
+	append-cxxflags -std=c++14
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}