Re-enabled mysql support. closes #40330.

4 files changed, 24 insertions, 6 deletions

diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index 6d840e48800d..366beda514c0 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/eggdrop
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.11 2004/02/03 03:02:49 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.12 2004/02/04 03:16:26 zul Exp $
+
+  03 Feb 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r2.ebuild,
+  files/eggdrop-1.6.15-mysql-use_ssl-fix.patch:
+  Re-enabled mysql support. Patch thanks to Sven Wegener
+  <sven.wegener -at- stealer.net>. Closes #40330.
 
 *eggdrop-1.6.15-r2 (02 Feb 2004)
 
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 7862d555ed98..237c59eaa85e 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,7 +1,7 @@
-MD5 8b78909be4c740090d30b9f10303659b eggdrop-1.6.15-r2.ebuild 2651
+MD5 840bbfcbcb35ade4a430a36017ef6ef2 eggdrop-1.6.15-r2.ebuild 2731
 MD5 c50752b844073f6b187c248d54ab3d39 eggdrop-1.6.15.ebuild 1789
 MD5 a414d7387081ff5be6220539fa917a4a eggdrop-1.6.15-r1.ebuild 2283
-MD5 bc49a59995c5cbf5a891ca395f78eb3c ChangeLog 1940
+MD5 705ab4212eb740f131c8e0b5159961c5 ChangeLog 2166
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 e410ac6d9adce910c8f37daf99a4b0e1 files/eggdrop-1.6.15-config.patch 6182
 MD5 4b36c8026b7081614b9e185e63cb8115 files/eggdrop1.6.15-ssl.fixed.diff 115601
@@ -12,3 +12,4 @@ MD5 86513844ef13a664bc5bf7d1a68d2d59 files/eggdrop-1.6.15-potential-undef-tm-str
 MD5 e9830c3f4fb21aa6a8651d6e47bae613 files/digest-eggdrop-1.6.15 65
 MD5 1892518b7bb9c06cf7cfd46868012971 files/eggdrop-1.6.15-botchk.patch 2931
 MD5 98ef1d7664b8f6d5306eb2d7c03c4ff4 files/eggdrop-installer 2675
+MD5 2f73d0025c666719612e4d05c47a46dd files/eggdrop-1.6.15-mysql-use_ssl-fix.patch 300
diff --git a/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild b/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild
index 4db0a22bb03e..c5f4e46718ed 100644
--- a/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild,v 1.1 2004/02/03 03:02:49 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild,v 1.2 2004/02/04 03:16:26 zul Exp $
 
 inherit fixheadtails
 
@@ -14,9 +14,10 @@ KEYWORDS="~x86 ~sparc ~mips ~ia64"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="debug static ipv6 ssl"
+IUSE="debug static ipv6 ssl mysql"
 DEPEND="dev-lang/tcl
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl )
+	mysql? ( dev-db/mysql )"
 
 pre_pkg() {
 	use ipv6 && \
@@ -39,6 +40,7 @@ src_unpack()  {
 	epatch ${FILESDIR}/${P}-configure-in.patch
 	epatch ${FILESDIR}/${P}-potential-undef-tm-struct.patch
 	epatch ${P}-STEALER.net.patch
+	epatch ${FILESDIR}/${P}-mysql-use_ssl-fix.patch
 
 	cd ${WORKDIR}/${P}
 	ht_fix_file configure aclocal.m4
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.15-mysql-use_ssl-fix.patch b/net-irc/eggdrop/files/eggdrop-1.6.15-mysql-use_ssl-fix.patch
new file mode 100644
index 000000000000..b4b7e53ed106
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-1.6.15-mysql-use_ssl-fix.patch
@@ -0,0 +1,10 @@
+--- eggdrop-1.6.15.orig/src/mod/mysql.mod/mysql.h	2004-02-04 01:10:52.390343385 +0000
++++ eggdrop-1.6.15/src/mod/mysql.mod/mysql.h	2004-02-04 01:09:15.103521295 +0000
+@@ -28,6 +28,7 @@
+   }
+ 
+ #include "src/mod/module.h"
++#undef use_ssl
+ #include <mysql/mysql.h>
+ 
+ EXPORT_SCOPE char *mysql_start();