gentoo resync : 18.11.2018

3 files changed, 58 insertions, 17 deletions

diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 71f88faebac4..df2f1936effe 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,4 +1,6 @@
 DIST libodfgen-0.1.6.tar.xz 359988 BLAKE2B 89ef70762780efa70ea044758d3c5e677024897bcd1f031c15544dc2e5cc0115bd286ca21051b8223768a2253eb681bdea534230c517de9c00a0a1f5b320eaf3 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5
+DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
 EBUILD libodfgen-0.1.6.ebuild 899 BLAKE2B 2c43dc49dbab829d73b66ea4de39dd435746a5c4272f17ddec5c10f337749f0ee38ab957e3bd8593009e8d01735efc64bb141cd2662bf4bd9b99d7d2c8a627f4 SHA512 e0eff9df3cc4632153e8fe3b6187112d16ee0d631eea999ba661d6c623515fd18e831a8f6197decb6709e6639371af511cd589abe5b904f44436f7f5c53861bc
-EBUILD libodfgen-9999.ebuild 887 BLAKE2B bc6f0f5f96b318c45b51928dc79faf3184b7079ed310fcdf8ad53bb3d00c3f68e2634a218366f403664e60d5fe973ddc8b511c6fe39bba9415cc1627cb9bccb8 SHA512 801ff64c3f1fc23dcd53500a8cff20434bf4f9416d968df681961e82a72e0b8e96b97a2a10fbbd2fb7838e9437c61f24a218822d876b2df68d5a6e9d98f63ad6
+EBUILD libodfgen-0.1.7.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
+EBUILD libodfgen-9999.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
new file mode 100644
index 000000000000..03f14c4c7029
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sourceforge.net/"
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+IUSE="doc"
+
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 3e7137661d27..03f14c4c7029 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
-HOMEPAGE="http://libwpd.sf.net"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-
+HOMEPAGE="http://libwpd.sourceforge.net/"
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
 
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="doc"
 
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
@@ -34,8 +33,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-static \
-		--disable-werror \
-		--with-sharedptr=c++11 \
 		$(use_with doc docs)
 }