modified: ../media-video/mplayer/mplayer-9999-r20.ebuild

	deleted:    verlihub/files/cconfigitembase.cpp.patch
	deleted:    verlihub/files/cconfmysql.cpp.patch
	deleted:    verlihub/files/cpenaltylist.cpp.patch
	deleted:    verlihub/files/creguserinfo.cpp.patch
	new file:   verlihub/files/db_charset.patch
	deleted:    verlihub/files/stringutils.cpp.patch
	new file:   verlihub/files/verlihub-gcc43.patch
	renamed:    verlihub/verlihub-0.9.8d_rc2.ebuild -> verlihub/verlihub-0.9.8e-r3.ebuild

8 files changed, 155 insertions, 90 deletions

diff --git a/net-p2p/verlihub/files/cconfigitembase.cpp.patch b/net-p2p/verlihub/files/cconfigitembase.cpp.patch
deleted file mode 100644
index 47efa5a..0000000
--- a/net-p2p/verlihub/files/cconfigitembase.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** /home/sss/123/cconfigitembase.cpp	2009-06-07 19:34:19.000000000 +0300
---- cconfigitembase.cpp	2009-06-07 19:46:55.037909745 +0300
-***************
-*** 11,16 ****
---- 11,18 ----
-  #include <stdlib.h>
-  #include <iostream>
-  #include <stdio.h>
-+ #include <cstdlib>
-+ #include <cstring>
-  #include "stringutils.h"
-  
-  using namespace nStringUtils;
diff --git a/net-p2p/verlihub/files/cconfmysql.cpp.patch b/net-p2p/verlihub/files/cconfmysql.cpp.patch
deleted file mode 100644
index 7f5e6be..0000000
--- a/net-p2p/verlihub/files/cconfmysql.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** /home/sss/123/cconfmysql.cpp	2004-10-27 15:24:00.000000000 +0300
---- cconfmysql.cpp	2009-06-07 19:48:04.397913142 +0300
-***************
-*** 17,22 ****
---- 17,24 ----
-  
-  #include "cconfmysql.h"
-  #include <algorithm>
-+ #include <cstdio>
-+ #include <cstring>
-  using namespace std;
-  
-  namespace nConfig
diff --git a/net-p2p/verlihub/files/cpenaltylist.cpp.patch b/net-p2p/verlihub/files/cpenaltylist.cpp.patch
deleted file mode 100644
index 0ff4a5c..0000000
--- a/net-p2p/verlihub/files/cpenaltylist.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** /home/sss/123/cpenaltylist.cpp	2005-04-04 22:35:41.000000000 +0300
---- cpenaltylist.cpp	2009-06-07 20:00:26.867921053 +0300
-***************
-*** 8,13 ****
---- 8,15 ----
-   *   (at your option) any later version.                                   *
-   ***************************************************************************/
-  #include "cpenaltylist.h"
-+ #include <cstdio>
-+ #include <cstring>
-  
-  namespace nDirectConnect {
-  
diff --git a/net-p2p/verlihub/files/creguserinfo.cpp.patch b/net-p2p/verlihub/files/creguserinfo.cpp.patch
deleted file mode 100644
index e1bf586..0000000
--- a/net-p2p/verlihub/files/creguserinfo.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-*** /home/sss/123/creguserinfo.cpp	2007-08-10 22:10:38.000000000 +0300
---- creguserinfo.cpp	2009-06-07 20:08:46.217928199 +0300
-***************
-*** 27,32 ****
---- 27,34 ----
-  #endif
-  #include "creguserinfo.h"
-  #include "ctime.h"
-+ #include <cstdio>
-+ #include <cstring>
-  
-  using namespace ::nUtils;
-  
diff --git a/net-p2p/verlihub/files/db_charset.patch b/net-p2p/verlihub/files/db_charset.patch
new file mode 100644
index 0000000..eb54aec
--- /dev/null
+++ b/net-p2p/verlihub/files/db_charset.patch
@@ -0,0 +1,83 @@
+diff -Naur verlihub-orig/src/cdbconf.cpp verlihub/src/cdbconf.cpp
+--- verlihub-orig/src/cdbconf.cpp	2008-10-18 18:43:43.000000000 +0400
++++ verlihub/src/cdbconf.cpp	2008-10-18 18:43:09.000000000 +0400
+@@ -22,6 +22,7 @@
+ 	Add("lang_name",lang_name,string("lang_en"));
+ 	Add("allow_exec",allow_exec, false);
+ 	Add("allow_exec_mod",allow_exec_mod, true);
++	Add("db_charset",db_charset,string("utf8"));
+ 	Load();
+ }
+ 
+diff -Naur verlihub-orig/src/cdbconf.h verlihub/src/cdbconf.h
+--- verlihub-orig/src/cdbconf.h	2008-10-18 18:43:43.000000000 +0400
++++ verlihub/src/cdbconf.h	2008-10-18 18:43:09.000000000 +0400
+@@ -31,6 +31,7 @@
+ 	string db_user;
+ 	string db_pass;
+ 	string db_data;
++	string db_charset;
+ 	string config_name;
+ 	string lang_name;
+ 	bool allow_exec;
+diff -Naur verlihub-orig/src/cmysql.cpp verlihub/src/cmysql.cpp
+--- verlihub-orig/src/cmysql.cpp	2008-10-18 18:43:43.000000000 +0400
++++ verlihub/src/cmysql.cpp	2008-10-18 18:43:09.000000000 +0400
+@@ -19,10 +19,10 @@
+ /*!
+     \fn nMySQL::cMySQL::cMySQL(string&host,string&user,string&pass,string&data)
+  */
+-cMySQL::cMySQL(string&host,string&user,string&pass,string&data) : cObj("cMySQL")
++cMySQL::cMySQL(string&host,string&user,string&pass,string&data,string&charset) : cObj("cMySQL")
+ {
+     Init();
+-    if(!Connect(host,user,pass,data))
++    if(!Connect(host,user,pass,data,charset))
+     {
+     	throw "Mysql connection error.";
+     }
+@@ -40,12 +40,13 @@
+ 	if(!mDBHandle) Error(0, string("Can't init mysql structure :(.: "));	
+ }
+ 
+-bool cMySQL::Connect(string &host, string &user, string &pass, string &data)
++bool cMySQL::Connect(string &host, string &user, string &pass, string &data, string &charset)
+ {
+ 	if(Log(1)) LogStream() << "Connecting to mysql server: "
+-			<< user << "@" << host << "/" << data << endl;
++ 			<< user << "@" << host << "/" << data << "with charset " << charset << endl;
+ 	
+ 	mysql_options(mDBHandle,MYSQL_OPT_COMPRESS,0);
++ 	mysql_options(mDBHandle,MYSQL_SET_CHARSET_NAME,charset.c_str());
+ 	
+ 	if(!mysql_real_connect(
+ 		mDBHandle,
+diff -Naur verlihub-orig/src/cmysql.h verlihub/src/cmysql.h
+--- verlihub-orig/src/cmysql.h	2008-10-18 18:43:43.000000000 +0400
++++ verlihub/src/cmysql.h	2008-10-18 18:43:09.000000000 +0400
+@@ -34,10 +34,10 @@
+ friend class cQuery;
+ public:
+ 	cMySQL();
+-	cMySQL(string&host,string&user,string&pass,string&data);
++	cMySQL(string&host,string&user,string&pass,string&data,string&charset);
+ 	~cMySQL();
+ 	void Init();
+-	bool Connect(string &host, string &user, string &passwd, string &db);
++	bool Connect(string &host, string &user, string &passwd, string &db, string &charset);
+ 	public: void Error(int level, string text);
+ 
+ private:
+diff -Naur verlihub-orig/src/cserverdc.cpp verlihub/src/cserverdc.cpp
+--- verlihub-orig/src/cserverdc.cpp	2008-10-18 18:43:43.000000000 +0400
++++ verlihub/src/cserverdc.cpp	2008-10-18 18:43:09.000000000 +0400
+@@ -72,7 +72,8 @@
+ 		mDBConf.db_host,
+ 		mDBConf.db_user,
+ 		mDBConf.db_pass,
+-		mDBConf.db_data), // connect to mysql
++		mDBConf.db_data,
++		mDBConf.db_charset), // connect to mysql
+ 	mC(*this), // create the config object
+ 	mL(*this),
+ 	mSetupList(mMySQL),
diff --git a/net-p2p/verlihub/files/stringutils.cpp.patch b/net-p2p/verlihub/files/stringutils.cpp.patch
deleted file mode 100644
index 1487fc5..0000000
--- a/net-p2p/verlihub/files/stringutils.cpp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-*** /home/sss/123/stringutils.cpp	2006-09-05 19:01:48.000000000 +0300
---- stringutils.cpp	2009-06-07 20:25:14.557920115 +0300
-***************
-*** 7,12 ****
---- 7,16 ----
-  #include <fstream>
-  #include <sstream>
-  #include <stdio.h>
-+ #include <cstdio>
-+ #include <cstring>
-+ #include <string.h>
-+ #include <stdlib.h>
-  
-  namespace nStringUtils
-  {
diff --git a/net-p2p/verlihub/files/verlihub-gcc43.patch b/net-p2p/verlihub/files/verlihub-gcc43.patch
new file mode 100644
index 0000000..ebdc6d3
--- /dev/null
+++ b/net-p2p/verlihub/files/verlihub-gcc43.patch
@@ -0,0 +1,50 @@
+--- verlihub/src/cconfigitembase.cpp.orig	2009-02-12 13:41:32.000000000 +0300
++++ verlihub/src/cconfigitembase.cpp	2009-02-12 13:41:53.000000000 +0300
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ #include "stringutils.h"
++#include <string.h>
+ 
+ using namespace nStringUtils;
+ using namespace std;
+--- verlihub/src/cconfmysql.cpp.orig	2009-02-12 13:42:18.000000000 +0300
++++ verlihub/src/cconfmysql.cpp	2009-02-12 13:42:33.000000000 +0300
+@@ -17,6 +17,7 @@
+ 
+ #include "cconfmysql.h"
+ #include <algorithm>
++#include <string.h>
+ using namespace std;
+ 
+ namespace nConfig
+--- verlihub/src/cpenaltylist.cpp.orig	2009-02-12 13:48:36.000000000 +0300
++++ verlihub/src/cpenaltylist.cpp	2009-02-12 13:48:21.000000000 +0300
+@@ -8,6 +8,7 @@
+  *   (at your option) any later version.                                   *
+  ***************************************************************************/
+ #include "cpenaltylist.h"
++#include <string.h>
+ 
+ namespace nDirectConnect {
+ 
+--- verlihub/src/creguserinfo.cpp.orig	2009-02-12 13:49:44.000000000 +0300
++++ verlihub/src/creguserinfo.cpp	2009-02-12 13:50:06.000000000 +0300
+@@ -27,6 +27,7 @@
+ #endif
+ #include "creguserinfo.h"
+ #include "ctime.h"
++#include <string.h>
+ 
+ using namespace ::nUtils;
+ 
+--- verlihub/src/stringutils.cpp.orig	2009-02-12 13:52:50.000000000 +0300
++++ verlihub/src/stringutils.cpp	2009-02-12 13:53:05.000000000 +0300
+@@ -7,6 +7,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ namespace nStringUtils
+ {
diff --git a/net-p2p/verlihub/verlihub-0.9.8d_rc2.ebuild b/net-p2p/verlihub/verlihub-0.9.8e-r3.ebuild
index 84e54df..8d65cbd 100644
--- a/net-p2p/verlihub/verlihub-0.9.8d_rc2.ebuild
+++ b/net-p2p/verlihub/verlihub-0.9.8e-r3.ebuild
@@ -1,45 +1,41 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-200 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
-
 DESCRIPTION="Verlihub, a linux hub for the p2p program 'direct connect'"
 HOMEPAGE="http://www.verlihub-project.org"
-SRC_URI="http://umn.dl.sourceforge.net/sourceforge/verlihub/${PN}-0.9.8d-RC2.tar.gz"
+SRC_URI="http://www.verlihub-project.org/download/${P}-r2.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86-fbsd x86"
+
 DEPEND="dev-libs/libpcre
         dev-libs/geoip
         >=dev-db/mysql-4.0.20
 	sys-libs/zlib"
-IUSE="lua50 lua51 floodprot iplog forbid funny messanger chatroom isp replacer stats p_perl hublink"
-PDEPEND=" lua50? ( net-libs/lua50 )
-	  lua51? ( net-libs/lua51 )
-	  floodport? ( net-libs/floodprot )
+IUSE="lua iplog forbid funny messanger chatroom isp replacer stats python"
+PDEPEND=" lua? ( net-libs/lua )
   	  iplog? ( net-libs/iplog )
 	  forbid? ( net-libs/forbid )
 	  funny? ( net-libs/funny )
 	  messanger? ( net-libs/messanger )
 	  chatroom? ( net-libs/chatroom )
-	  isp? ( net-libs/isp ) 
-	  replacer? ( net-libs/replacer ) 
-	  stats? ( net-libs/stats ) 
-	  p_perl? ( net-libs/perl ) 
-	  hublink? ( net-libs/hublink )"
+	  isp? ( net-libs/isp )
+	  replacer? ( net-libs/replacer )
+	  stats? ( net-libs/stats )
+	  python? ( net-libs/python )
+	"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${P}-r2"
 
 src_unpack() {
-	unpack "${PN}-0.9.8d-RC2.tar.gz"
-	cd "${S}/src"
-	epatch ${FILESDIR}/*.patch
+	unpack "${P}-r2.tar.gz"
 	cd "${S}"
+	epatch "${FILESDIR}/*.patch"
 }
 src_compile() {
         econf || die
-        emake || die "Make failed for problems or bugs please visit http://forums.verlihub-project.org/"
+        emake || die "Make failed; please report problems or bugs to bugs@verlihub-project.org or visit http://forums.verlihub-project.org/viewforum.php?f=36"
 }
 
 src_install() {
@@ -79,12 +75,14 @@ src_install() {
 pkg_postinst() {
     echo
     ewarn "Do NOT report bugs to Gentoo's bugzilla"
-    einfo "Please report all bugs to http://forums.verlihubproject.org"
-    einfo "Verlihub-project team"
+    einfo "Please report all bugs to bugs@verlihub-project.org or to http://forums.verlihubproject.org/viewforum.php?f=36"
+    einfo "Verlihub Project Team"
 
     if [[ -f "/etc/verlihub/dbconfig" ]]
     then
 	einfo "Verlihub is already configured in /etc/verlihub"
+	einfo "You can configure a new hub by typing:"
+	ewarn "emerge --config =${CATEGORY}/${PF}"
     else
 	ewarn "You MUST configure verlihub before starting it:"
 	ewarn "emerge --config =${CATEGORY}/${PF}"
@@ -95,10 +93,11 @@ pkg_postinst() {
 pkg_config() {
     ewarn "Configuring verlihub"
     /usr/bin/vh_install
-    if [[ -f "/etc/verlihub/dbconfig" ]]
+    if [[ $? ]]
     then
-	ewarn "Configuration completed"
+    	ewarn "You have not configured verlihub succesfully. Please try again"
     else
-	ewarn "You haven't configured verlihub succesfully. Please try again"
+        ewarn "Configuration completed"
     fi
 }
+