Version bump, also fix gcc-4.7 and glib-2.32 compilation, and create user/group properly (#343219 by fulax).

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 199 insertions, 11 deletions

diff --git a/net-im/minbif/ChangeLog b/net-im/minbif/ChangeLog
index ca2aa8b349b1..cd86373d7357 100644
--- a/net-im/minbif/ChangeLog
+++ b/net-im/minbif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/minbif
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.9 2011/02/25 19:41:41 cedk Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/ChangeLog,v 1.10 2012/07/24 17:43:28 pacho Exp $
+
+*minbif-1.0.5 (24 Jul 2012)
+
+  24 Jul 2012; Pacho Ramos <pacho@gentoo.org> +files/minbif-1.0.5-gcc47.patch,
+  +files/minbif-1.0.5-glib-single-includes.patch, +minbif-1.0.5.ebuild:
+  Version bump, also fix gcc-4.7 and glib-2.32 compilation, and create
+  user/group properly (#343219 by fulax).
 
 *minbif-1.0.4 (25 Feb 2011)
 
@@ -39,4 +46,3 @@
   24 Nov 2009; Cédric Krier <cedk@gentoo.org> +minbif-1.0.ebuild,
   +files/minbif.initd, +metadata.xml:
   New ebuild
-
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
index b0d782ef8700..19ec29a5d73d 100644
--- a/net-im/minbif/Manifest
+++ b/net-im/minbif/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 AUX minbif-1.0.1-as-needed.patch 2031 SHA256 f7e22e3de97e9eebfb8079729ea450634633a5323025cca32cdc94ca8c913347 SHA512 973d9228910299cd76a8a7c1c979a8b227e0e685361790c7a8cfa5e82b6a0d38388c12f931333e137d570bdd29aa7e6fbb86eb5cc54eeb941f36220bd97c26d7 WHIRLPOOL e7a776a5ee74159daf4d38f69bbce05e4c4c9333208aa7c76f3413c47d10f5e6e6c1c907c94af9c5911ec769ced9b1345a5113ac5a9203145dca52a87bc82cea
+AUX minbif-1.0.5-gcc47.patch 2067 SHA256 c219fb548dc591e47d38ccc506795140cef8ad732680afc89cb56d1ff1be9bba SHA512 46c6d7cd769799e3c069743d985b916137944610656a0fc12d52f91796c1a2c99a58549b0276e1c2bac2e84651866f73078a58b516e87a8d6e606113a0f7405d WHIRLPOOL 6e0bdde8868dbc022b7445ebd80d5ffe8f2007125c63e2a464ee51849416b265702e4e290c6e9891b66173f5b2aa7ffa5dfed6e3bc5e8991596911bf4bdf0fc2
+AUX minbif-1.0.5-glib-single-includes.patch 754 SHA256 65c27d01bd9d774da8ef38a1364bf74caf4ce5891776ac0cbb8e391cb57bab4e SHA512 fd7c27d1e171aa1e321e82f5e41e6908109101b52519dcad32a9107d14c95b0664dcf7d6ed1969dfce7397976712a6f094966bb06e36ff21fa0c75fe6d86ea91 WHIRLPOOL 9a42c62d9f9677d9768920dffcbd37690be34dc8ae9bd249b86d637aa013ebbc75596a232298826920f5d505e2ae92212dd01b5a0c9e6a4d704127c3851063c9
 AUX minbif.initd 561 SHA256 0a66ca96897ae7fb948150e1d7e01b328de2c2d32521de4c6fe24fdd2f630c7a SHA512 6106657567b5fca1255f30b89d2893f46e5593177c2bfc073676d9628ca31743b44d53e2864d1e1296e11b1d3b69f3037fcbcae3d12ac22e374c763cee4f19f4 WHIRLPOOL dae8be81c5f3844ed6684a99d05f99f8068148625710c813cfe807b6206550c90043995261c2954eedb6cd6dc6b51423546a282aa5dd6af09f87e4d1006d61a8
 DIST minbif-1.0.1.tar.gz 152815 SHA256 52e632974b65dc82396013979f3c76b8546366728f9f0e4b3685434a670e7771
 DIST minbif-1.0.3.tar.gz 168238 SHA256 fede0da71f673ee7d2a71673875724b8caac53618394711ed55406b3250145d6
 DIST minbif-1.0.4.tar.gz 173853 SHA256 37f7961574efe028852a82b6a261e4f6df69ed7507ed49b3f9ed456e9a5faf69
+DIST minbif-1.0.5.tar.gz 176039 SHA256 88271af203a89556165a9ebb4e00e55ea5b649146aea855dd799a79bd9e4befd SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd WHIRLPOOL 10e51abc809e16c65c86f5887867f9d4b680a60321921a2fdd58345ce100cdea8317d13a007df4efaae786a4ea1b1bdc0231fe186f877f6a5716dbfdc3c32aad
 EBUILD minbif-1.0.1.ebuild 1722 SHA256 b7249297b80145bd23f6975208c47c59b39cf01e763026b5a7e26ba2e345f765 SHA512 62c33db70fdb3eb2155faf708f38e3791700c613152932e552c5796a4360b8ea603bccc6d776cc6d9cfb8dd9a6057c001484486c44ddbaccf92b0d97f8f10c5a WHIRLPOOL ab87a2274a6a60f9e9c462b905f281290610335d25a5d0340264882b67222ca97333ecc1fb04ab9c4580354131eeaa0f590bbb8b1d9d8dda40c141e123757732
 EBUILD minbif-1.0.3.ebuild 1933 SHA256 81b1f5549898f586feabc76dd77fe201387df07ea0da8c4c4e20f71cb86c5280 SHA512 4ffa4af711de51a1accb846b51dac9614698c522ca6359c46dbf28261457dc31eadbc31ea5a2ee5486f3e0c2f79c269f84477a3f4c9ad56f501abd36501de0ab WHIRLPOOL e50674433426b4427a0ae9fe084da4a7e36572391c19d9e3689616dd6381e131d1fe07b83ad76f8cd800845b9d7174bba5ec12a3ea51d884dab35b48d7ce7853
 EBUILD minbif-1.0.4.ebuild 1934 SHA256 d570b5836c27805ee0ba5a00d517d94bf588fc1b5e57894dfdb6a51681ab65ca SHA512 c9e6349154e3e4efd6928af92043cc113ed789e7561200fa2ea7222b92f5cfb3b7a6b9451639b53b80198b12f589da2cd2cc5a621538a245d3a4acb501a6b1b3 WHIRLPOOL 603c2ce7a5c4d953cac8cb91e4add834380bbbc9c7fbad32f12337033decd4ef4104ba70932cb54caf4898793ecbb69dff72777a7d8a4253e3c6825de3dc73a3
-MISC ChangeLog 1291 SHA256 a8d4e61d6fb32f78bff6bbf7b16226418d726afa57bc59ccd66fc2df0ad458b1 SHA512 b85d4db9454750d18adadc70a03ea8d5f088fab9f36e209c44d0c548959ec75bb0b50138cc5c42c429a5179facb5fc7df0100b33d0b09dec02477cbe94d448b5 WHIRLPOOL 69a4ba83168ffa9586972a714823e56c517b0fc628be563eed3b8ed42b4db8cd86c31d88ae558785938103e78b139aceca6d35864780a05cb467b2a2fb7704cc
+EBUILD minbif-1.0.5.ebuild 2003 SHA256 fbede32b5c1975256fd5b529e7bca4285940709805f15a831b41fe3e1faf2f9e SHA512 b737aff2a0900ec17af95c0a175ff02b5273a218192ab5d14c0e264a9bed349851a50ccffd1d7eb754f04bd25c14e6091da9d5c3f85b2ec542c62945350f0a1d WHIRLPOOL 701b2db5f1a78f4a0969a9216029255d6fc775df504385db4a58d39515288ec0e1f4c424caf74692ab9c866bb333ebd3b13c733a2591280f7c699fbc59182d83
+MISC ChangeLog 1586 SHA256 23b5239456811ffd932ea07328a03819fbaedc6caac85eac49d84d403b7fbc5d SHA512 d3d8570fc022c4121f3015737fe0535dfca9ec6d0b0da1bf68a2bf622da3790ff775630adbedd35203b22dd326f3e0c3fcdabe88b1e00b9b91b504361243dd24 WHIRLPOOL 400212b7aea73a550727e730433c3fbb88587dd498de1c5d4c01f6036850f5da4f0aee26347ab101e018518dc1e7a684efaa4e9ba52ca046eb1c95d18e8468c8
 MISC metadata.xml 373 SHA256 7e922d9249c3f82b6cceef62b87871536b9de522f224aa18adea08e1b0afbcc9 SHA512 8d401b433328fa82a5bbb40170dbc697c9e835c5eea907584f0c0cbbd130ce93122fe27cc5e0527710a956a7fd3eceea16d37de2daadf8eaf7f0dd9da62527bd WHIRLPOOL b2a0fe6fc0ed05409f25701e7c44394fcd3b1f2596995bfaba62b01932194a5e00ba2b8c90e999774f15f99cb1dab4166cf25f2edccfc7ebe31684178357b9dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQADESAAoJEO+t9ga+3I3axgIH+wbQ/e2aqluiS4AVMB6FaSGH
-JjHvnTI+QA4MDno3LlZ59CYer9ANcz+kbd9Tj+7vBmKVW0qK8tYhX1NAGEStjwbG
-ywHZ17+GLGrGEJZrZAcd3bVIX9ZQLHdDP3N7tRxhpLxEsrdrqwacofQvSFVTVDz6
-Bkm4MYetGvokmBiEsj+HFjHZrlWDsAU7vYDdM2/sT4uLosjSh4d1FmiSdvx7oyv2
-w+wnBYyoqrShW1RAsubE6r8bbB4UaCO+WbvA/CzzKpyoMc9iEajoImTLDwer0KV6
-1xunqVkmTafKRXsLIMtpSmT6LenbFtDzhujWHk2Sfrd0n64XmzO4EeeAjaG99tA=
-=oTBR
+iEYEAREIAAYFAlAO3sUACgkQCaWpQKGI+9SwWgCfQVIcLadFdQXCucvRyHPD2jpj
+s1oAnjWzePk6m6v0+Xu3ptHPk6md4wlx
+=vHNO
 -----END PGP SIGNATURE-----
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
new file mode 100644
index 000000000000..dc49878ea1e3
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
@@ -0,0 +1,76 @@
+commit fe71fd989a4501c77314b2906756f4e9a328ff31
+Author: Romain Bignon <romain@symlink.me>
+Date:   Tue May 8 16:46:35 2012 +0200
+
+    fixes for gcc 4.7
+
+diff --git a/src/im/account.cpp b/src/im/account.cpp
+index f155334..21baa5f 100644
+--- 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 */
+diff --git a/src/im/request.cpp b/src/im/request.cpp
+index e72cbc9..a247e3b 100644
+--- 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"
+diff --git a/src/irc/dcc.cpp b/src/irc/dcc.cpp
+index 6d05034..231122c 100644
+--- 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"
+diff --git a/src/irc/irc.cpp b/src/irc/irc.cpp
+index 5d28acb..116d9db 100644
+--- 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)
+diff --git a/src/server_poll/inetd.cpp b/src/server_poll/inetd.cpp
+index 4f3023d..f747e74 100644
+--- 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"
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
new file mode 100644
index 000000000000..599355eb502c
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
@@ -0,0 +1,26 @@
+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/minbif-1.0.5.ebuild b/net-im/minbif/minbif-1.0.5.ebuild
new file mode 100644
index 000000000000..55785879eabb
--- /dev/null
+++ b/net-im/minbif/minbif-1.0.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/minbif/minbif-1.0.5.ebuild,v 1.1 2012/07/24 17:43:28 pacho Exp $
+
+EAPI=4
+inherit cmake-utils eutils
+
+DESCRIPTION="an 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 video xinetd"
+REQUIRED_USE="video? ( libcaca )"
+
+DEPEND=">=net-im/pidgin-2.6
+	video? ( >=net-im/pidgin-2.6[gstreamer] net-libs/farsight2 )
+	libcaca? ( media-libs/libcaca media-libs/imlib2 )
+	imlib? ( media-libs/imlib2 )
+	pam? ( sys-libs/pam )
+	gnutls? ( net-libs/gnutls )"
+RDEPEND="${DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+	enewgroup minbif
+	enewuser minbif -1 -1 /var/lib/minbif minbif
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
+	epatch "${FILESDIR}/${PN}-1.0.5-gcc47.patch"
+
+	sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed"
+
+	sed -i "s#share/doc/minbif#share/doc/${P}#" \
+		CMakeLists.txt || die "sed failed"
+
+	if use xinetd; then
+		sed -i "s/type\s=\s[0-9]/type = 0/" \
+			minbif.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs
+	mycmakeargs="${mycmakeargs}
+		-DCONF_PREFIX=${PREFIX:-/etc/minbif}
+		$(cmake-utils_use_enable libcaca CACA)
+		$(cmake-utils_use_enable video VIDEO)
+		$(cmake-utils_use_enable imlib IMLIB)
+		$(cmake-utils_use_enable pam PAM)
+		$(cmake-utils_use_enable gnutls TLS)"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /var/lib/minbif
+	fperms 700 /var/lib/minbif
+	fowners minbif:minbif /var/lib/minbif
+
+	dodoc ChangeLog README
+	doman man/minbif.8
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins doc/minbif.xinetd minbif
+	fi
+
+	newinitd "${FILESDIR}"/minbif.initd minbif
+
+	dodir /usr/share/minbif
+	insinto /usr/share/minbif
+	doins -r scripts
+}