gentoo resync : 31.12.2017 (final resync this year)

4 files changed, 19 insertions, 86 deletions

diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
index 89a769d80a7b..1a28f40f0f26 100644
--- a/dev-libs/iksemel/Manifest
+++ b/dev-libs/iksemel/Manifest
@@ -1,9 +1,6 @@
 AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b66035c7d20e0f1e2c1f23ec6ec2d227ab4914c4c16c555e33fe9a5d39d6171864229071048d0ca9a93273b84e6c25c65e SHA512 6b2d4f71f5da6da8dcdd9f6a8921129d2f2bc71e6eb0c331d74784ced1bc3a0fb974ff1e0342f93d8ba3b4217b72ade15b1bc4015d2f2486aa86ca75549a1a42
 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518
 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd
-DIST iksemel-1.3.tar.gz 485208 BLAKE2B 868ae403cdd0fea6bb765620bb9e2823a88220d1781a2ee1bdbb826a0b3305a2e2bd5ead3924aeb3106174bc8bae9365e4c713f3f71d2036c79cc9acfdf0c7b7 SHA512 57a0f8d5c3e675419b8d4d04580c144ed20466d1b41ea23006bbb588eead595f189088b3fe559b62d527a2773cc4f92b6c09d19ed7a2b8f446d9ba13546a9d03
 DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc
-EBUILD iksemel-1.3.ebuild 821 BLAKE2B 5bc8f3bc36564cdaa175df9c69f0f90abc75887c56334449255bc4c26d73a3bb5fbc0d90d2fdb7742cb5358a5f3c13cfd6143ea256f9ba6107da2136d98dd18c SHA512 031f30ea70c8300882eea2c91aebcdb0bc46e1a584e70ec6ac6dd33a81fd56dc791e08b427287b7a7162e5b658887fe2cf6910a69ea90ff2bbba35fa30b1d09f
-EBUILD iksemel-1.4-r1.ebuild 836 BLAKE2B 1715b449776fb2cf9457105fad61aff226f04e0198f2e119566dc9b1ef39fce583c9f0360aebbd81e2317c77278121ee1d9e55b47a6a04678a2731c487576163 SHA512 0ef2940c397bb5570fdf906c7c90831441b76f931e968af17b5c5758e8f37750428231e70acc8fda13d5b9c3d2a46e328c0a22dc8248fd54c000d13db58a4667
-EBUILD iksemel-1.4.ebuild 861 BLAKE2B e96f7039339a17f84eb2afa8ca05e36d5a4cecad22548b548db3ab54068cc4b67d5737d18bbde1619a6b824e47a2006fb933642fd3114aa0427d7fca0cf2afe7 SHA512 6704e457ee5422bf64a042dc6d4ff6a4e59e695c076269b75c86ecae9f04dfdf981ed0a83d711e925d89fc71a6222bdce0615f7539889b8876f685d73a08ec6c
+EBUILD iksemel-1.4-r1.ebuild 893 BLAKE2B 13a4ca3121c7337093c9694009b0491072626c281194f571dac61bd44d2d29f9372a44df5933941f3131649d50682e0612554749f6caba08925d33a2f6c863fb SHA512 1eee495e88774df647b8604e52801b6a229de535fae9599d686d93f6512fec381c4f7766f9235476e16f346ac6d22c62d970372bbe7a5e0160e738cdea7e8a0c
 MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0
diff --git a/dev-libs/iksemel/iksemel-1.3.ebuild b/dev-libs/iksemel/iksemel-1.3.ebuild
deleted file mode 100644
index 1dc6fa062b8b..000000000000
--- a/dev-libs/iksemel/iksemel-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
-HOMEPAGE="https://github.com/meduketto/iksemel"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnutls"
-
-RDEPEND="gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		gnutls? ( virtual/pkgconfig )"
-
-# https://code.google.com/p/iksemel/issues/detail?id=4
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gnutls-2.8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}
diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
index 502052fabde1..9865b314e4a5 100644
--- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild
+++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
 HOMEPAGE="https://github.com/meduketto/iksemel"
@@ -11,16 +11,18 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="ssl"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="ssl static-libs"
 
-RDEPEND="ssl? ( net-libs/gnutls )"
+RDEPEND="ssl? ( net-libs/gnutls:= )"
 DEPEND="${RDEPEND}
-		ssl? ( virtual/pkgconfig )"
+	ssl? ( virtual/pkgconfig )"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch"
-	  "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch"
-	  "${FILESDIR}/${PN}-1.4-ikstack.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-gnutls-2.8.patch
+	"${FILESDIR}"/${PN}-1.4-gnutls-3.4.patch
+	"${FILESDIR}"/${PN}-1.4-ikstack.patch
+)
 
 src_prepare() {
 	default
@@ -28,10 +30,15 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with ssl gnutls)
+	econf \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
+	default
+	dodoc HACKING
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/iksemel/iksemel-1.4.ebuild b/dev-libs/iksemel/iksemel-1.4.ebuild
deleted file mode 100644
index fb97bd0b62ba..000000000000
--- a/dev-libs/iksemel/iksemel-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
-HOMEPAGE="https://github.com/meduketto/iksemel"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		ssl? ( virtual/pkgconfig )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch"
-	epatch "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch"
-	epatch "${FILESDIR}/${PN}-1.4-ikstack.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ssl gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}