[gentoo-commits] repo/gentoo:master commit in: net-libs/libgadu/files/, net-libs/libgadu/

[Maciej Mrozowski]

commit:     d8f34ec392c4cc1e7da30a2aaa506added352573
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 00:52:44 2018 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Tue May 22 23:47:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f34ec3

net-libs/libgadu: Remove old, restrict openssl to slot 0 to silence repoman

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-libs/libgadu/Manifest                         |  2 -
 net-libs/libgadu/files/libgadu-1.12.0-tests.patch | 12 ----
 net-libs/libgadu/libgadu-1.11.4.ebuild            |  4 +-
 net-libs/libgadu/libgadu-1.12.0.ebuild            | 76 -----------------------
 net-libs/libgadu/libgadu-1.12.1.ebuild            | 76 -----------------------
 5 files changed, 2 insertions(+), 168 deletions(-)

diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index d138d09bcf5..a5e8481cce0 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,4 +1,2 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
-DIST libgadu-1.12.0.tar.gz 290361 BLAKE2B 7dc517b0704bd525aa2e71dc49bd64daee65cff6c4084776c01a48f806cebe57ce933a8be557ecf94648de0920765efeb293ba8d30d8a46cd1590f97fa40a877 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670
-DIST libgadu-1.12.1.tar.gz 296079 BLAKE2B 0420e3a4e0d7180f0fd78fb8c5dd19c406d8f0d9880adca643301410c261ca9367f31ed72a3f9d27c07a4b6dcf0f3d6d5dd0e6b1025082f70c9442a5518557b3 SHA512 4786bcc517dcead278fed05c35e254d963ee42f029b09a59bfe01052cbe438fa4a0d86c17dcfa2ee39d2365f28864f887d28772a5e70ce2ece190714bec45590
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677

diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
deleted file mode 100644
index 56e1da45b09..00000000000
--- a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c
---- libgadu-1.12.0/test/manual/lib/base64.c	2014-06-13 20:41:37.000000000 +0200
-+++ my/test/manual/lib/base64.c	2014-08-13 03:08:00.612006311 +0200
-@@ -30,7 +30,7 @@
- #include <openssl/bio.h>
- #include <openssl/buffer.h>
- 
--char *gg_base64_encode(const char *input, ssize_t len)
-+char *gg_base64_encode2(const char *input, ssize_t len)
- {
- 	BIO *bmem, *b64;
- 	BUF_MEM *bptr;

diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 7c85cae4fd9..e269958d970 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	ssl? (
 		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
+		!gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
 	)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
deleted file mode 100644
index 1448b9f6434..00000000000
--- a/net-libs/libgadu/libgadu-1.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-0.15
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
-	)
-"
-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
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-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
-}

diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
deleted file mode 100644
index bde28ad49fc..00000000000
--- a/net-libs/libgadu/libgadu-1.12.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-0.15
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
-	)
-"
-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
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12.0-tests.patch"
-)
-
-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
-}