6 files changed, 135 insertions, 178 deletions
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 8af86829a8b6..2bd57667d0dd 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,5 +1,4 @@
-AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 BLAKE2B ad21ba7562bc772887d9adf03cfdece724a14fcc13df14b4e8eed47def1fce7959ec8b0818460bd39b5e8addd26a51f480673598c15c04864c7cb6aa1d5cd153 SHA512 8156f6a1f29a1a727840223e4d2bf44c9d6f4a544c948094b405f6a22083070bef5e473597bd993d49e51a5bfedeaa942da8d411f8ed9d61988a8341c8b0134b
-DIST ekg2-0.3.1.tar.gz 1704772 BLAKE2B 2957d872f4d3697e36d495b54e5c39ec59c4865883b9523077ce607fc954268a0f2af07f14e4e217982abb2c1cbfdad423775631d6c22adfd2dbdc8f15895176 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c
-EBUILD ekg2-0.3.1-r2.ebuild 3006 BLAKE2B 1f38e3064802a73ddccfa93be85c9c0eb037b9d037fdc20717035751d44381f3cc933917c610e1409208c881bb77118b06c559184a285b46e458aa5b375411f7 SHA512 b9370c95aa0af3aed3907090e48639a2b6cc6aae294ba14d5d898a41a62db6519a6a17dd4aa0c9f1817104fafc25e512f5272a377c30939b813d909ba9e1342a
-EBUILD ekg2-9999.ebuild 2591 BLAKE2B b22a82a31a940a6466fd21247cba8a3a108a6823c9d531a03c01982497c29400cc9d7c4e09182b5a91e1a765567750d4fbedc9f4ca8367cc914942047a85c6ac SHA512 0931bf1663b43c15e5f292e7969e16179d9eb37a65ffe7bfdeab501f362b383660c3504212da6569d81ccf951ebd701e8ff7d90fbfacab72493bd673cff96e76
-MISC metadata.xml 1400 BLAKE2B c830902e7736736239b2619f35241caf9eb639a760200cc2697ae958359fff0a3a4a923c9a6e9b142aefe34b69eababee14cdd10b16fa84e3627d3b9d8391115 SHA512 b4bfd15f99b562edb78e6d3a9a41b7e924f1138eaab3319c95a989b3d189282752008cce42bbf837a1b431a8c1e9039ccc364626096300fcde96768abdbfd561
+DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
+EBUILD ekg2-0.4_pre20190315.ebuild 2694 BLAKE2B 19f709e61588998bc518611c73e92352f3511fbd178d02d4f8960ad6ae68224a1b7a694bad46849b4286e5c95edd2d5513b4c8af939a3720b7f2c293bbfc6636 SHA512 f7c10f304e54b8119fe710f960b89c6f10164ee5c36845f728ddce4a219181315ae068a6d4c04a20c2da111f5942eab9a791544052458a8ccbdb391ade93c240
+EBUILD ekg2-9999.ebuild 2555 BLAKE2B 01d46c0ccad9c29d21c5011ed1f4a945c90231c0d15c7ace007010b0cf3870417781a0edc0b00c6144f84a6975381e4da4bb04e6dbe36f2b4ef1741ee205bb2f SHA512 21157576319cadc4ab151b1c21bd5f0998cd2271ab0b450a14e5eccdeab5d9857d1d30ef53d476617f31953f73e2d5bc899a83a20c23e9909de7e86fc8b5f4fc
+MISC metadata.xml 710 BLAKE2B 1967d906b644580b49cfc5fb42488d14604de37150a1dd5fb78495e801499daf9e3709ca7b00aa4e1624be7f9d371eaacc77ea2b6c8fcdb2e0d6cd7bbdf62d26 SHA512 a606056720a8186f0353c44530ec838f2583c11d2235a43d84e00e0b6334326c8e76f8690c194e743a103bf6b3fa906eb3636d57159bae4d3d4e819f9b04141f
diff --git a/net-im/ekg2/ekg2-0.3.1-r2.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
deleted file mode 100644
index cbdc45612f78..000000000000
--- a/net-im/ekg2/ekg2-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils eutils python-single-r1 versionator
-
-DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="http://www.ekg2.org"
-SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
-	oracle perl python readline rss spell sqlite ssl threads unicode
-	xmpp xosd zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	gpg? ( app-crypt/gpgme:= )
-	gsm? ( media-sound/gsm:= )
-	gtk? ( x11-libs/gtk+:2= )
-	idn? ( net-dns/libidn:= )
-	nls? ( virtual/libintl:= )
-	oracle? ( dev-db/oracle-instantclient-basic:= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-	xosd? ( x11-libs/xosd:= )
-	zlib? ( sys-libs/zlib:= )
-
-	gadu? ( <net-libs/libgadu-1.12:=
-		gif? ( media-libs/giflib:= )
-		jpeg? ( virtual/jpeg:0= ) )
-	ncurses? ( sys-libs/ncurses:=[unicode?]
-		gpm? ( sys-libs/gpm:= )
-		spell? ( app-text/aspell:= ) )
-	rss? ( dev-libs/expat:= )
-	sqlite? ( dev-db/sqlite:3= )
-	xmpp? ( dev-libs/expat:=
-		gnutls? ( net-libs/gnutls:= ) )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
-)
-DOCS=(
-	AUTHORS docs/README docs/TODO
-	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
-	docs/themes.txt docs/themes-en.txt
-	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
-)
-
-# Due to MakeMaker being used to build Perl modules.
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses && ! use readline; then
-		ewarn 'ekg2 is being compiled without any frontend, you should consider'
-		ewarn 'enabling at least one of following USEflags:'
-		ewarn '  gtk, ncurses, readline.'
-	fi
-
-	if use gnutls && ! use ssl; then
-		ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
-		ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
-	fi
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with gadu libgadu)
-		$(use_with gif)
-		# gnutls is jabber-specific
-		$(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
-		$(use_with gpg)
-		$(use_with gpm gpm-mouse)
-		$(use_with gsm libgsm)
-		$(use_with gtk)
-		$(use_with idn libidn)
-		$(use xmpp && echo '--with-expat' || use_with rss expat)
-		$(use_with jpeg libjpeg)
-		$(use_with ncurses)
-		$(use_with oracle logsoracle)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with readline)
-		$(use_with spell aspell)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl openssl)
-		$(use_with threads pthread)
-		$(use_with xosd libxosd)
-		$(use_with zlib)
-		$(use_enable nls)
-		$(use_enable unicode)
-		--with-inotify
-		--without-ioctld
-		--without-sqlite
-		--disable-remote
-		--enable-skip-relative-plugins-dir
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
new file mode 100644
index 000000000000..e6954bc0de6b
--- /dev/null
+++ b/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1
+
+EGIT_COMMIT="f427d083ee899d42532c046100490a915b0e8a82"
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="https://github.com/ekg2/ekg2/"
+SRC_URI="https://github.com/ekg2/ekg2/archive/${EGIT_COMMIT}.tar.gz
+	-> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
+	perl python readline rss spell sqlite ssl xmpp unicode zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	gadu? ( <net-libs/libgadu-1.12:0= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl:0= )
+	openssl? ( dev-libs/openssl:0= )
+	perl? ( dev-lang/perl:0= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rss? ( dev-libs/expat:0= )
+	ssl? ( net-libs/gnutls:0= )
+	xmpp? ( dev-libs/expat:0= )
+	zlib? ( sys-libs/zlib:0= )
+
+	ncurses? ( sys-libs/ncurses:0=[unicode=]
+		gpm? ( sys-libs/gpm:0= )
+		spell? ( app-text/aspell:0= ) )
+	sqlite? ( dev-db/sqlite:3= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+DOCS=(
+	AUTHORS README.md docs/README docs/TODO
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+	docs/themes.txt docs/themes-en.txt
+	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses && ! use readline; then
+		ewarn 'ekg2 is being compiled without any frontend. You should consider'
+		ewarn 'enabling at least one of following USEflags:'
+		ewarn '  gtk, ncurses, readline.'
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# direct plugin references
+		$(use_enable gadu gg)
+		$(use_enable gpg)
+		$(use_enable gtk)
+		$(use_enable ncurses)
+		$(use_enable nntp)
+		$(use_enable openssl sim)
+		$(use_enable perl)
+		$(use_enable python)
+		$(use_enable readline)
+		$(use_enable rss)
+		$(use_enable sqlite logsqlite)
+		$(use_enable xmpp jabber)
+
+		$(use_enable !minimal autoresponder)
+		$(use_enable !minimal jogger)
+		$(use_enable !minimal mail)
+		$(use_enable !minimal polchat)
+		$(use_enable !minimal rivchat)
+		$(use_enable !minimal sms)
+
+		# sqlite switch
+		--with-sqlite3
+
+		# optional deps
+		$(use_with gpm)
+		# do not pass --with-inotify as it will fail if check fails
+		$(use_with spell aspell)
+		$(use_with ssl gnutls)
+		$(use_with zlib)
+
+		# other magic
+		$(use_enable nls)
+		--with-perl-module-build-flags='INSTALLDIRS=vendor'
+		--enable-fast-configure
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 05cb485792d5..8c458e0a9e43 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,33 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://github.com/leafnode/${PN}.git"
-
-inherit git-r3
-#endif
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils python-single-r1
+inherit autotools git-r3 python-single-r1
 
 DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="http://www.ekg2.org"
-SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+HOMEPAGE="https://github.com/ekg2/ekg2/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/ekg2/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
 IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
 	perl python readline rss spell sqlite ssl xmpp unicode zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2=
+RDEPEND="dev-libs/glib:2
 	gadu? ( <net-libs/libgadu-1.12:0= )
 	gpg? ( app-crypt/gpgme:1= )
-	gtk? ( x11-libs/gtk+:2= )
+	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl:0= )
 	openssl? ( dev-libs/openssl:0= )
 	perl? ( dev-lang/perl:0= )
@@ -53,11 +47,6 @@ DOCS=(
 	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
 )
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 pkg_pretend() {
 	if ! use gtk && ! use ncurses && ! use readline; then
 		ewarn 'ekg2 is being compiled without any frontend. You should consider'
@@ -66,8 +55,13 @@ pkg_pretend() {
 	fi
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	myeconfargs=(
+	local myconf=(
 		# direct plugin references
 		$(use_enable gadu gg)
 		$(use_enable gpg)
@@ -104,5 +98,10 @@ src_configure() {
 		--with-perl-module-build-flags='INSTALLDIRS=vendor'
 		--enable-fast-configure
 	)
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
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
deleted file mode 100644
index 010b22fc976c..000000000000
--- a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 6 Apr 2011 16:19:46 +0200
-Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
-
----
- plugins/perl/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
-index 84d378b..309e2e2 100644
---- a/plugins/perl/Makefile.in
-+++ b/plugins/perl/Makefile.in
-@@ -594,7 +594,7 @@ all-local:
- 	set -e; for dir in $(perl_dirs); do \
- 	 cd $$dir && \
- 	 if [ ! -f Makefile ]; then \
--	   $(PERL) Makefile.PL; \
-+	   $(PERL) Makefile.PL INSTALLDIRS=vendor; \
- 	 fi && \
- 	 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
- 	 cd ..; \
--- 
-1.7.4.1
-
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index d79771701e08..56d35d283099 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -7,20 +7,6 @@
 	</maintainer>
 
 	<use>
-		<!-- 0.3* flags -->
-		<flag name="gif" restrict="=net-im/ekg2-0.3*">
-			GIF token support for Gadu-Gadu protocol.</flag>
-		<flag name="gnutls">Enable SSL/TLS support through GnuTLS
-			for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
-			be preferred where possible (and OpenSSL will be used
-			elsewhere).</flag>
-		<flag name="jpeg">JPEG token support for Gadu-Gadu protocol.</flag>
-		<flag name="ssl" restrict="=net-im/ekg2-0.3*">
-			Enable the complete SSL/TLS support through OpenSSL.
-			This also enables the 'sim' plugin which relies on OpenSSL.</flag>
-		<flag name="oracle">Support logging messages into Oracle database.</flag>
-
-		<!-- common and modern flags -->
 		<flag name="gadu">Enable Gadu-Gadu protocol support (requires
 			<pkg>net-libs/libgadu</pkg>).</flag>
 		<flag name="gpg">Enable jabber message encryption through