gentoo resync : 05.02.2020

4 files changed, 62 insertions, 76 deletions

diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index dbc6cfc369ea..e173f6527847 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1291 BLAKE2B 10c941dd42ab5ab2478bd915f4c70faf442abc7f1dcd65444171134ba6618c76673bd56768a775d84631f24354ca6ccf55dc769d2e101cf346326eb8831d1232 SHA512 f9245ec916ad4cc0381fee2ed3f8ff136bb6143095ba6720d888d1d15ccf813e99cdb79e3b41469683a8f3e4b53836556c78921fb61a643c135a8ad92b8a705d
-EBUILD libgadu-1.12.2.ebuild 1412 BLAKE2B 8618b371c30b6eef11c7f313629c48e7bd32792d188c2532642d8c01697392e47c7959f055aa0441c89484e42570acece2e97b58294af97557ecf7bd9dd053b2 SHA512 c4ed214ce611c521ac6e98a4f35707c3f0eacc6e1d3e9f51974ff6bef5ee5dfca943ab76c38ef219f041f5a8b661a600a30ffd0fbfed8eabc67ebd2aa17c62fb
+EBUILD libgadu-1.11.4.ebuild 1292 BLAKE2B 40404179c96488fed718be19f910d1829a14b46faaf3450c65fcd42d7b590bc060bc772999d8153f67a61bcda31e413a934f599de47ba9aa767b84c307d3b3e4 SHA512 441fcacc738c922f50fae46c0b12baf43a5cbea937f401ad73978e248906ad48de4a0ddf8f5406bf97a13904919708070b602057fc1e06211ba64027483583e2
+EBUILD libgadu-1.12.2-r1.ebuild 1120 BLAKE2B dd5e351f16b7939df2ea3df069bce09c3753a70623740bfa91c1517e6ed2d56ae71841872ce6831a807e68727beae0dd343cff23f59273ea13e282769f84c21c SHA512 be04f5871e20b5d1bb2c05972e7f1e469a4a42c0b8afa2ab205424061e220df0d7baabaa27e3a809d012ba287c8b279e7fad0e599f0a611d9cf788ee20e02731
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 1e153cd06f82..fe5d209e2d8f 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs threads"
 
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..6172f02348e2
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Client-side library for the Gadu-Gadu protocol"
+HOMEPAGE="https://libgadu.net/"
+SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc ssl test threads"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/expat
+		dev-libs/libxml2:2
+		net-misc/curl
+	)
+"
+DEPEND="
+	dev-libs/protobuf-c:=
+	sys-libs/zlib
+	ssl? ( net-libs/gnutls:= )
+"
+RDEPEND="${DEPEND}"
+
+BUILD_DIR="${S}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-protobuf
+		--without-openssl
+		$(use_with ssl gnutls)
+		$(use_enable test tests)
+		$(use_with threads pthread)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
deleted file mode 100644
index 8a6c3f71c24b..000000000000
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/"
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-1.0.0
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls:0 )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/expat
-		dev-libs/libxml2:2
-		net-misc/curl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	local myeconfargs=(
-		--with-protobuf
-		$(use_enable test tests)
-		$(use_with threads pthread)
-	)
-
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with gnutls gnutls)
-			$(use_with !gnutls openssl)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
-}