Drop unneeded patch

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0x23E9E900

4 files changed, 16 insertions, 36 deletions

diff --git a/net-irc/charybdis/ChangeLog b/net-irc/charybdis/ChangeLog
index 06010f472016..d152a439af73 100644
--- a/net-irc/charybdis/ChangeLog
+++ b/net-irc/charybdis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/charybdis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.17 2012/11/25 14:33:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.18 2012/11/25 16:00:55 jdhore Exp $
+
+  25 Nov 2012; Jeff Horelick <jdhore@gentoo.org>
+  -files/charybdis-3.4.0-testline-crash-fix.patch, charybdis-3.4.1.ebuild:
+  Drop unneeded patch
 
 *charybdis-3.4.1 (25 Nov 2012)
 
diff --git a/net-irc/charybdis/Manifest b/net-irc/charybdis/Manifest
index a2d93ff9ecba..8f0b8161c63e 100644
--- a/net-irc/charybdis/Manifest
+++ b/net-irc/charybdis/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX charybdis-3.4.0-testline-crash-fix.patch 785 SHA256 f6457a8fa0f5dbb5ede49dd321f94deaf3d996b6412eb16b40ce83a4210653ea SHA512 e8a5fceeada967836a81fa2dc2acd822f5d2f2a7bf5fa635195da215e4d05137634902f3e4e790f9a9ef916da3692c9e4425155ccbf597b0a4471cdb8c14e48d WHIRLPOOL e03581dfc3e69f29feec036fcee4eb9b8a6d2f59e50794c6daf6c7f41e56cd767b28cfc34affa51d32c4316bb960c7fa496ff2707815df11aef3a9cc5cac0995
 AUX charybdis.confd 306 SHA256 feaf6a2f614d3018453470955d296b91a73c98fab18157da97effe11a305222c SHA512 dafecc22e850eff59278c8113fd3cf3bf858a54cbb753b7bd8980d86a3bc5402e624162fc34267cc66580fd7082f48bf2b816127e68965106c4d33f197db0888 WHIRLPOOL 2ef441bbdc8ed5e9810d8893c66f598c8d1591a6a4c77bb7b1fbc789a8973b098ce8bc1ceb0f8a768adc74b5ccc64368e1e73a53498dd450789c0e88082775e0
 AUX charybdis.initd 957 SHA256 b9c7f4b31449a0039a009dffa94d963d6bf6274fb5b5e0c7d3235a9b99c32d78 SHA512 fc9b887cfe919c3ead6073bb5973f11f9e1f03d7986e5381fce13c252bb8ad1bacab1d0e478e3e7f23b29f73e39b93d04f4d3b7e3f0c86e8128cc34ef7903ca0 WHIRLPOOL 611064c8ca9671d04f5d957a6f46e83e96d58e674389276d5764df4a14b0cd4d1745daea82714f73ceae5a30b4162fe517b10f32a4d33f325029f5d8a000d11a
 DIST charybdis-3.3.0-patches.tar.bz2 10070 SHA256 ec51bbd99dc8ee7b911bc232ae8e35c99f0d4b0b25562bc7991fbfe9dbe3ad28 SHA512 e78c66b7d1c91a9a2c47a6ebb95e3c019e7182cda7115417fd6fc4e9f45dfabdb1467f5b19fa347d56cdbda97f66f7acab52d8ac560d5b3d3e179f7a7158c6da WHIRLPOOL a2bc4b258265347eb3f243d8b933084235717507b52f0c244062e74c017d34f13fcb2abf89ebde62760b49bc95c9d6df22e13a9c7c3e5526bdbf5c131662ef79
 DIST charybdis-3.3.0.tbz2 1478877 SHA256 b5feae88c031dee799144fbfde9d64f3ace4c979c337a1047677a17600dddab1 SHA512 450f1869405a0ea1379c4b189df3a62524ce6656ef5fd1371f705814e9404b5386e2fc4a9ba548ee1027fb73464c06b2c68bad142570042bbc0381723a306eae WHIRLPOOL 909e87b52e9b717c4de91ab737663b86c30372bdb5e80f23ecf76f9c3320adbaeb3c0ad991ff1b74958114041fdd9aa73f8870efd166ae4af851384eed4e56ed
 DIST charybdis-3.4.1.tbz2 1526217 SHA256 8d6e508bdee06d2ef7fa06e472f8c1caece4a97a4e552bc8b179c7a5ef239f93 SHA512 bb33ee425c84a229754ae658b3af5c81e5b20c5800e6a664c2283074c03431a00a5d71bab2f0c4b5d6185c5dea7ed71e41a47e8205dbfb4f8e605199d5150292 WHIRLPOOL 3349900c6d2591e00c188ddae1ef4013c2242d88a1aeddbe68a95a8339c7d7468e58e79c6f6b51cde2477bb54aa1575b6ae8dc87c39f1aa0edd8e38bc9f23fa0
 EBUILD charybdis-3.3.0.ebuild 2586 SHA256 b45e85abfde744034c210acdffbe5121d8f8f3e7c87a1df3a8cbe3b251565c5c SHA512 76aff7f96ee2d77c194a3cb5a957146f27c3eb3ebd5bbbb36f3998f75310cf99386cb08e8908898c58e4761a28afcbcbd9367a3b9068fcbf2d694742504b5b53 WHIRLPOOL 2f3ed4e3204ef4d0defb8c903529ceca9113471f74bf6385608210da310ea8ea7e85673f91c274bce0844f729dfe73fa1a5dd6b679c85e73bdd3b6d9e896fbfd
-EBUILD charybdis-3.4.1.ebuild 2532 SHA256 6e0e143525903774f825611f0a05248bd0feab5452533d2f94501f4654c741ba SHA512 bf0f6a9813db6afea3680705a2d9a23b1dd45701e0091f1264f7735e34bda87a6330e5a34081b077e180fc25d1666f7e8318a1a5e5e772b707b7adb3e23ce228 WHIRLPOOL 3c9b866882367e0619e12a6349e1c699f32ae9dc92fefbd905f32fb2448547a3b45c361cf7602e3c9e08159a674896bde5f94754871be80628cede86a6da6939
-MISC ChangeLog 1087 SHA256 a8bce2f6c525e525e49923618d84b6d2920d876a0e849e575d29bf69ce0041aa SHA512 b04b6730c0ff2cb52b87d2d6c5615ea72a64271c347519cb96964613ba468e787c82436d35c0c22159d581c31b93fd8bfad22b4701a4b16642da44dc91d4acfb WHIRLPOOL f4cce52281391961e66537b9bce9f6549895617229142e61f814fd06022a9e46698ad03c3e147bd08f339a844d1169af810ed06226287bac5abb597081bf1374
+EBUILD charybdis-3.4.1.ebuild 2456 SHA256 d73f81f8f9f00ab200d0a920f329ed2f95c60fd225b975c66d2586759320de6f SHA512 5ee4ab789cdb4fd320b663bfbcaabeedd6468da02c576b80bf2b7d219830c0d1bb03968e2f3f9b43236a42866fb69d5c69f03438815ffe7dda3635a609bab7c0 WHIRLPOOL 9a4698fb86ffda9eff7c46fc81be86705ccfc12b568d6ad55a2842be315084544c02fadbc9618a03d9b52a379bc42879eefb40df38e8a17f0f54eb38d597a065
+MISC ChangeLog 1234 SHA256 b2264fb2a78b9387aac284f915e0587aa9d06fa49a44a7ede75073e4ee49ee89 SHA512 7c28aca12640a39e9949dc2b6dfed99bf920b9e4585fd11e14163b451212873179f58f89c0612b4f368e6b7215a03d137f50e229e54c5e04ead5a085ae22e917 WHIRLPOOL 99f89ec72b22bee4171080a9e48a070b6428a55a409a3169f967fec51efba44dee402fa23fef1ae9e84ad68e345087b1348e99a83b572e1857ef75ce50ebf8a8
 MISC metadata.xml 426 SHA256 03d9cd0ac35f98fe2c0f74a135d20daead446b673b4d9d0d038f837546288325 SHA512 049bb7dbc1437186b20bc65ecc58af1499e59c2514808957a6369d2cac0ddf004c047de542d6b1072c25f10ec93078f9f49c989ab754ee66c880546e6333479e WHIRLPOOL ac48801c222825650c03277dbe23ea359b08ec3b156ab974a79f97443842465b92e59890ae54889a9c7189f82be9f107926b26f9bfc5c204bc43f95b4243aceb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQsiw0AAoJEPUd7O0j6ekAx/EH/0pBx+7X9cIjSKOlVRpjexIP
-wt8PBJyqH54iooUj7RGdzcy979QhmKYmRZIivRpEVKrUpQxv1Ffd3WKjZy4/5T4d
-+qtEbBBc1o03sz63DNu/t6XZm7DWrreKtLyB2S+lwoOYoOkG8IgBymuJVfgyScM+
-sPWDN2K16pW1mOeV+YBTr7CM30oKroiPjwHSfx+4wsg28QZ44plEVHROabknqxe9
-a/uDxMkPW4GT7UWzk0HRTncebUtuOfuIxBO22ULLgoVGv/OMifAGon2t75eWCOz5
-2j5YI75Ny3V+SxGnTXxxMHWJ1SSB2+cm8b6nvWhB1V+qvfhzCWWH/JxEduPa6P4=
-=8FI9
+iQEcBAEBCgAGBQJQskC4AAoJEPUd7O0j6ekAq8kIAI7//kpwp1qadZCEwMNQ0UIS
+xttKBlcBvys7Di3SH1bwG6AQHd9BIhJl7PamGqKT6xvVIz3YmUbDDXQQYMKq7ccK
+Q4OIpljCVQcCJDdtziv+lcjvEEWPKnRn+UxnfM2rQvi0VQO3CjXON1c2kZ3v06lN
+z9Ar48n2y/c9w+1aCn8bfFayEd4B8L3ZfkbG50cOyhnQtszwA734UXUFkXlYaa73
+MkKsbM4FcVR/hA5eivynurJof5tEYiRGnz1pgddtf33lkZmW5i91tzXqdBB+krL9
+CE8QizYB+5Ng4YD/yGDF2cTqaL6BFHNmoUvmtQESBM7bkUeYjxI2O1S0npGPCtg=
+=Z+YJ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/charybdis/charybdis-3.4.1.ebuild b/net-irc/charybdis/charybdis-3.4.1.ebuild
index cb8ccf195194..026949f8b5f2 100644
--- a/net-irc/charybdis/charybdis-3.4.1.ebuild
+++ b/net-irc/charybdis/charybdis-3.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.4.1.ebuild,v 1.1 2012/11/25 14:33:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.4.1.ebuild,v 1.2 2012/11/25 16:00:55 jdhore Exp $
 
 EAPI=4
 
-inherit autotools eutils multilib user
+inherit eutils multilib user
 
 DESCRIPTION="The atheme project's IRCd based on ratbox"
 HOMEPAGE="http://atheme.org/project/charybdis http://www.stack.nl/~jilles/irc/#charybdis"
@@ -27,9 +27,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-testline-crash-fix.patch
-	eautoreconf
-
 	# Fill the example configuration file with proper paths.
 	sed -i \
 		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
diff --git a/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch b/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch
deleted file mode 100644
index 0e72f7d21393..000000000000
--- a/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 047a9b1ab072b8103ec954adc2f75baf2e9be553
-Author: Jilles Tjoelker <jilles@stack.nl>
-Date:   Thu Oct 18 15:54:24 2012 +0200
-
-    Fix a crash with testline, introduced with the "underlying ipv4" feature.
-    (cherry picked from commit 6387b5ad4472d1a8f8fbd0b7f3f32dd9d8542072)
-
-diff --git a/src/hostmask.c b/src/hostmask.c
-index 99899af..fb28bbb 100644
---- a/src/hostmask.c
-+++ b/src/hostmask.c
-@@ -422,7 +422,7 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
- 	}
- 
- #ifdef RB_IPV6
--	if(ip->sa_family == AF_INET6 &&
-+	if(ip != NULL && ip->sa_family == AF_INET6 &&
- 			ipv4_from_ipv6((const struct sockaddr_in6 *)(const void *)ip, &ip4))
- 	{
- 		kconf = find_conf_by_address(NULL, NULL, NULL, (struct sockaddr *)&ip4, CONF_KILL, AF_INET, vuser, NULL);