Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ekg2/
Date: Fri, 15 Mar 2019 07:56:32
Message-Id: 1552636576.a1289ed9db175cea58b21ab0fccc11cf22bd73f0.mgorny@gentoo
1 commit: a1289ed9db175cea58b21ab0fccc11cf22bd73f0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 15 07:44:52 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 15 07:56:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1289ed9
7
8 net-im/ekg2: Bump to EAPI 7
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-im/ekg2/ekg2-9999.ebuild | 39 +++++++++++++++++++--------------------
13 1 file changed, 19 insertions(+), 20 deletions(-)
14
15 diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
16 index 53faab6d8f5..8c458e0a9e4 100644
17 --- a/net-im/ekg2/ekg2-9999.ebuild
18 +++ b/net-im/ekg2/ekg2-9999.ebuild
19 @@ -1,33 +1,27 @@
20 # Copyright 1999-2019 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=5
24 -
25 -#if LIVE
26 -AUTOTOOLS_AUTORECONF=yes
27 -EGIT_REPO_URI="https://github.com/ekg2/${PN}.git"
28 -
29 -inherit git-r3
30 -#endif
31 +EAPI=7
32
33 PYTHON_COMPAT=( python2_7 )
34 -inherit autotools-utils python-single-r1
35 +inherit autotools git-r3 python-single-r1
36
37 DESCRIPTION="Text-based, multi-protocol instant messenger"
38 HOMEPAGE="https://github.com/ekg2/ekg2/"
39 -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
40 +SRC_URI=""
41 +EGIT_REPO_URI="https://github.com/ekg2/${PN}.git"
42
43 LICENSE="GPL-2"
44 SLOT="0"
45 -KEYWORDS="~amd64 ~ppc ~x86"
46 +KEYWORDS=""
47 IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
48 perl python readline rss spell sqlite ssl xmpp unicode zlib"
49 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
50
51 -RDEPEND="dev-libs/glib:2=
52 +RDEPEND="dev-libs/glib:2
53 gadu? ( <net-libs/libgadu-1.12:0= )
54 gpg? ( app-crypt/gpgme:1= )
55 - gtk? ( x11-libs/gtk+:2= )
56 + gtk? ( x11-libs/gtk+:2 )
57 nls? ( virtual/libintl:0= )
58 openssl? ( dev-libs/openssl:0= )
59 perl? ( dev-lang/perl:0= )
60 @@ -53,11 +47,6 @@ DOCS=(
61 docs/ui-ncurses.txt docs/ui-ncurses-en.txt
62 )
63
64 -#if LIVE
65 -KEYWORDS=
66 -SRC_URI=
67 -#endif
68 -
69 pkg_pretend() {
70 if ! use gtk && ! use ncurses && ! use readline; then
71 ewarn 'ekg2 is being compiled without any frontend. You should consider'
72 @@ -66,8 +55,13 @@ pkg_pretend() {
73 fi
74 }
75
76 +src_prepare() {
77 + default
78 + eautoreconf
79 +}
80 +
81 src_configure() {
82 - myeconfargs=(
83 + local myconf=(
84 # direct plugin references
85 $(use_enable gadu gg)
86 $(use_enable gpg)
87 @@ -104,5 +98,10 @@ src_configure() {
88 --with-perl-module-build-flags='INSTALLDIRS=vendor'
89 --enable-fast-configure
90 )
91 - autotools-utils_src_configure
92 + econf "${myconf[@]}"
93 +}
94 +
95 +src_install() {
96 + default
97 + find "${D}" -name '*.la' -delete || die
98 }