1 |
commit: bb551090a96ede9f8eab6f91d6f1f22d254bb042 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 21:53:51 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 30 00:27:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb551090 |
7 |
|
8 |
net-libs/libyahoo2: bump EAPI; drop eutils; add LibreSSL support |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../libyahoo2/files/libyahoo2-1.0.1-asneeded.patch | 4 ++-- |
13 |
net-libs/libyahoo2/libyahoo2-1.0.1.ebuild | 27 ++++++++++++++-------- |
14 |
2 files changed, 19 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch |
17 |
index b05190a02a7..4e0f1142cd5 100644 |
18 |
--- a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch |
19 |
+++ b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch |
20 |
@@ -1,5 +1,5 @@ |
21 |
---- src/Makefile.am |
22 |
-+++ src/Makefile.am |
23 |
+--- a/src/Makefile.am |
24 |
++++ b/src/Makefile.am |
25 |
@@ -21,11 +21,9 @@ |
26 |
noinst_PROGRAMS = yahoo autoresponder |
27 |
|
28 |
|
29 |
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild |
30 |
index 0cd41ed4821..541f05dc3d8 100644 |
31 |
--- a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild |
32 |
+++ b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild |
33 |
@@ -1,8 +1,8 @@ |
34 |
-# Copyright 1999-2011 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI=2 |
39 |
-inherit autotools eutils |
40 |
+EAPI=7 |
41 |
+inherit autotools |
42 |
|
43 |
DESCRIPTION="interface to the new Yahoo! Messenger protocol" |
44 |
HOMEPAGE="http://libyahoo2.sourceforge.net/" |
45 |
@@ -11,33 +11,40 @@ SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz" |
46 |
LICENSE="GPL-2" |
47 |
SLOT="0" |
48 |
KEYWORDS="~amd64 ~ppc ~x86" |
49 |
-IUSE="static-libs ssl" |
50 |
+IUSE="libressl ssl static-libs" |
51 |
|
52 |
RDEPEND="dev-libs/glib:2 |
53 |
- ssl? ( dev-libs/openssl )" |
54 |
+ ssl? ( |
55 |
+ libressl? ( dev-libs/libressl:0= ) |
56 |
+ !libressl? ( dev-libs/openssl:0= ) |
57 |
+ ) |
58 |
+" |
59 |
DEPEND="${RDEPEND}" |
60 |
|
61 |
+PATCHES=( |
62 |
+ "${FILESDIR}/${P}-asneeded.patch" |
63 |
+) |
64 |
+ |
65 |
src_prepare() { |
66 |
- epatch "${FILESDIR}"/${P}-asneeded.patch |
67 |
+ default |
68 |
sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912 |
69 |
eautoreconf |
70 |
} |
71 |
|
72 |
src_configure() { |
73 |
econf \ |
74 |
- --disable-dependency-tracking \ |
75 |
$(use_enable static-libs static) \ |
76 |
$(use_enable ssl sample-client) |
77 |
} |
78 |
|
79 |
src_install() { |
80 |
- emake DESTDIR="${D}" install || die |
81 |
+ default |
82 |
|
83 |
if use ssl; then |
84 |
- dobin src/.libs/{autoresponder,yahoo} || die |
85 |
+ dobin src/.libs/{autoresponder,yahoo} |
86 |
fi |
87 |
|
88 |
dodoc AUTHORS ChangeLog doc/*.txt NEWS README TODO |
89 |
|
90 |
- find "${D}" -name '*.la' -exec rm -f '{}' + |
91 |
+ find "${D}" -name '*.la' -delete || die "Pruning failed" |
92 |
} |