--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- ctrlproxy-3.0.8.ebuild
+++ ctrlproxy-3.0.8-r1.ebuild
@@ -1,32 +1,42 @@ 
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-3.0.8.ebuild,v 1.3 2009/06/02 12:21:08 flameeyes Exp $
 
-inherit eutils
+EAPI=4
+
+inherit autotools eutils
 
 DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://www.ctrlproxy.org"
-SRC_URI="http://www.ctrlproxy.org/releases/${P}.tar.gz"
+HOMEPAGE="http://samba.org/~jelmer/ctrlproxy/"
+SRC_URI="http://www.samba.org/~jelmer/ctrlproxy/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc x86"
-IUSE="ssl"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="ssl readline"
+
 RESTRICT="test"
 
 RDEPEND=">=dev-libs/glib-2
-	ssl? ( net-libs/gnutls )"
+	readline? ( sys-libs/readline )
+	ssl? ( dev-libs/libgcrypt net-libs/gnutls )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}/"${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoconf
+}
 
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_with ssl)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install-doc || die "emake install failed"
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
+		install install-doc
 }