--- inspircd-1.1.19.ebuild.orig	2008-04-22 14:45:51.000000000 +0200
+++ inspircd-1.1.19.ebuild	2008-04-23 20:12:41.000000000 +0200
@@ -4,95 +4,89 @@
 
 inherit eutils toolchain-funcs multilib # subversion
 
-IUSE="openssl gnutls ipv6 kernel_linux mysql postgres sqlite zip ldap"
-
 DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
-HOMEPAGE="http://www.inspircd.org"
+HOMEPAGE="http://www.inspircd.org/"
+SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2
+mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="openssl gnutls ipv6 kernel_linux mysql postgres sqlite zip ldap"
+
 RDEPEND="
-	>=sys-devel/gcc-3.3.0
-	>=dev-lang/perl-5.8
-	openssl? ( >=dev-libs/openssl-0.9.7d )
-	gnutls? ( >=net-libs/gnutls-1.3.0 )
-	mysql? ( >=virtual/mysql-4.0)
-	postgres? ( dev-db/postgresql)
-	sqlite? ( >=dev-db/sqlite-3.0)
-	ldap? ( net-nds/openldap)
-	"
+	dev-lang/perl
+	openssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}"
-SRC_URI="mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
-#ESVN_REPO_URI="http://svn.inspircd.org/repository/trunk/inspircd"
-#ESVN_PROJECT="inspircd"
 
 S="${WORKDIR}/inspircd"
 
 src_unpack() {
-	local SQL=0
 	unpack ${A}
 	cd "${S}"
-	
+
+	local SQL=0
 	cd src/modules
-	
+
 	if use zip ; then
-		ln -sfv extra/m_ziplink.cpp .
+		cp extra/m_ziplink.cpp .
 	fi
 	if use openssl || use gnutls ; then
-		ln -sfv extra/m_sslinfo.cpp .
-		ln -sfv extra/m_ssl_oper_cert.cpp
+		cp extra/m_sslinfo.cpp .
+		cp extra/m_ssl_oper_cert.cpp
 	fi
 
 	if use ldap ; then
-		ln -sfv extra/m_ldapauth.cpp .
-		ln -sfv extra/m_ldap.h .
+		cp extra/m_ldapauth.cpp .
 	fi
 
 	if use mysql ; then
 		SQL=1
-		ln -sfv extra/m_mysql.cpp .
+		cp extra/m_mysql.cpp .
 	fi
 	if use postgres ; then
 		SQL=1
-		ln -sfv extra/m_pgsql.cpp .
+		cp extra/m_pgsql.cpp .
 	fi
 	if use sqlite ; then
 		SQL=1
-		ln -sfv extra/m_sqlite3.cpp .
+		cp extra/m_sqlite3.cpp .
 	fi
 	if [ ${SQL} -eq 1 ] ; then
-		ln -sfv extra/m_sqlauth.cpp .
-		ln -sfv extra/m_sqllog.cpp .
-		ln -sfv extra/m_sqloper.cpp .
-		ln -sfv extra/m_sqlutils.cpp .
-		ln -sfv extra/m_sqlv2.h .
-		ln -sfv extra/m_sqlutils.h .
+		cp extra/m_sql{auth.cpp,log.cpp,oper.cpp,utils.cpp,utils.h,v2.h} .
 	fi
 }
 
 src_compile() {
-	local myconf=""
 
-	# Write a configuration file
-	# we don't use econf.
-	USE_SSL="$(use_enable openssl)"
-	use gnutls && USE_SSL="$(use_enable gnutls)"
-	USE_SOCKET_ENGINE="--enable-epoll"
-	./configure $(use_enable ipv6) --enable-remote-ipv6 ${USE_SSL} \
-	${USE_SOCKET_ENGINE} \
-	--prefix="/usr/$(get_libdir)/inspircd" \
-	--config-dir="/etc/inspircd" --bin-dir="/usr/bin" \
-	--library-dir="/usr/$(get_libdir)/inspircd" \
-	--module-dir="/usr/$(get_libdir)/inspircd/modules" \
-	|| die "configure failed"
+	# ./configure doesn't know --disable-gnutls, -ipv6 and -openssl options,
+	# so should be used only --enable-like.
+	local myconf=""
+	use gnutls  && myconf="--enable-gnutls"
+	use myconf  && myconf="${myconf} --enable-ipv6 --enable-remote-ipv6"
+	use openssl && myconf="${myconf} --enable-openssl"
+
+	./configure ${myconf} \
+		--enable-epoll \
+		--prefix="/usr/$(get_libdir)/inspircd" \
+		--config-dir="/etc/inspircd" \
+		--binary-dir="/usr/bin" \
+		--library-dir="/usr/$(get_libdir)/inspircd" \
+		--module-dir="/usr/$(get_libdir)/inspircd/modules" \
+		|| die "configure failed"
 	./configure -modupdate || die "modupdate failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	# the inspircd buildsystem does not create these, it's configure script
-	# does. so, we have to at this point to make sure they are there.
+	# the inspircd buildsystem does not create these, its configure script
+	# does. so, we have to make sure they are there.
 	dodir /usr/$(get_libdir)/inspircd
 	dodir /usr/$(get_libdir)/inspircd/modules
 	dodir /etc/inspircd