7 files changed, 29 insertions, 153 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 1ce50d59c0f8..34652b085175 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 48f72c6909c7..f722f1a47de1 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,9 +1,5 @@
-DIST pidgin-sipe-1.22.0.tar.gz 1255851 BLAKE2B 442206854bc420f8a93a34246f28a923adc83c08a9c113d871f920799e2b33505a14b4181d1b20aa65e03c6d6483b01be22e66ed4496ea8571247bfc560d2a97 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed
-DIST pidgin-sipe-1.23.0.tar.gz 1296050 BLAKE2B 1c69587ab6407b6c83dda349ab9a5ad61e3e1d8936b58d7edd71cbead3f8573ab60f7e95866968ec55163a533077be268d6166354d9d22cd2110e6b2ae1708c0 SHA512 8ed0c353e83707b99059791b97568d874634eb1d5ec1a43031864cc8469dc859e7485eb617fe5e23960c091fb15334a903452827ef8a650ed4d677f3a2222cef
-DIST pidgin-sipe-1.23.2.tar.gz 1297900 BLAKE2B 2e37fc883c04ae9cb3ed562e932f0d207c449f67521c65a64bd52a580386fb822d10814bb7fda7cb0f6a67ae949b428db0b3c160f113c279b2e8440360af14ba SHA512 150dd41577c571442c664d91b55cff461ce2bd8dfdca6e8c8dffd27ee22c35393031ddcc7e070409ed5206f8cd0f17246f70d9ebfb6c868503a90be989ac34e6
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
-EBUILD pidgin-sipe-1.22.0.ebuild 1341 BLAKE2B ed5be88ca89073860f316078ec1133c2320513fc15e07d694b0c364959ab1b445d4b356a626d54a5b746d154619991669728bac87cb322380a43ec9749a73dc4 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f
-EBUILD pidgin-sipe-1.23.0.ebuild 1344 BLAKE2B 3a1721aa32f475098613ad9e9bc7f2fbc763bafd792f56241255a645b71fc9fcdb980a476f72349e5d73f23cba7398bb89f56d0345cc6f8d4c0d98a09a6ad272 SHA512 3079263ade25f09405f42d95c5c0a22cb5444593d7343573549c68fb0893444621704bdf4182c437d9aba9a09a7dcc3dc611abf3f7c337202d513ce5d47f9cc6
-EBUILD pidgin-sipe-1.23.2.ebuild 1344 BLAKE2B a520f0994c19a8c38f75c300f78029c54869c3721992bccf0da594fa228ae57af3632ee02fddf2be9ab8789d592fa28ae1b6210d72ab31cf3d15f4d92a888e82 SHA512 aef0f86051cd40690b06c9111dd4717d850e12f4664d1568359e7c2d2e648010c755d493de8408d143f22a08823b9501c56b4c9978b55eee5d5ea620a4252ef3
+DIST pidgin-sipe-1.24.0.tar.gz 1322542 BLAKE2B 52ca80e4fb12f24c3406f671d499043f054ea1d4ad6f715d7feafa3df2d2203ccaeb9c0dd8d6214a19b383916d006faf8b284b3c0df9b6fce8926300811898c5 SHA512 9a7906cb6b5514d70b410bac436f6822316b570d1114f684ee96999cf0585816324780428212dd43b0988b22eff615630e9034bb518cb69add890877506b20e3
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
+EBUILD pidgin-sipe-1.24.0.ebuild 1281 BLAKE2B c74d25e872cc424eec56eb652c6ff8f28b66a262775e27d6544623a16cbf841c45817d14a2e5b7715795e52bde8d5e05fbf5370d2d431cd6995ecc20811e3065 SHA512 5e50a79e986d6ae2083b6c20827bfdec4e0a7b81f321ac0c61c5ae78c504ecc211959e82520d0412334144703df8b7a302b49c88a593377fdc564fee826b7f7d
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
deleted file mode 100644
index 9891f280612b..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
-
-RDEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/libxml2
-	openssl? ( dev-libs/openssl:= )
-	!openssl? ( dev-libs/nss )
-	kerberos? ( virtual/krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer:1.0
-		>=net-im/pidgin-2.8.0
-		net-libs/farstream:0.2
-	)
-	!voice? (
-		>=dev-libs/glib-2.12.0:2
-		net-im/pidgin
-	)
-	telepathy? (
-		>=sys-apps/dbus-1.1.0
-		>=dev-libs/dbus-glib-0.61
-		>=dev-libs/glib-2.28:2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-"
-
-DEPEND="dev-util/intltool
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		$(use_enable telepathy) \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv) \
-		$(use_enable !openssl nss) \
-		$(use_enable openssl)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.2.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.2.ebuild
deleted file mode 100644
index 6eaeda36c6bf..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
-
-RDEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/libxml2
-	openssl? ( dev-libs/openssl:= )
-	!openssl? ( dev-libs/nss )
-	kerberos? ( virtual/krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer:1.0
-		net-libs/farstream:0.2
-	)
-	!voice? (
-		>=dev-libs/glib-2.12.0:2
-	)
-	net-im/pidgin[dbus?]
-	telepathy? (
-		>=sys-apps/dbus-1.1.0
-		>=dev-libs/dbus-glib-0.61
-		>=dev-libs/glib-2.28:2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-"
-
-DEPEND="dev-util/intltool
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		$(use_enable telepathy) \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with dbus) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv) \
-		$(use_enable !openssl nss) \
-		$(use_enable openssl)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.24.0.ebuild
index 0f84cb3d0a0b..6e1a832817f3 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.24.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools
+EAPI=7
 
 DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
 HOMEPAGE="http://sipe.sourceforge.net/"
@@ -44,11 +42,6 @@ DEPEND="dev-util/intltool
 	${RDEPEND}
 "
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		--enable-purple \
diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
index 474355b46d11..dafe7e93004f 100644
--- a/x11-plugins/wmail/Manifest
+++ b/x11-plugins/wmail/Manifest
@@ -1,5 +1,7 @@
 AUX wmail-2.0.maildir-parse-from.patch 325 BLAKE2B 6a4c6c551e54494826d14806d03bdacf72250a1d4ad9659a9658895cc1e1a22be80b4898693fb5201cf37393850c3e3025f78d172cec1e7bbe3234b4ae980d68 SHA512 8ad5ac85e8249d330cda20cb1c8a260ef560894f0baafefa04eb56e348034b1cf828a107de3ef412a7cc6443f3e25be186c180ebfa0cd24f345190f89012aead
 AUX wmail-2.0.support-libdockapp-0.5.0.patch 1030 BLAKE2B cd65fd05ddef1024cffdf58e20b06c902c5704e30381caba0b321bdf022f51cb322b01cb48d03e755e02da3d6c991e7b8e043ede3340a25faf0bfc4250e311a8 SHA512 af6b44e48063fc5c671602a53d3c4637564ae08e6e4c7f273aa2eca881c6bb3098f26958ca59f320cc7707f5adeb8d46e1ea2249b19e991c343d16eca0906005
 DIST wmail-2.0.tar.gz 46468 BLAKE2B 316743065f72e14339e4c7d9bc1d394d0f5ccfa5772efd94856bef184fa3a60a1892c510f07655dacbf0b470492e085e413dcb29e3ec166c5d1a1f03d388636e SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039
+DIST wmail-2.2.tar.gz 127443 BLAKE2B fc94f94e9a87ccf038bf75eb8c01e9cca738dbb468b60632ba9a04c1ca0f4266ee5be032cca37ae14a58a444f733dd9d20bad57789c24d497f2af87c80d801d2 SHA512 59217e190e6c296ee457e0c0e06297c4b7f9e627a52848f0012c4158a0c7a6a39415e63fffe722a5c2ba79ff8f59721b5e1ecbd25219f10c24fdde401e6556e8
 EBUILD wmail-2.0-r5.ebuild 1111 BLAKE2B 00f9da6179d555157981f659826a1356c9bc2643c539f06411aac5f4a1a69f16a87cfa794067d4c72e2b919b57a379086215a973a7234eb0667ee6360e955825 SHA512 3a1854e4caf8bc47d071b796b5be74f085599fa9d8cd425f9f73926705b2d490ba354f6e1a082ad3585a9e8db99c0a63cd05363a92715845b17d6479b670c757
+EBUILD wmail-2.2.ebuild 510 BLAKE2B d65fd4700d86161502a130f2d6ac85e1fa51ee12953c9e949680776c9a047a220fe6e738b1b46b577f07a3055c2992c85df37fab461fca75e091de3fdbf4d2ba SHA512 ee2ec7236fb745f9395fb2a562e07ff7c3fb4d60bc44c368aa1efc99c576232a7e6190164bea14a07995c4a498f20e001d33f80e0a958502a4d75254d961b590
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmail/wmail-2.2.ebuild b/x11-plugins/wmail/wmail-2.2.ebuild
new file mode 100644
index 000000000000..6491f6f02064
--- /dev/null
+++ b/x11-plugins/wmail/wmail-2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Window Maker dock application showing incoming mail"
+HOMEPAGE="https://www.dockapps.net/wmail"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README wmailrc-sample)
+
+src_configure() {
+	econf --enable-delt-xpms
+}