--- squid-3.1.0.9_beta.ebuild	2009-07-30 11:01:10.000000000 +0200
+++ squid-3.1.0.12_beta.ebuild	2009-07-30 11:00:49.000000000 +0200
@@ -6,8 +6,6 @@ EAPI="2"
 
 inherit eutils pam toolchain-funcs
 
-RESTRICT="test" # check if test works in next bump
-
 DESCRIPTION="A full-featured web proxy cache"
 HOMEPAGE="http://www.squid-cache.org/"
 SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P/_beta}.tar.gz"
@@ -15,7 +13,7 @@ SRC_URI="http://www.squid-cache.org/Vers
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux test icap-client logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
@@ -34,7 +32,8 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap
 DEPEND="${COMMON_DEPEND}
 	sys-devel/automake
 	sys-devel/autoconf
-	sys-devel/libtool"
+	sys-devel/libtool
+	test? ( dev-util/cppunit )"
 RDEPEND="${COMMON_DEPEND}
 	samba? ( net-fs/samba )
 	mysql? ( dev-perl/DBD-mysql )
@@ -58,8 +57,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3-capability.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-invconv.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0.9_beta-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0.9_beta-invconv.patch
 
 	# eautoreconf breaks lib/libLtdl/libtool script
 	./bootstrap.sh || die "autoreconf failed"