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/files/, net-im/ekg2/
Date: Fri, 15 Mar 2019 08:19:16
Message-Id: 1552637945.d7cb42399712762d1e8e2440f5492c0adcf3f9a9.mgorny@gentoo
1 commit: d7cb42399712762d1e8e2440f5492c0adcf3f9a9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 15 08:15:07 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 15 08:19:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7cb4239
7
8 net-im/ekg2: Drop broken 0.3.1-r2
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-im/ekg2/Manifest | 1 -
13 net-im/ekg2/ekg2-0.3.1-r2.ebuild | 112 ---------------------
14 ...1-Gentoo-use-vendor-dirs-for-perl-modules.patch | 25 -----
15 net-im/ekg2/metadata.xml | 14 ---
16 4 files changed, 152 deletions(-)
17
18 diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
19 index dffbf70f378..38cae254de6 100644
20 --- a/net-im/ekg2/Manifest
21 +++ b/net-im/ekg2/Manifest
22 @@ -1,2 +1 @@
23 -DIST ekg2-0.3.1.tar.gz 1704772 BLAKE2B 2957d872f4d3697e36d495b54e5c39ec59c4865883b9523077ce607fc954268a0f2af07f14e4e217982abb2c1cbfdad423775631d6c22adfd2dbdc8f15895176 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c
24 DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
25
26 diff --git a/net-im/ekg2/ekg2-0.3.1-r2.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
27 deleted file mode 100644
28 index ee5a47aadae..00000000000
29 --- a/net-im/ekg2/ekg2-0.3.1-r2.ebuild
30 +++ /dev/null
31 @@ -1,112 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -PYTHON_COMPAT=( python2_7 )
37 -inherit autotools-utils eutils python-single-r1 versionator
38 -
39 -DESCRIPTION="Text-based, multi-protocol instant messenger"
40 -HOMEPAGE="https://github.com/ekg2/ekg2/"
41 -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~ppc ~x86"
46 -IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
47 - oracle perl python readline rss spell sqlite ssl threads unicode
48 - xmpp xosd zlib"
49 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
50 -
51 -RDEPEND="
52 - gpg? ( app-crypt/gpgme:= )
53 - gsm? ( media-sound/gsm:= )
54 - gtk? ( x11-libs/gtk+:2= )
55 - idn? ( net-dns/libidn:= )
56 - nls? ( virtual/libintl:= )
57 - oracle? ( dev-db/oracle-instantclient-basic:= )
58 - perl? ( dev-lang/perl:= )
59 - python? ( ${PYTHON_DEPS} )
60 - readline? ( sys-libs/readline:0= )
61 - ssl? ( dev-libs/openssl:0= )
62 - xosd? ( x11-libs/xosd:= )
63 - zlib? ( sys-libs/zlib:= )
64 -
65 - gadu? ( <net-libs/libgadu-1.12:=
66 - gif? ( media-libs/giflib:= )
67 - jpeg? ( virtual/jpeg:0= ) )
68 - ncurses? ( sys-libs/ncurses:=[unicode?]
69 - gpm? ( sys-libs/gpm:= )
70 - spell? ( app-text/aspell:= ) )
71 - rss? ( dev-libs/expat:= )
72 - sqlite? ( dev-db/sqlite:3= )
73 - xmpp? ( dev-libs/expat:=
74 - gnutls? ( net-libs/gnutls:= ) )"
75 -
76 -DEPEND="${RDEPEND}
77 - nls? ( sys-devel/gettext )"
78 -
79 -PATCHES=(
80 - "${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
81 -)
82 -DOCS=(
83 - AUTHORS docs/README docs/TODO
84 - docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
85 - docs/themes.txt docs/themes-en.txt
86 - docs/ui-ncurses.txt docs/ui-ncurses-en.txt
87 -)
88 -
89 -# Due to MakeMaker being used to build Perl modules.
90 -AUTOTOOLS_IN_SOURCE_BUILD=1
91 -
92 -pkg_pretend() {
93 - if ! use gtk && ! use ncurses && ! use readline; then
94 - ewarn 'ekg2 is being compiled without any frontend, you should consider'
95 - ewarn 'enabling at least one of following USEflags:'
96 - ewarn ' gtk, ncurses, readline.'
97 - fi
98 -
99 - if use gnutls && ! use ssl; then
100 - ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
101 - ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
102 - fi
103 -}
104 -
105 -src_configure() {
106 - myeconfargs=(
107 - $(use_with gadu libgadu)
108 - $(use_with gif)
109 - # gnutls is jabber-specific
110 - $(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
111 - $(use_with gpg)
112 - $(use_with gpm gpm-mouse)
113 - $(use_with gsm libgsm)
114 - $(use_with gtk)
115 - $(use_with idn libidn)
116 - $(use xmpp && echo '--with-expat' || use_with rss expat)
117 - $(use_with jpeg libjpeg)
118 - $(use_with ncurses)
119 - $(use_with oracle logsoracle)
120 - $(use_with perl)
121 - $(use_with python)
122 - $(use_with readline)
123 - $(use_with spell aspell)
124 - $(use_with sqlite sqlite3)
125 - $(use_with ssl openssl)
126 - $(use_with threads pthread)
127 - $(use_with xosd libxosd)
128 - $(use_with zlib)
129 - $(use_enable nls)
130 - $(use_enable unicode)
131 - --with-inotify
132 - --without-ioctld
133 - --without-sqlite
134 - --disable-remote
135 - --enable-skip-relative-plugins-dir
136 - )
137 - autotools-utils_src_configure
138 -}
139 -
140 -src_install() {
141 - autotools-utils_src_install
142 - prune_libtool_files --modules
143 -}
144
145 diff --git a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
146 deleted file mode 100644
147 index 010b22fc976..00000000000
148 --- a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
149 +++ /dev/null
150 @@ -1,25 +0,0 @@
151 -From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
152 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
153 -Date: Wed, 6 Apr 2011 16:19:46 +0200
154 -Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
155 -
156 ----
157 - plugins/perl/Makefile.in | 2 +-
158 - 1 files changed, 1 insertions(+), 1 deletions(-)
159 -
160 -diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
161 -index 84d378b..309e2e2 100644
162 ---- a/plugins/perl/Makefile.in
163 -+++ b/plugins/perl/Makefile.in
164 -@@ -594,7 +594,7 @@ all-local:
165 - set -e; for dir in $(perl_dirs); do \
166 - cd $$dir && \
167 - if [ ! -f Makefile ]; then \
168 -- $(PERL) Makefile.PL; \
169 -+ $(PERL) Makefile.PL INSTALLDIRS=vendor; \
170 - fi && \
171 - $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
172 - cd ..; \
173 ---
174 -1.7.4.1
175 -
176
177 diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
178 index d79771701e0..56d35d28309 100644
179 --- a/net-im/ekg2/metadata.xml
180 +++ b/net-im/ekg2/metadata.xml
181 @@ -7,20 +7,6 @@
182 </maintainer>
183
184 <use>
185 - <!-- 0.3* flags -->
186 - <flag name="gif" restrict="=net-im/ekg2-0.3*">
187 - GIF token support for Gadu-Gadu protocol.</flag>
188 - <flag name="gnutls">Enable SSL/TLS support through GnuTLS
189 - for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
190 - be preferred where possible (and OpenSSL will be used
191 - elsewhere).</flag>
192 - <flag name="jpeg">JPEG token support for Gadu-Gadu protocol.</flag>
193 - <flag name="ssl" restrict="=net-im/ekg2-0.3*">
194 - Enable the complete SSL/TLS support through OpenSSL.
195 - This also enables the 'sim' plugin which relies on OpenSSL.</flag>
196 - <flag name="oracle">Support logging messages into Oracle database.</flag>
197 -
198 - <!-- common and modern flags -->
199 <flag name="gadu">Enable Gadu-Gadu protocol support (requires
200 <pkg>net-libs/libgadu</pkg>).</flag>
201 <flag name="gpg">Enable jabber message encryption through