From 7b9f15840068dfaeea5684f8a1af1fe460dfa14c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jun 2018 17:18:14 +0100
Subject: gentoo resync : 02.06.2018

---
 net-libs/libyahoo2/Manifest                        |  4 +--
 .../libyahoo2/files/libyahoo2-1.0.1-asneeded.patch |  4 +--
 net-libs/libyahoo2/libyahoo2-1.0.1.ebuild          | 29 ++++++++++++++--------
 3 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'net-libs/libyahoo2')

diff --git a/net-libs/libyahoo2/Manifest b/net-libs/libyahoo2/Manifest
index b5631611e511..27794e55b311 100644
--- a/net-libs/libyahoo2/Manifest
+++ b/net-libs/libyahoo2/Manifest
@@ -1,4 +1,4 @@
-AUX libyahoo2-1.0.1-asneeded.patch 379 BLAKE2B 790b9b31cf8c8a14e7d46097ea600d19dcf7efc82f99af383d6c97505c7f797874b0d49b01ade0cc850aa6b050df120b79e3826282c2ac1dda1f43b9f92287a2 SHA512 287ecd3cc8963ef79dddb337e2b7b240a725c009eb3b169951af086070f1bb72d3a4221b4bb6e02893efb22d2314f3fd70074abc887ff56396ef9f5eb5b342ed
+AUX libyahoo2-1.0.1-asneeded.patch 383 BLAKE2B f7ac99739c5d04345bf1ece82767170929aed65a471f0ed9f5212529402683813cc8b879a32690c082db2fa791f3767e402abb6ce8b98dca3567e04f02684035 SHA512 47e241ea5890c28ac3d7c5326eba5ef0fc3f6965fe6726769854835b7b98140e33b603678605bcd9487c8ce57156ac54d16ded8eaeea63f23d2c06eee55872b4
 DIST libyahoo2-1.0.1.tar.gz 507023 BLAKE2B 5972d8ac250e9ec76bf080fda2bd4f1bdf8898a8496a38e6e31a534ec94a164d54d6a640c098ff804325645f05627e520566883223981abeb97a03f22bd21b47 SHA512 fc522f80c21945e748cfc1051ab615993d2a6c5cf7467d86e04fb8fbeaf8ce3fd925c190a6b57ec4fb9f7ed3df7b2e4c61d141965f8fb8ccf5461e0b36665b86
-EBUILD libyahoo2-1.0.1.ebuild 946 BLAKE2B 4ccca860eef7e884dbbd704c3bf4a06ccbe41fce4a09b09677ff109251c9e73b0821812982e11ab15b8c9bbe14b6decbf517b569589b4c2907ddf43a954f1d76 SHA512 8732fd8582939992a31bfa80d118ed7e61697f1d7fa747a8bd5480647fcaae37741fdf69289ff95dfe2218201c91710b1754acee6f0496e8cdc9622a796e4bdc
+EBUILD libyahoo2-1.0.1.ebuild 931 BLAKE2B bf19b82d74710bca452e2c0d91af89d1e03cc926e48b66cc3c3dd6ac318d3e6a60adb2807651079bcfc22e9fee5b23b02e64ca663289d2027cb5ceb75e112dce SHA512 f20a0d972207a7082a2b58e7224c400fc584b9b604f994ef91158f5ae0f8daccc000f37fce5b6527262924b14320ca8d29ac02183ef5a1ff414b443632d3c62e
 MISC metadata.xml 246 BLAKE2B 2095d570255d285eaf7669d02b3e7045eedd43bb9b563bf05aff327106fa6b30fe37b99a6160a68bc040357733b9e5d8553b61263f396ff8a1fb19658962a65a SHA512 967f79698c434269734a15532f1c4834a5a2a02786d2f25ad7d1f5d323d292a910eec84ff1256c68aab5ca662e3105aa9dcea8cf18c43b0d62121f6352b36343
diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
index b05190a02a71..4e0f1142cd52 100644
--- a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
+++ b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -21,11 +21,9 @@
  noinst_PROGRAMS = yahoo autoresponder
  
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
index 0cd41ed48213..66739a597faf 100644
--- a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
+++ b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="interface to the new Yahoo! Messenger protocol"
 HOMEPAGE="http://libyahoo2.sourceforge.net/"
@@ -11,33 +11,40 @@ SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs ssl"
+IUSE="libressl ssl static-libs"
 
 RDEPEND="dev-libs/glib:2
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	default
 	sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable ssl sample-client)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	if use ssl; then
-		dobin src/.libs/{autoresponder,yahoo} || die
+		dobin src/.libs/{autoresponder,yahoo}
 	fi
 
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README TODO
+	dodoc doc/*.txt
 
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
-- 
cgit v1.2.3