Adding support for multiple networks, fixing bug 273658

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 35 insertions, 10 deletions

diff --git a/net-irc/psybnc/ChangeLog b/net-irc/psybnc/ChangeLog
index db26523bbf18..0a136ffa163a 100644
--- a/net-irc/psybnc/ChangeLog
+++ b/net-irc/psybnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/psybnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.10 2009/01/04 16:47:05 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.11 2009/07/18 12:08:51 gurligebis Exp $
+
+*psybnc-2.3.2.9-r2 (18 Jul 2009)
+
+  18 Jul 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -psybnc-2.3.2.9-r1.ebuild, +psybnc-2.3.2.9-r2.ebuild,
+  +files/psybnc-2.3.2.9-multinetwork.patch, metadata.xml:
+  Adding support for multiple networks, fixing bug #273658
 
   04 Jan 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   psybnc-2.3.2.9-r1.ebuild:
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index f7379a1ffcc2..8f2091d4d307 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX compile.diff 3231 RMD160 f484b2f3878c4a4da8033a23a26e7b0d75d93f3b SHA1 0bcf8a297512cc568718a1c569d0abbb2c800968 SHA256 e6b301659412519872948ee21958b97c57c21e248dae3d040cefcd61032764ee
 AUX oidentd.conf.psybnc 92 RMD160 690ab54b796e4959d81a23d06dd194c7a4a081c2 SHA1 be9f023fe93250e44be3dc52b94c9d16a8d61bbf SHA256 0363f6f7c2b2a39dc2b1ee3e41596adf6209bf3e770e9e7c0f13a9f6787c50dc
+AUX psybnc-2.3.2.9-multinetwork.patch 261 RMD160 788a0354a953c08210f2938fe5eb8eb934665dc3 SHA1 20e1e2f81f5c6a322a058c12bb49a5fa420d3b59 SHA256 485375e40144079c69ba3dfd942ad9924aba2c7fc4545b67114d74c943c92fed
 AUX psybnc-2.3.2.9-oidentd.patch 237 RMD160 24cd04928d4fb503bbfbff13bad33a9475ca782c SHA1 7312415f50c9024b369d843d0b787cfc92b6ea7b SHA256 43593043db85bf3dc3f1a5162afd873ac079afcb0aff9520799b51f362a2e29f
 AUX psybnc-2.3.2.9-scripting.patch 244 RMD160 13158cfa696af2fb41cecc9958fcd623f805864d SHA1 aa2bb6c40153f7e1d59b5300a3d6d4647c101c61 SHA256 393a51d8da1de671e77072728086dba215e968823a1d53a5371977c9b1419396
 AUX psybnc-oidentd.initd 1050 RMD160 f56ebb0801f4193a8152a9cabd05bb2ed78b4b50 SHA1 f6e4c2f8b38d1c8b163ec991a0c683754abea4ac SHA256 3093578af23359e6f203defc49a15f3202f811d55ef239069ba2fce1eccd9d4f
@@ -12,13 +13,13 @@ AUX psybnc.initd 1009 RMD160 415cc2b29e9fed2f64b671527583c0666c699121 SHA1 38599
 DIST psyBNC-2.3.2-7.tar.gz 312177 RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 SHA1 d3d06e05c447f7366761a85af204222eddb55e2d SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519
 DIST psyBNC-2.3.2-9.tar.gz 318676 RMD160 6e27479b9721bb6aa9f599150af3abfa9a915a2e SHA1 78266e39ed128a587b158b6195e580cb7f560f08 SHA256 9129ade198f26f7a47301d2ab5933a2844bdd187fca437f8264ae88f168e1644
 EBUILD psybnc-2.3.2.7-r2.ebuild 3757 RMD160 134c22afa8a537b0b90ab5c61e947f751c6fa08b SHA1 728298ee7b6257821a1b1c09ceeb0d214db704e3 SHA256 b04051c8f2ced5722637d2e577a85a97f6dd4d8af2a28e40fc8505af1ef12b08
-EBUILD psybnc-2.3.2.9-r1.ebuild 4493 RMD160 89395aaaa71763c490c274a180790d30ed0453e7 SHA1 2c4c2b28b2570b55882906fa927a7ccd63818ec1 SHA256 e7bf48010b729bae3062866ceae2021b5678d4fa17eb637bd11e911606ac7686
-MISC ChangeLog 1803 RMD160 aac29ea82a1fd67a526b191f8c9f1df0cb4928b7 SHA1 ab49b9d3253391462f3fae24c6c97d95e980a0a8 SHA256 c72c06ff3ec6fadd1033be3b2f4fe21c71c95e5ddc6828ab6c17a73a8646635a
-MISC metadata.xml 492 RMD160 e41583fc39989708f3e74ea5eca6d63deee5ef66 SHA1 43e022e73e332b27cf9659358376de502d8caced SHA256 e17177103aac4a639f84d03ac071038b594b7fba2d7cbe39cbb3181e163e821a
+EBUILD psybnc-2.3.2.9-r2.ebuild 4598 RMD160 d9df7ddbf074dc0e63036f197705d9622da5c52a SHA1 fb17041a63b1a2bc985e0da4d56d35163545bc93 SHA256 2e5a63162cba3de189b4e2971c44066c043e01f42a94f802d37c3570fcdcc81f
+MISC ChangeLog 2073 RMD160 ac2d19b718f25bc9fd69a1e4ebce96e8e43588dd SHA1 4dffdfe860391ee21578d490c10cde0783a63689 SHA256 08907a5160d760f7f2b0c2c0cbe23e0523624a8cb8813a49174b0186bbf3ce7c
+MISC metadata.xml 562 RMD160 294dc8e7e000d88056aa9b2ab0d17663f83d830c SHA1 532637538b526dc886425b15fd3e084d9f9e1b2b SHA256 2353776ea8c6323f8eec951b14ab9998aa409cf1176ad8298d5e8c5ea613ae6d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEUEARECAAYFAklhBBQACgkQsR7PQhRXYEnx7gCfX+rPAYOfdV3B6bLtL7SpsvQB
-5N4AliMtAj5vogCnAy8RfdG/EQ+rzZs=
-=EkTK
+iEYEARECAAYFAkphu1sACgkQsR7PQhRXYEk+dQCfWsn9oWF0yWZ7VQ9wFwj7Zxx6
+40IAn0+c6A6DqgGJz0CkfhS0CN9L53NV
+=cZ9A
 -----END PGP SIGNATURE-----
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
new file mode 100644
index 000000000000..4d796961d6ff
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
@@ -0,0 +1,13 @@
+--- config.h.orig	2009-06-10 21:30:24.000000000 +0000
++++ config.h	2009-06-10 21:30:39.000000000 +0000
+@@ -50,6 +50,10 @@
+ 
+ #define BLOCKDNS
+ 
++/* Allow multiple irc connections per user */
++
++#define NETWORK
++
+ /* Fixes the freeze bug */
+ 
+ #define FREEZEFIX
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index b76de8209018..84d7ff44d86e 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -9,6 +9,7 @@
 	<use>
 		<flag name='oidentd'>Adds support for oidentd</flag>
 		<flag name='scripting'>Adds scripting support</flag>
+		<flag name='multinetwork'>Adds support for multiple networks</flag>
 	</use>
 	<longdescription>psyBNC is a multi-user and multi-server gateway to IRC networks</longdescription>
 </pkgmetadata>
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r1.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
index 4a803bfe88a4..024a1924234b 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r1.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9-r1.ebuild,v 1.2 2009/01/04 16:47:05 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild,v 1.1 2009/07/18 12:08:51 gurligebis Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 MY_PV="$(replace_version_separator 3 -)"
@@ -13,7 +13,7 @@ SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="ipv6 ssl oidentd scripting"
+IUSE="ipv6 ssl oidentd scripting multinetwork"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
 		oidentd? ( >=net-misc/oidentd-2.0 )"
@@ -37,6 +37,9 @@ src_unpack() {
 	# add scripting support
 	use scripting && epatch "${FILESDIR}/${P}-scripting.patch"
 
+	# add multinetwork support
+	use scripting && epatch "${FILESDIR}/${P}-multinetwork.patch"
+
 	# Useless files
 	rm -f */INFO