8 files changed, 77 insertions, 48 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index c90dd4c8fca8..6e99537fc012 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 d692703ff164..7254c915071a 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,7 +1,9 @@
 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
+EBUILD pidgin-sipe-1.23.3.ebuild 1341 BLAKE2B fdb4fa0e034937e928257c5d54e37f30f110c7ec3d48206ee8bbe38e24033aa6cd6e314ab64a368f6df360e8eee19e0e4ea686e1f40bce1053ab83c63baebc45 SHA512 10f3780382fcfb2d292e35ae857edb2c5bf9c44b15ac221e4841b49ad51d34385cd74b75e7d59016762f6754ab87902fd09f88e1062102ef3f401c4daf6893a0
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
new file mode 100644
index 000000000000..dfeeb6f126f2
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index 2769a2503a5f..48e40f7086ed 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -2,6 +2,5 @@ AUX wmfire-1.2.3-stringh.patch 352 BLAKE2B 59523193d0adc31509fa41020ba945dd095cf
 AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 BLAKE2B 5b53fd87f6dfce827e5d2403c32e303a7b8dc5d663e93223c6dee6c5bec70f7ad3c07e2261edac7330886eb907bbda72e2635ca3a308d5e0f63b701f31e90976 SHA512 2d0bdc693e53c9c8669f1277134629c3fb506f6c20d67121aef7a624878d56db7a5afa227aaca7c669d0f8ad999ceeadd48380a3f8e9d061ddb853d09f0eb539
 AUX wmfire-1.2.4-no_display.patch 560 BLAKE2B 505f4ba45ecaa5a7d7cf1f8c17f4eedf80c96afd028302243d47ccbef047dc17a12b008e6b10730f16aa037d3047b06c11ba6074e446dbaf3d3660afe67b1447 SHA512 8329fd7912b765f19fb5f72e8bb42f71e0a99a2c350e71e84f604efcec61d43f78557fec5338ffcb86d6cd1ed57e886e9b8eb474bdf47f4e6639795c194500ce
 DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
-EBUILD wmfire-1.2.4-r2.ebuild 918 BLAKE2B f625b4be7ceaea1932bd4248c710f25d44994331900170f576c69d5f44255f197b7f81b4d43e0d86c9c324459871b65299ee2b7d3ec9753783b865dba8e2f488 SHA512 93ba885ddb78741601311d0be8863c0afd4607a8ef56f4a9ee1ae9763aea1663302e54f3cab83eade6c20f07ff052932aa052740c0e55ccb988c13e8625e489c
-EBUILD wmfire-1.2.4-r3.ebuild 885 BLAKE2B 4c2fa78d172bd0aae20e4c0a852a2594ce9fbd2a7880ba1976a1262f059935b54d1479b012abbc8c080d0dd2a9f127b26d55f0d4f966b177e4d4602bff348cab SHA512 160084f1f90f8b29a534fb1e89996c49273dfd9a3c5fcd12677089463c5c60a97870c7a15793902a4aafc5de0c568363fa7f1381a0152c2d6fed9447fe738e16
+EBUILD wmfire-1.2.4-r3.ebuild 881 BLAKE2B 937bc67e869842edccad12898cc14749f6d83344bce4fbbb68a910351c01320d43a48d115e5b7f288af0f2494257ad6beaf9511b6bafd6c8abccda9cfe27eb0b SHA512 b69b7fe59d42b3588b113f3b2e5d2498baa7b4b9d28a79876b999b5bf2c5f1228abfb546f4e3795861eee9c9e224712b70ad2efb645b257428e3c368c2d700c7
 MISC metadata.xml 573 BLAKE2B c75563b4bec05cc6903b69585a1d456d81ba429a99109e841ec3c0ab51327ad91c323c1ef4321b47e56cf5e9ccbff257f7efc6f042afd8715d5224143fe2ac9d SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
deleted file mode 100644
index 94ff738a9e47..000000000000
--- a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Load monitoring dockapp displaying dancing flame"
-HOMEPAGE="http://www.improbability.net/#wmfire"
-SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="session"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libgtop:2
-	x11-libs/libX11
-	x11-libs/libXext
-	session? ( x11-libs/libSM
-		x11-libs/libICE )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.3-stringh.patch
-	epatch "${FILESDIR}"/${P}-no_display.patch
-	epatch "${FILESDIR}"/${P}-lastprocessor_SMP.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable session)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ALL_I_GET_IS_A_GREY_BOX AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
index 5c60356ec8e3..dbf51f0404f5 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="session"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 7515b8cd1ab5..9e13a3c304ee 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -3,5 +3,5 @@ AUX wmfishtime-1.24-no_display.patch 516 BLAKE2B d81cd82250f74a3fda686cc49eb01ac
 DIST wmfishtime-1.24.tar.gz 21895 BLAKE2B d24d5400635223ffe4dbf7e63e5576083c6b5ab99563a24b9c36fe3e50821615998258f59bf6ec5cc630312c356b40210b0ab9091cb4350eb8fe6a1ca59d9b2c SHA512 7df3c6648b46c6f67cf094f634dc7699c1dd1ee4f4a18dbf63d74ebda74f322524b83d99f10a1c8c8c8a5040d78b071754a40ff162fdb13a5a00d01f1eb5c4e6
 EBUILD wmfishtime-1.24-r1.ebuild 700 BLAKE2B f00af39e642dfd4c4f462041169e75d5498de32354bf65eb34c600b285de56eefcfa006284bc7cfd8c99257c3c86b986b01076ab49e3f958e90a776e4e65262e SHA512 3493f4abf5e008adbb96078ccf37c59c1edbd7be4f5edad49597d62b3be7d6b122e5f62d1dbdb327c0c2cf1945c666fafa6f757721d5078280abc2f0ff573773
 EBUILD wmfishtime-1.24-r2.ebuild 809 BLAKE2B 4eff129c47ae21b32659679461bbdf176a2f49e0b02b85f741cfd83170f8b01b7391681e5a459e5c795a88e85fb72cce700471ca5b71c3e045ed61a7a785d9d5 SHA512 abfffaa008b8544315d6e3d440c245fa9e1b6f281aca64c6fde67006e57906b92103c71a4685097f09392f00d871d00b7477c4db6901752df8adb000b9f37e65
-EBUILD wmfishtime-1.24-r3.ebuild 825 BLAKE2B de560ff3ff90ad07f957bce5f6f3ea2ec7648c39c052c17158363b839096cf38c84549ae649d2e4f75fdd76e8d12158513ac40d09ab0ad1dddcf039f4a19b4ed SHA512 fdfe64bc0f867cbcef047dcb1194bb04599a1be7343bbffda84fbd50dffa1a66db2798724bd6abac26c87f16ed5d7cbfcd43bb9a7e5b4087622576f345e91590
+EBUILD wmfishtime-1.24-r3.ebuild 821 BLAKE2B 0e4a95ddcfa71e371dbc854179441d448a60771390830a9daf9ce97aba2c9bebcfcdce6e7a776d2cc85bb7a0fba9fc439534ddb19c47805af162d27c13401119 SHA512 f2b4066f18f18617646145b139840f5beda615a0051e2f05a429db671ba1d24efb8e34d6d9dc73e2225d14e959d6f36bcbfc22ce337db39dfa1fd98b8d2f8e1a
 MISC metadata.xml 480 BLAKE2B c72218dce63a37d81c62b21d779a16de91591b4849d8ea7f8292cf4d73f88e3c6e98a64854133cfe6892ef3db464e4461f26b665f63f24e1efa3dd77128abd65 SHA512 3aebfb320d3d4cf32587efdeb26ba4bbf531c94fcf7c6c5a5c68a78939d8cabf40582d88661e490cba8e48f72f0885b426c69b8f55fba91f0ffa788dbc507220
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
index c66c62e7593d..d031d7285b63 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11"