commit: 274b842481cf1ceb5562f3a54680473145bc5e3d Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Tue Aug 24 12:38:39 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Aug 24 12:38:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=274b8424
net-im/minbif: Remove last-rited package Closes: https://bugs.gentoo.org/788577 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> net-im/minbif/Manifest | 1 - net-im/minbif/files/minbif-1.0.5-gcc47.patch | 76 -------------------- .../files/minbif-1.0.5-glib-single-includes.patch | 26 ------- .../minbif-1.0.5-rename-imlib-load-error.patch | 13 ---- net-im/minbif/files/minbif.initd | 23 ------ net-im/minbif/metadata.xml | 5 -- net-im/minbif/minbif-1.0.5-r3.ebuild | 83 ---------------------- profiles/package.mask | 5 -- 8 files changed, 232 deletions(-) diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest deleted file mode 100644 index f22b7b17b0b..00000000000 --- a/net-im/minbif/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST minbif-1.0.5.tar.gz 176039 BLAKE2B 195af3dbb45f0c2b6499fd440c4ffc637d7e4e723879282a4914538d562c2833f30ae562098ebc5c47ac694b37f558984e599cb3701d6b1af6256db32ad91152 SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch deleted file mode 100644 index 8566406a318..00000000000 --- a/net-im/minbif/files/minbif-1.0.5-gcc47.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit fe71fd989a4501c77314b2906756f4e9a328ff31 -Author: Romain Bignon <[email protected]> -Date: Tue May 8 16:46:35 2012 +0200 - - fixes for gcc 4.7 - ---- a/src/im/account.cpp -+++ b/src/im/account.cpp -@@ -18,6 +18,7 @@ - - #include <cassert> - #include <cstring> -+#include <unistd.h> - #ifdef HAVE_IMLIB - #include <Imlib2.h> - #endif /* HAVE_IMLIB */ ---- a/src/im/request.cpp -+++ b/src/im/request.cpp -@@ -18,6 +18,7 @@ - - #include <errno.h> - #include <string.h> -+#include <unistd.h> - - #include "request.h" - #include "buddy.h" ---- a/src/irc/dcc.cpp -+++ b/src/irc/dcc.cpp -@@ -23,6 +23,7 @@ - #include <string.h> - #include <sys/types.h> - #include <netinet/in.h> -+#include <unistd.h> - - #include "dcc.h" - #include "nick.h" ---- a/src/irc/irc.cpp -+++ b/src/irc/irc.cpp -@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const - Buddy* IRC::getNick(const im::Buddy& buddy) const - { - map<string, Nick*>::const_iterator it; -- Buddy* nb; -+ Buddy* nb = NULL; - for(it = users.begin(); - it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy); - ++it) -@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const - ConvNick* IRC::getNick(const im::Conversation& conv) const - { - map<string, Nick*>::const_iterator it; -- ConvNick* n; -+ ConvNick* n = NULL; - for(it = users.begin(); - it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv); - ++it) ---- a/src/server_poll/inetd.cpp -+++ b/src/server_poll/inetd.cpp -@@ -18,6 +18,7 @@ - - #include <cassert> - #include <glib.h> -+#include <unistd.h> - - #include "inetd.h" - #include "irc/irc.h" ---- a/src/sockwrap/sockwrap.cpp -+++ b/src/sockwrap/sockwrap.cpp -@@ -22,6 +22,7 @@ - # include "sockwrap_tls.h" - #endif - #include "core/util.h" -+#include <unistd.h> - - namespace sock - { diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch deleted file mode 100644 index 599355eb502..00000000000 --- a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp -=================================================================== ---- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp -+++ minbif-1.0.5/src/server_poll/daemon_fork.cpp -@@ -20,7 +20,7 @@ - #include <cassert> - #include <cstring> - #include <cerrno> --#include <glib/gmain.h> -+#include <glib.h> - #include <sys/socket.h> - #include <sys/stat.h> - #include <arpa/inet.h> -Index: minbif-1.0.5/src/server_poll/inetd.cpp -=================================================================== ---- minbif-1.0.5.orig/src/server_poll/inetd.cpp -+++ minbif-1.0.5/src/server_poll/inetd.cpp -@@ -17,7 +17,7 @@ - */ - - #include <cassert> --#include <glib/gmain.h> -+#include <glib.h> - - #include "inetd.h" - #include "irc/irc.h" diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch deleted file mode 100644 index e9fa875d247..00000000000 --- a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/im/account.cpp b/src/im/account.cpp -index f155334..f040fcd 100644 ---- a/src/im/account.cpp -+++ b/src/im/account.cpp -@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename) - else - { - char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); -- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; -+ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; - - close(temp_fd); - /* Try to encode in a supported format. */ diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd deleted file mode 100644 index 06cac415f61..00000000000 --- a/net-im/minbif/files/minbif.initd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -MINBIF_EXEC="/usr/bin/minbif" - -depend() { - need logger net -} - -start() { - ebegin "Starting minbif" - start-stop-daemon --start --startas ${MINBIF_EXEC} \ - -c minbif:minbif --exec ${MINBIF_EXEC} -- \ - /etc/minbif/minbif.conf - eend $? -} - -stop() { - ebegin "Stopping minbif" - start-stop-daemon --stop --exec ${MINBIF_EXEC} - eend $? -} diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/net-im/minbif/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-im/minbif/minbif-1.0.5-r3.ebuild b/net-im/minbif/minbif-1.0.5-r3.ebuild deleted file mode 100644 index d438c5b97a6..00000000000 --- a/net-im/minbif/minbif-1.0.5-r3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="IRC gateway to IM networks" -HOMEPAGE="https://symlink.me/projects/minbif/wiki/"; -SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="gnutls +imlib +libcaca pam xinetd" -REQUIRED_USE="libcaca? ( imlib )" - -DEPEND=" - acct-group/minbif - acct-user/minbif - net-im/pidgin - gnutls? ( net-libs/gnutls ) - imlib? ( media-libs/imlib2 ) - libcaca? ( - media-libs/imlib2 - media-libs/libcaca - ) - pam? ( sys-libs/pam ) -" -RDEPEND=" - ${DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch" - "${FILESDIR}/${PN}-1.0.5-gcc47.patch" - "${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch" -) - -src_prepare() { - cmake_src_prepare - - sed "s/-Werror//g" -i CMakeLists.txt || die - - if use xinetd; then - sed "s/type\s=\s[0-9]/type = 0/" -i minbif.conf || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCONF_PREFIX="${EPREFIX}"/etc/minbif - -DDOC_PREFIX="${EPREFIX}"/usr/share/doc/"${PF}" - -DENABLE_VIDEO=OFF - -DENABLE_TLS=$(usex gnutls) - -DENABLE_IMLIB=$(usex imlib) - -DENABLE_CACA=$(usex libcaca) - -DENABLE_PAM=$(usex pam) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /var/lib/minbif - fperms 700 /var/lib/minbif - fowners minbif:minbif /var/lib/minbif - - doman man/minbif.8 - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/minbif.xinetd minbif - fi - - newinitd "${FILESDIR}"/minbif.initd minbif - - insinto /usr/share/minbif - doins -r scripts -} diff --git a/profiles/package.mask b/profiles/package.mask index 7ce764f69c1..96b7fac8818 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -296,11 +296,6 @@ media-sound/tapestrea # bug #793020, bug #692976, bug #741600, bug #703948, bug #674334. sci-misc/tango -# Sam James <[email protected]> (2021-07-26) -# Fails to build with GCC 11. -# Removal on 2021-08-26. bug #788577. -net-im/minbif - # Andrew Ammerlaan <[email protected]> (2021-07-12) # Version 3.3.0 suffers from ridiculously high CPU usage, this version has # therefore been retracted upstream.
