--- sys-libs/db/db-4.6.21_p1.ebuild
+++ sys-libs/db/db-4.7.25.ebuild
@@ -25,15 +25,15 @@
 done
 
 LICENSE="OracleDB"
-SLOT="4.6"
+SLOT="4.7"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="tcl java doc nocxx bootstrap"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )
+	java? ( >=virtual/jdk-1.5 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( dev-lang/tcl )
-	java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.5 )"
 
 src_unpack() {
 	unpack "${MY_P}".tar.gz
@@ -42,10 +42,10 @@
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+	epatch "${FILESDIR}"/"${PN}"-4.6-libtool.patch
 
 	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
 
 	sed -i \
@@ -109,14 +109,14 @@
 		--host="${CHOST}" \
 		${myconf}  "${javaconf}" || die "configure failed"
 
-	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
 	emake -j1 || die "make failed"
 }
 
 src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
 
 	db_src_install_usrbinslot
 
@@ -127,7 +127,7 @@
 	db_src_install_usrlibcleanup
 
 	dodir /usr/sbin
-	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db46_svc
+	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
 
 	if use java; then
 		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so