gentoo resync : 11.02.2018

7 files changed, 4 insertions, 321 deletions

diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index b0f2593a0fbd..2adc3fdf7f6c 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,8 +1,3 @@
-AUX centerim-4.22.10-gcc46.patch 241 BLAKE2B 08714ee95eb0d4c0c968f806085da8d150e48190fed6618e16448fd850b0c179c63b27bf756d5340884c21e66e8d6742b2a5f755c1c2abc105cd8dff4ad641f7 SHA512 bda4a2f1f502972546af28d37ad426d8e1ef2cb1daf9c2434473991dcbebf889d6a4637dfb58fc133dd96c7146348531e9f095d8b15c61ed7bcf037d3e35c356
-AUX centerim-4.22.10-system-expat.patch 1894 BLAKE2B 90d13054b0a50a4b18ad24e4db75a42c04610eb4f1d8267568d04f009f7e411e0f57ba38d2f78f20a023b6c78223f7c3d119dec9e78c0476a0b7133f3327a089 SHA512 e935ec7c69a85e680fce65fa38306a0f2793f8852602f7c26cdf7ecbad8d363fd74a36f5629ae0d78e7f0c00c55236a4cacf88debb0818b02e92655333939379
-DIST centerim-4.22.10.tar.gz 2287832 BLAKE2B 4490284713c18df5a4200c8291f51828d734e7cd9684f42f3c619cf4aff1e2aec18238a34a9bcc53c8620560650e856180e773bb4e51db97f436a8c2b293111a SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116
 DIST centerim5-5.0.1.tar.gz 764152 BLAKE2B 658db040b539a93d4d45e6e05ae57d209c26008ff2061fa3cae0aa4dfd87ca2f4ee78ca0004cd42e14c9f57b124c885f685028332dcb5b2f4e3bf52cab99f796 SHA512 8d9e7cbb1abc3ed8cd91761ebe9a2355c2e39b59cab23de0ad4bfbbf35f4bce062fee5d01b8239d839fc5cef0c74b31187ab1a85a39c46ef679bfc86e628281f
-EBUILD centerim-4.22.10-r1.ebuild 2752 BLAKE2B eafeb3161c98b9bc6674729b5bd8dac58a285c636059815dd6d83946db0830c105a4e9a8851a85a2220e36fb29ba9d32b1774bb3105a64ef100a7649b11d8613 SHA512 64fd31a5cab9bbcb31198554125888a8bd95807daf1ab4b33226a7ad3e9dddb36fd962d65560a88b97bf1393bade6892d622f63001e398044ae7fb3fb4479cdc
-EBUILD centerim-4.22.10.ebuild 2440 BLAKE2B 0d1f285340ea034f8fc2bf35bfaf74a66b3f99821fca3552f6d89cfd27bf50d7d21a9e1f34a87b9cc1153fcc4c686b2f3a9b089dcb1e98e2dd488faef3030d55 SHA512 3f2318218262f97642179bb88835bcadfa7eaf3f10fb56f4bcfdb4e71788c23176425a6ee627bb8a338f45e295046bd7dac5bc7193c25ff30c66399f75788590
-EBUILD centerim-5.0.1.ebuild 839 BLAKE2B a342e6417de06bb6f87165dfe3a070df9c723126e3497e84a8f15cd5435c17df33aecfd84c6a72d3946b83ab50bf592856f713a3b9b482b1fa554601a0acf38e SHA512 44c6e973d053e2ea36e8d626a425183253dfc33b5b989639eb2ee3005f3e9588ff6e8504755f060b8819d06bd3d5476c4dcf64a6b454087b3803011ca4b1a356
-MISC metadata.xml 534 BLAKE2B f89634bc5692d0dec813e689ae769cca75a384d7a3de0b8437285a5827e9463750a2561a934001031fdd3b033e2db0f136c325e13906e9aa181a18436a9fbd72 SHA512 d798c3e47a16394cf1e884b07ffa24c93c2ae224a14a26b36a0e9414adefb4c13f468f1a7f065b63af05d445d869d2bc6d4927782610c62cebc5a36f5787e59c
+EBUILD centerim-5.0.1.ebuild 838 BLAKE2B e7809e064f3863177080f037b46eeb95dd99fedb7595fbf2c02030051fa3982b9a366955650ebaf00432f8a59e973958c8c3bcbf106055342f2844538a51e6ed SHA512 349bd2c7b5a93a24f42f6bba90a1ea2e559190777ac3f6950cf47b86893a818782214191f39d9cfb26bbc9429f6f99ea9c8578968f4914bef64332767a668752
+MISC metadata.xml 216 BLAKE2B ae57b2cbb77ea0f339def04d78473e893d23e5405111b157ba634b09170615c5695970633e0db7f9378eacde7f138a0126da1f278fa634f752d7affcf7a7cfed SHA512 7900b095d94bac2c3c6ed7015ef8c2b695a91762c4800cd2cb6577ff5e2654a107d6b3eed464c16fe1685e23d79071c798d7505cb2789390cd9ca75996330f1f
diff --git a/net-im/centerim/centerim-4.22.10-r1.ebuild b/net-im/centerim/centerim-4.22.10-r1.ebuild
deleted file mode 100644
index 41ca9434836c..000000000000
--- a/net-im/centerim/centerim-4.22.10-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
-
-DESCRIPTION="ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
-elif [[ ${PV} = *.*.*.* ]] # is this a mobshot?
-then
-	SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz"
-else
-	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
-fi
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	dev-libs/expat
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( virtual/jpeg )
-	xmpp? (
-		otr? ( <net-libs/libotr-4 )
-		crypt? ( >=app-crypt/gpgme-1.0.2 )
-	)
-	msn? ( >=net-misc/curl-7.25.0-r1[ssl] )
-	yahoo? ( >=net-misc/curl-7.25.0-r1[ssl] )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/${P/_p*}
-
-check_protocol_iuse() {
-	local flag
-
-	for flag in ${PROTOCOL_IUSE}
-	do
-		use ${flag#+} && return 0
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	if ! check_protocol_iuse
-	then
-		eerror
-		eerror "Please activate at least one of the following protocol USE flags:"
-		eerror "${PROTOCOL_IUSE//+}"
-		eerror
-		die "Please activate at least one protocol USE flag!"
-	fi
-
-	if use otr && ! use xmpp
-	then
-		ewarn
-		ewarn "Support for OTR is only supported with Jabber!"
-		ewarn
-	fi
-
-	if use gadu && ! use jpeg
-	then
-		ewarn
-		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	(
-		cd libjabber/ || exit 1
-		rm \
-			asciitab.h \
-			hashtable.[ch] \
-			iasciitab.h \
-			latin1tab.h \
-			utf8tab.h \
-			xmldef.h \
-			xmlparse.[ch] \
-			xmlrole.[ch] \
-			xmltok.[ch] \
-			xmltok_impl_c.h \
-			xmltok_impl.h \
-	) || die
-	epatch "${FILESDIR}"/${P}-system-expat.patch
-	eautoreconf
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl) \
-		$(use_enable aim) \
-		$(use_with bidi fribidi) \
-		$(use_with jpeg libjpeg) \
-		$(use_with otr libotr) \
-		$(use_enable gadu gg) \
-		$(use_enable icq) \
-		$(use_enable irc) \
-		$(use_enable xmpp jabber) \
-		$(use_enable lj) \
-		$(use_enable msn) \
-		$(use_enable nls locales-fix) \
-		$(use_enable nls) \
-		$(use_enable rss) \
-		$(use_enable yahoo) \
-		|| die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
deleted file mode 100644
index 210b148c5982..000000000000
--- a/net-im/centerim/centerim-4.22.10.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
-
-DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
-elif [[ ${PV} = *.*.*.* ]] # is this a mobshot?
-then
-	SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz"
-else
-	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
-fi
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( virtual/jpeg )
-	xmpp? (
-		otr? ( <net-libs/libotr-4 )
-		crypt? ( >=app-crypt/gpgme-1.0.2 )
-	)
-	msn? ( >=net-misc/curl-7.25.0-r1[ssl] )
-	yahoo? ( >=net-misc/curl-7.25.0-r1[ssl] )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/${P/_p*}
-
-check_protocol_iuse() {
-	local flag
-
-	for flag in ${PROTOCOL_IUSE}
-	do
-		use ${flag#+} && return 0
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	if ! check_protocol_iuse
-	then
-		eerror
-		eerror "Please activate at least one of the following protocol USE flags:"
-		eerror "${PROTOCOL_IUSE//+}"
-		eerror
-		die "Please activate at least one protocol USE flag!"
-	fi
-
-	if use otr && ! use xmpp
-	then
-		ewarn
-		ewarn "Support for OTR is only supported with Jabber!"
-		ewarn
-	fi
-
-	if use gadu && ! use jpeg
-	then
-		ewarn
-		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl) \
-		$(use_enable aim) \
-		$(use_with bidi fribidi) \
-		$(use_with jpeg libjpeg) \
-		$(use_with otr libotr) \
-		$(use_enable gadu gg) \
-		$(use_enable icq) \
-		$(use_enable irc) \
-		$(use_enable xmpp jabber) \
-		$(use_enable lj) \
-		$(use_enable msn) \
-		$(use_enable nls locales-fix) \
-		$(use_enable nls) \
-		$(use_enable rss) \
-		$(use_enable yahoo) \
-		|| die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}
diff --git a/net-im/centerim/centerim-5.0.1.ebuild b/net-im/centerim/centerim-5.0.1.ebuild
index 71be1d0c6c1b..a98925568fbc 100644
--- a/net-im/centerim/centerim-5.0.1.ebuild
+++ b/net-im/centerim/centerim-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
 HOMEPAGE="http://www.centerim.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="debug nls"
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-im/centerim/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
deleted file mode 100644
index a03e9eabd13f..000000000000
--- a/net-im/centerim/files/centerim-4.22.10-gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=363017
-
---- a/libicq2000/libicq2000/sigslot.h
-+++ b/libicq2000/libicq2000/sigslot.h
-@@ -82,6 +82,7 @@
- #ifndef SIGSLOT_H__
- #define SIGSLOT_H__
- 
-+#include <cstddef>
- #include <set>
- #include <list>
- 
diff --git a/net-im/centerim/files/centerim-4.22.10-system-expat.patch b/net-im/centerim/files/centerim-4.22.10-system-expat.patch
deleted file mode 100644
index ef3d52c28c3d..000000000000
--- a/net-im/centerim/files/centerim-4.22.10-system-expat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 539f0dd1b9b81c4b0aece3ab076b1c75073c8062 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 6 May 2016 02:33:51 +0200
-Subject: [PATCH] Build against system Expat
-
----
- libjabber/Makefile.am | 4 ++--
- libjabber/libxode.h   | 2 +-
- src/Makefile.am       | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libjabber/Makefile.am b/libjabber/Makefile.am
-index f91ad8f..7b20f6b 100644
---- a/libjabber/Makefile.am
-+++ b/libjabber/Makefile.am
-@@ -1,4 +1,4 @@
- AM_CPPFLAGS = -I$(top_srcdir)/connwrap
- noinst_LIBRARIES = liblibjabber.a
--noinst_HEADERS = xmltok_impl_c.h latin1tab.h log.h asciitab.h libxode.h jabber.h hashtable.h xmlparse.h iasciitab.h xmldef.h xmltok.h utf8tab.h xmltok_impl.h xmlrole.h nametab.h xmltok_ns_c.h
--liblibjabber_a_SOURCES =  jid.c log.c jutil.c str.c expat.c hashtable.c genhash.c pproxy.c pool.c rate.c xmlparse.c xstream.c xmltok.c xmlnode.c jconn.c xmlrole.c jpacket.c snprintf.c socket.c sha.c
-+noinst_HEADERS = log.h libxode.h jabber.h nametab.h
-+liblibjabber_a_SOURCES =  jid.c log.c jutil.c str.c expat.c genhash.c pproxy.c pool.c rate.c xstream.c xmlnode.c jconn.c jpacket.c snprintf.c socket.c sha.c
-diff --git a/libjabber/libxode.h b/libjabber/libxode.h
-index d6c92a6..8752b0c 100644
---- a/libjabber/libxode.h
-+++ b/libjabber/libxode.h
-@@ -16,7 +16,7 @@
- #include <arpa/inet.h>
- #include <sys/time.h>
- 
--#include "xmlparse.h"
-+#include <expat.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif /* HAVE_CONFIG_H */
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3a0feaf..b8cf2ff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,7 +22,7 @@ centerim_LDADD += -llibgadu
- endif
- if BUILD_JABBER
- centerim_LDFLAGS += -L$(top_builddir)/libjabber
--centerim_LDADD += -llibjabber
-+centerim_LDADD += -llibjabber -lexpat
- endif
- if BUILD_MSN
- centerim_LDFLAGS += -L$(top_builddir)/libmsn
--- 
-2.8.1
-
diff --git a/net-im/centerim/metadata.xml b/net-im/centerim/metadata.xml
index 81747681819f..a5a5d9728be5 100644
--- a/net-im/centerim/metadata.xml
+++ b/net-im/centerim/metadata.xml
@@ -3,12 +3,5 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>swegener@gentoo.org</email>
-	<description>Primary Maintainer</description>
 </maintainer>
-<use>
-	<flag name="gadu">Enable support for the Gadu-Gadu protocol</flag>
-	<flag name="irc">Enable support for the IRC protocol</flag>
-	<flag name="lj">Enable support for the LiveJournal weblog system</flag>
-	<flag name="otr">Enable encrypted conversations</flag>
-</use>
 </pkgmetadata>