commit: f7d25cbc71ea6986bc7d439975637e00705b75b7 Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Fri Feb 9 07:27:19 2018 +0000 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> CommitDate: Fri Feb 9 07:28:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d25cbc
net-im/centerim: cleanup Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-im/centerim/Manifest | 1 - net-im/centerim/centerim-4.22.10-r1.ebuild | 130 --------------------- net-im/centerim/centerim-4.22.10.ebuild | 112 ------------------ net-im/centerim/files/centerim-4.22.10-gcc46.patch | 12 -- .../files/centerim-4.22.10-system-expat.patch | 51 -------- net-im/centerim/metadata.xml | 6 - 6 files changed, 312 deletions(-) diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest index 07c3cf4f8be..7f2a5778c34 100644 --- a/net-im/centerim/Manifest +++ b/net-im/centerim/Manifest @@ -1,2 +1 @@ -DIST centerim-4.22.10.tar.gz 2287832 BLAKE2B 4490284713c18df5a4200c8291f51828d734e7cd9684f42f3c619cf4aff1e2aec18238a34a9bcc53c8620560650e856180e773bb4e51db97f436a8c2b293111a SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116 DIST centerim5-5.0.1.tar.gz 764152 BLAKE2B 658db040b539a93d4d45e6e05ae57d209c26008ff2061fa3cae0aa4dfd87ca2f4ee78ca0004cd42e14c9f57b124c885f685028332dcb5b2f4e3bf52cab99f796 SHA512 8d9e7cbb1abc3ed8cd91761ebe9a2355c2e39b59cab23de0ad4bfbbf35f4bce062fee5d01b8239d839fc5cef0c74b31187ab1a85a39c46ef679bfc86e628281f 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 41ca9434836..00000000000 --- 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 210b148c598..00000000000 --- 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/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch deleted file mode 100644 index a03e9eabd13..00000000000 --- 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 ef3d52c28c3..00000000000 --- 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 <sebast...@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 81747681819..92fe867e708 100644 --- a/net-im/centerim/metadata.xml +++ b/net-im/centerim/metadata.xml @@ -5,10 +5,4 @@ <email>swege...@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>