--- inspircd-1.1.13-r1.ebuild	2007-10-06 00:29:07.000000000 +0400
+++ inspircd-1.1.14.ebuild	2007-11-11 13:48:47.065304651 +0300
@@ -1,48 +1,53 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.13-r1.ebuild,v 1.1 2007/10/05 20:29:07 hansmi Exp $
+# $Header: $
 
-inherit eutils toolchain-funcs multilib # subversion
-
-IUSE="openssl gnutls ipv6 kernel_linux"
+inherit eutils multilib
 
 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"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="
+IUSE="gnutls ipv6 openssl kernel_linux"
+
+DEPEND="
 	>=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 )"
-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"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
 
 pkg_setup() {
+	ebegin "Creating inspircd user and group"
 	enewgroup inspircd
 	enewuser inspircd -1 -1 -1 inspircd
+	eend ${?}
 }
 
 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" --binary-dir="/usr/bin" \
-	--library-dir="/usr/$(get_libdir)/inspircd" \
-	--module-dir="/usr/$(get_libdir)/inspircd/modules" \
-	|| die "configure failed"
+	local myconf="
+		--disable-interactive
+		--enable-epoll"
+
+	# ./configure doesn't know --disable-gnutls, -ipv6 and -openssl options,
+	# so should be used only --enable-like.
+	use gnutls  && myconf="${myconf} $(use_enable gnutls)"
+	use ipv6    && myconf="${myconf} $(use_enable ipv6) --enable-remote-ipv6"
+	use openssl && myconf="${myconf} $(use_enable openssl)"
+
+	./configure \
+		--prefix="/usr" \
+		--binary-dir="/usr/bin" \
+		--config-dir="/etc/${PN}" \
+		--library-dir="/usr/$(get_libdir)/${PN}" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		${myconf} || die "configure failed"
 
 	emake || die "emake failed"
 }
@@ -50,18 +55,18 @@
 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.
-	dodir /usr/$(get_libdir)/inspircd
-	dodir /usr/$(get_libdir)/inspircd/modules
-	dodir /etc/inspircd
-	dodir /var/log/inspircd
-	dodir /usr/include/inspircd
+	dodir /etc/${PN}
+	dodir /usr/include/${PN}
+	dodir /usr/$(get_libdir)/${PN}
+	dodir /usr/$(get_libdir)/${PN}/modules
+	dodir /var/log/${PN}
 
 	emake install \
-		LIBPATH="${D}/usr/$(get_libdir)/inspircd/" \
-		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
-		CONPATH="${D}/etc/inspircd" \
-		BINPATH="${D}/usr/bin" \
-		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
+		BASE="${D}"/usr/$(get_libdir)/${PN}/inspircd.launcher \
+		BINPATH="${D}"/usr/bin \
+		CONPATH="${D}"/etc/${PN} \
+		LIBPATH="${D}"/usr/$(get_libdir)/${PN}/ \
+		MODPATH="${D}"/usr/$(get_libdir)/${PN}/modules/ \
 
 	insinto /usr/include/inspircd/
 	doins "${S}"/include/*
@@ -70,14 +75,14 @@
 }
 
 pkg_postinst() {
-	chown -R inspircd:inspircd "${ROOT}"/etc/inspircd
-	chmod 700 "${ROOT}"/etc/inspircd
+	chown -R inspircd:inspircd "${ROOT}"/etc/${PN}
+	chmod 700 "${ROOT}"/etc/${PN}
 
-	chmod 750 "${ROOT}"/var/log/inspircd
-	chown -R inspircd:inspircd "${ROOT}"/var/log/inspircd
+	chown -R inspircd:inspircd "${ROOT}"/var/log/${PN}
+	chmod 750 "${ROOT}"/var/log/${PN}
 
-	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/inspircd
-	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/inspircd
+	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/${PN}
+	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/${PN}
 
 	chmod -R 755 "${ROOT}"/usr/bin/inspircd
 }