--- /usr/portage/dev-util/qt-creator/qt-creator-2.6.1.ebuild	2012-12-30 22:47:18.000000000 +0100
+++ /usr/portage/dev-util/qt-creator/qt-creator-2.6.1.ebuild	2013-01-18 17:18:24.362285350 +0100
@@ -29,7 +29,7 @@ 
 QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
 	clearcase cmake:cmakeprojectmanager cvs fakevim git
 	madde mercurial perforce qnx subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
+IUSE="botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="4.8.0:4"
@@ -82,30 +82,25 @@ 
 	if ! use botan-bundled; then
 		# identify system botan and pkg-config file
 		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
-		local lib_botan=$(pkg-config --libs botan-${botan_version})
 		einfo "Major version of system's botan library to be used: ${botan_version}"
 
 		# drop bundled libBotan. Bug #383033
-		rm -rf "${S}"/src/libs/3rdparty/botan || die
-		# remove references to bundled botan
-		sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die
-		for x in testrunner parsertests modeldemo; do
-			sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die
-		done
-		sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
-		sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
-		# link to system botan
-		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
-		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
+		epatch "${FILESDIR}/${PN}-remove-bundled-botan.patch"
 		# append botan refs to compiler flags
-		append-flags $(pkg-config --cflags --libs botan-${botan_version})
+		append-flags -I../3rdparty $(pkg-config --cflags botan-${botan_version})
 	fi
 }
 
 src_configure() {
+	local extra_flags=
+	if ! use botan-bundled; then
+		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
+		extra_flags="QMAKE_LIBS=\"$(pkg-config --libs botan-${botan_version})\""
+	fi
 	eqmake4 qtcreator.pro \
 		IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=yes
+		IDE_PACKAGE_MODE=yes \
+		"${extra_flags}"
 }
 
 src_compile() {