dev-util/qt-creator: Use botan-bundled useflag to let user choose the bundled

library

3 files changed, 29 insertions, 19 deletions

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index b3865954..02f5a07d 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -2,7 +2,7 @@ AUX qt-creator-2.0.0-disable_qml_plugins.patch 1151 RMD160 bd91bb75fec901fd2f3e9
 AUX qt-creator-2.1.0_rc1-qml-plugin.patch 724 RMD160 f9eff709b1585ad0264b5855b477f2a703c3e232 SHA1 2f84e0f3d32e4efb4328fdef484bc0a7af552ed3 SHA256 78c9f628b6f167cc80317d328a327c106e2dbcc2b3141c7beace9ffc4b30d0af
 AUX qtcreator_logo_48.png 2230 RMD160 23b90749fca6519a1ad9ac5995d371bf31f7516b SHA1 8f392295d6986d73e8782d5af9fb890aedcc2a88 SHA256 aab4c2771865d24a535eb48d08fdd623503248b9b82812d6cbf7f4ec0134326a
 DIST qt-creator-2.3.0-src.tar.gz 26613891 RMD160 22b606ad15629a8e540a7a4ead1dcd62ab3dc72f SHA1 8fc14416b3f0f1fbb0e604d22142100bd475773f SHA256 45f195c2439d7146709295ca9f8117b1b917a1af3ba19219ed22d242c048433d
-EBUILD qt-creator-2.3.0-r1.ebuild 5062 RMD160 460dc099e6cad67dc375b6cab0573399eff2b3c1 SHA1 262a8fe4b0ca03bfbf711374339f0e932f9d80a2 SHA256 ad1d28c5f8ce76120bdf20c2a846d8be96e04bf0030bdbfc0575fc4b0245ed1e
+EBUILD qt-creator-2.3.0-r1.ebuild 5410 RMD160 18df554c4500c95ce6cc7ddf9da21deaf6993451 SHA1 668093e489a890c561fdc67e6ebbcb93410bc629 SHA256 36db6fbbc7d228eb7787ec1d555b3039f89b5145a42bcb254c3b682704ad2924
 EBUILD qt-creator-2.9999.ebuild 4573 RMD160 10187e9fd0d5b69111407f30bbaf66779b18ca22 SHA1 281b3d754323c058e5060c15df73910ff51862e6 SHA256 b5e3bd2a7a7445fd525d64f4be1c6abf5adee880b72ea65c5ef49127321561e0
 EBUILD qt-creator-9999.ebuild 4554 RMD160 0094a7e3165ba7a684a04a2e71bec93f0c921073 SHA1 e6ad4152f3f7b41aece8add856aa64f4ac9b8fd7 SHA256 57580d2e31236079571af6462ff8a9db04269a22e5fecab180d352d4c86463a9
-MISC metadata.xml 1108 RMD160 a9e9f00da1b9504a0fdf3605b6a05ddf1befa66d SHA1 d4541a5cc3c29ee2b8dd35b5b94d387b34765c35 SHA256 8fb6608ad281a48a7e1e606c891effbf484bdc5f97330aea46d271ae083103f2
+MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 2e3ceb9c..755fa845 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="bazaar">Add support for bazaar version control system</flag>
 	<flag name="bineditor">enable bineditor plugin</flag>
 	<flag name="bookmarks">enable bookmarks plugin</flag>
+	<flag name="botan-bundled">Use the bundled copy of dev-libs/botan</flag>
 	<flag name="cmake">enable cmake project manager plugin</flag>
 	<flag name="debugger">enable debugger plugin</flag>
 	<flag name="designer">enable designer plugin</flag>
diff --git a/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild b/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
index b54c4809..1b57ebf0 100644
--- a/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://get.qt.nokia.com/${MY_PN}/${MY_P}-src.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git
+IUSE="bazaar bineditor bookmarks +botan-bundled +cmake cvs debug doc examples fakevim git
 	mercurial perforce +qml qtscript rss subversion"
 QTVER="4.7.4:4"
 DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	subversion? ( dev-vcs/subversion )
-	=dev-libs/botan-1.8*"
+	!botan-bundled? ( =dev-libs/botan-1.8* )"
 
 PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial
 perforce qml qtscript subversion"
@@ -97,21 +97,30 @@ src_prepare() {
 
 	# add rpath to make qtcreator actual find its *own* plugins
 	sed -i "/^LIBS/s:+=:& -Wl,-rpath,/usr/$(get_libdir)/${MY_PN} :" qtcreator.pri || die
-	# drop bundled libBotan. Bug #383033
-	rm -rf "${S}"/src/libs/3rdparty/botan || die
-	# remove references to bundled botan
-	sed -i -e "s:-lBotan:-lbotan:" "${S}"/tests/manual/appwizards/appwizards.pro || die
-	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
-	sed -i -e "/LIBS/s:$: -lbotan:" "${S}"/${MY_PN}.pri || die
-	local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | \
-		cut -d '.' -f1,2)
-	einfo "Version of dev-libs/botan to be used: ${botan_version}"
-	append-flags $(pkg-config --cflags --libs botan-${botan_version})
+
+	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
+		einfo "Version of dev-libs/botan to be used: ${botan_version}"
+		# link to system botan
+		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/${MY_PN}.pri || die
+		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
+		# append botan refs to compiler flags
+		append-flags $(pkg-config --cflags --libs botan-${botan_version})
+	fi
 }
 
 src_configure() {