diff --git a/dev-libs/Ice/Ice-3.6.2.ebuild b/dev-libs/Ice/Ice-3.6.2.ebuild
index a2321e1..8c8bec2 100644
--- a/dev-libs/Ice/Ice-3.6.2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.2.ebuild
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
 DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
 	test? (
 		${PYTHON_DEPS}
 		dev-python/passlib[${PYTHON_USEDEP}]
@@ -286,7 +286,7 @@ src_install() {
 	fi
 
 	if use doc ; then
-		dodoc "${DISTDIR}/${PN}-3.6.1.pdf"
+		dodoc "${DISTDIR}/${P}.pdf"
 	fi
 
 	if use php ; then
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index c276af7..c9fe643 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -50,7 +50,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
 DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
 	test? (
 		${PYTHON_DEPS}
 		dev-python/passlib[${PYTHON_USEDEP}]
@@ -126,7 +126,7 @@ src_prepare() {
 	if ! use test ; then
 		sed -i \
 			-e '/SUBDIRS/s|\ test||' \
-			{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
+			{csharp,python,ruby}/Makefile || die "sed failed"
 	fi
 }
 
@@ -149,7 +149,8 @@ src_configure() {
 		install_mandir=\"${ED}/usr/share/man\"
 		embedded_runpath_prefix=\"${EPREFIX}/usr\"
 		LP64=yes
-		new_dtags=yes"
+		new_dtags=yes
+		NOTEST=$(usex test no yes)"
 
 	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
 	use debug && OPTIONS="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"