gentoo resync : 23.06.2018

8 files changed, 67 insertions, 78 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ddd763745156..3ab1d2e2da2f 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/epplets/Manifest b/x11-plugins/epplets/Manifest
deleted file mode 100644
index 45487f70a2c3..000000000000
--- a/x11-plugins/epplets/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST epplets-0.12.tar.gz 894232 BLAKE2B dc86da84888531a1af5b052c739b4f4d06d0d9013fe9d0f996ea529b2ad77541fa9e0b5c7acf30a2443c56c66a6765c6aab30f1bf36a560968194a85d980c723 SHA512 b8b017ed4199f6a083db4e66090611e24d50428d287b1ef414725e68bc48ecedc3f6a3c9f68d38645e9146739e35e43ca08197d832b38d580039f3a050de93dc
-DIST epplets-0.14.tar.gz 971885 BLAKE2B c9dbbb268ec4580a81f0c7a8a786a5fcf03c88463be997de469892b57798d11c9e0e33196e2e83c2ea648888c5ec61cc964b06ed596b98606292b3719e3af25d SHA512 d83d60521fe06497f109c3fbb5c2e10abd36a43b050c10787a68d9f9f8c2866f57d78a8559a482654d9bb0eaaf3ce791e4839bb0fda88ccbf026d8ec5dc93824
-EBUILD epplets-0.12.ebuild 606 BLAKE2B 13d48b3727fb1bdd6398bf0212c7d45157922ea39c7a02e0f4a06e91f3794db41a5c604acf1c3c98a0e982c42c05ec164d3e00b0a6c148e1d093f0a5b11a4cfb SHA512 46978afd57abc1938f89337dfe71dbec8e4f6df8b03833871800d44c2ccd8646566500964139c1e0dddea4244015066078ad9c10e76e7434e577024ae821ee59
-EBUILD epplets-0.14.ebuild 693 BLAKE2B ea74e472cf788c17b130c73f30408b6717aa7f0a95607c303e4a524daee18cc88b07555b010944db2c0ff062ba203d4a4c1b02984d020d5843f7203e1e8975dd SHA512 c8a038ba275cf5c57ee8543acf58563be123888755305de68f81812110978d0c1c6774ea0b0600e829ee6c193e6d5190a758b92f3f7115573a2e31c30cc83e41
-MISC metadata.xml 614 BLAKE2B b871de4d369d5bfafe24acd7742e416d380a32793e5481cc8c42ef6496842143b5cd2d068b42c1b860b7ef17a18fdfc31dc3043fd645ef3ed604df8e95a823ef SHA512 51a579ede5d5bc1f61af39627085c348fa1caa557af76bd5b0cb4110880bae02022126bab7646c51857550ff906419927d0f5ce8b7eb6cd2acb30b837927d933
diff --git a/x11-plugins/epplets/epplets-0.12.ebuild b/x11-plugins/epplets/epplets-0.12.ebuild
deleted file mode 100644
index 1b147792f12d..000000000000
--- a/x11-plugins/epplets/epplets-0.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Base files for Enlightenment epplets and some epplets"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	media-libs/freeglut
-	media-libs/imlib2
-	>=x11-wm/enlightenment-0.16.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/x11-plugins/epplets/epplets-0.14.ebuild b/x11-plugins/epplets/epplets-0.14.ebuild
deleted file mode 100644
index 416ba6a70a62..000000000000
--- a/x11-plugins/epplets/epplets-0.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Base files for Enlightenment epplets and some epplets"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	media-libs/freeglut
-	media-libs/imlib2
-	>=x11-wm/enlightenment-0.16.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
deleted file mode 100644
index dc98629925af..000000000000
--- a/x11-plugins/epplets/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-Epplets are small, handy Enlightenment applets, similar to 'dockapps'
-or 'applets' for other packages.  The epplets package contains the
-base epplet API library and header files, as well as the core set of
-epplets, including CPU monitors, clocks, a mail checker, mixers, a
-slideshow, a URL grabber, a panel-like toolbar, and more.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
new file mode 100644
index 000000000000..df0866ffa483
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -0,0 +1,3 @@
+DIST telegram-purple_1.3.1.orig.tar.gz 509083 BLAKE2B 5842fac81fa1cd9d2681fe5ac790f0be227dadc49d2031a1682da74f62ae163c7ee9d7bb8f421a974bb0d3ea135b1d44983c976b1afbb81758a3953e89f9c68a SHA512 3d088ea8b77aeba1d7f26dcd3223420bcd50372d610368b8786eca0cbdb0a11bcc2d93f7948348c5e0305479703f74e5b5ad8e06e782e2df119cfd73a4e4a63e
+EBUILD pidgin-telegram-1.3.1.ebuild 1053 BLAKE2B d48f7395b9c4eba3d0b652f70a33c806948546a71306ba76abcd0b6c181aef2af3cc18caa33a4fe9fdc412c169a53505daeefb0c67fb08c239707294cf07c619 SHA512 d677b28f6611d4c0b6f12cb9b46944f2445278d7bcd9a65b270b2397467c3305dbb34b5a9b4c73bdd158bb4bae8f3b498e2b3305a5befb157842105e53413372
+MISC metadata.xml 688 BLAKE2B 516c934c562bb806a075bccc91c11cb8dfa6c7b914f1e35292135d96d6ea033486d077ef197ee49eda0c5851f6999badd2b542b5056e1f34f3a916c78012341d SHA512 6cb1f3fdcd8ad4acaa7f9263c651204c261863b45403d7b51f25bc56527d9008f8ba2393bdaea989cf20fcce31e93c632bc400b258f9d7d24065b5de19eaf5c8
diff --git a/x11-plugins/pidgin-telegram/metadata.xml b/x11-plugins/pidgin-telegram/metadata.xml
new file mode 100644
index 000000000000..c8fb36cb1a77
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		This plugin adds support for the Telegram messenger protocol,
+		which can be used directly in net-im/pidgin.
+		Telegram is a cloud-based instant messaging and voice over IP service.
+	</longdescription>
+	<use>
+		<flag name="gcrypt">Use dev-libs/libgcrypt instead of dev-libs/openssl.</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1.ebuild
new file mode 100644
index 000000000000..90999385581b
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt +nls +webp"
+
+RDEPEND="net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? ( dev-libs/openssl:0= )
+	nls? ( sys-devel/gettext )
+	webp? ( media-libs/libwebp:= )"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+S="${WORKDIR}/telegram-purple"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' to make it compile
+	find -name 'Makefile*' -exec sed -i -e 's/-Werror //'  {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gcrypt)
+		$(use_enable nls translation)
+		$(use_enable webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}