--- Ice-3.4.1.ebuild
+++ Ice-3.4.2.ebuild
@@ -10,7 +10,7 @@
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
 
-inherit toolchain-funcs versionator python mono ruby-ng
+inherit toolchain-funcs versionator python mono ruby-ng db-use
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
 HOMEPAGE="http://www.zeroc.com/"
@@ -24,7 +24,7 @@
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	>=dev-libs/openssl-0.9.8o
-	>=sys-libs/db-4.8.30:4.8[-nocxx]
+	>=sys-libs/db-4.8.30[-nocxx]
 	~dev-cpp/libmcpp-2.7.2
 	ruby? ( $(ruby_implementation_depend ruby18) )
 	mono? ( dev-lang/mono )
@@ -55,10 +55,7 @@
 }
 
 src_prepare() {
-#	if tc-is-cross-compiler ; then
-#		export CROSS_COMPILE=yes
-#		epatch "${FILESDIR}/${P}-cross-compile.patch"
-#	fi
+	epatch "${FILESDIR}"/${PN}-3.4.1-db5.patch
 
 	sed -i \
 		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
@@ -101,13 +98,13 @@
 	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"
 
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.8"
+	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
 	sed -i \
 		-e "s|c++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
 		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
 		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.8|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db)|" \
 		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
 
 	if use python ; then