Introduce botan-bundled useflag as a temp fix for bug #383033

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 8a189b12bd60cff7c41b712b42ef2d7edc493a11..7128a9e50a73ee281d5c14135c2f7eff65c7d037 100644 (file)
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.89 2011/09/08 14:29:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.90 2011/09/21 10:21:13 hwoarang Exp $
+
+*qt-creator-2.3.0-r1 (21 Sep 2011)
+
+  21 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  +qt-creator-2.3.0-r1.ebuild, metadata.xml:
+  Introduce botan-bundled useflag as a temp fix for bug #383033
 
 *qt-creator-2.3.0 (08 Sep 2011)
 

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index c6fccf74a59cd10041fac302efd2580f1b11b799..4bf82b15ffb8f5921a52f1398765abd06532ee4d 100644 (file)
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -14,23 +14,24 @@ EBUILD qt-creator-1.3.1-r2.ebuild 3594 RMD160 c1813c51ae773ea77fc39b6e0fc4edac9a
 EBUILD qt-creator-2.1.0.ebuild 4358 RMD160 92eb6b55c89cf4fb90c01b7b6059c5b672aab8a9 SHA1 7a3eea0e523ddd28033649b04b181bd5ca822c38 SHA256 2c54c3eda44c41a5c51e7eb11d5bad5e269d474fe71c7670d849435231158b0b
 EBUILD qt-creator-2.2.0-r1.ebuild 3924 RMD160 72bab0d56e26ab107ddcf2da996aca9a5a7f0f45 SHA1 80b7a06a3dd6030db0f922f33d74f17700042cc8 SHA256 dbf5a06de37a0c3eb53046194cf7d44f5ad19c97b732e3aae3510c96009486c1
 EBUILD qt-creator-2.2.1.ebuild 3921 RMD160 6defad916e217b880ba6c0e02fc933737c13f82f SHA1 672aa8b5a94411389dcdbb0f12209c65c949706b SHA256 005d09049b744bda5247f650bc36639c659e87b6f97f1412f0828ac0a3e8a8f7
+EBUILD qt-creator-2.3.0-r1.ebuild 5348 RMD160 e53ab8fdc3ebe05cfd9c07c6a354013b98d1f02d SHA1 95d2bf63bfdbce6098836ebceb40d96c486e76e5 SHA256 7714dbfd057c1766f692251a57ede254397fc4ea1e921b251b06a37bcd0fca4a
 EBUILD qt-creator-2.3.0.ebuild 4169 RMD160 a144421f85e1aa0fa51094da69fbbc6db9975d53 SHA1 746ca8b8a5972dc6d676b9dd6d093c951056a3ae SHA256 13469831ac43199d9703bd09e6b5b6cd38b949e28d6140763b1ba322c5438f9a
-MISC ChangeLog 13792 RMD160 d302520fcbd8c7ad4b2b62266a66e867032aa37c SHA1 befca30aff95436b7d156afb74dda4acc55c4821 SHA256 e4bb57624612785b85dbffa416576175daec80589c176933a763e684c847a022
-MISC metadata.xml 1055 RMD160 2558de2f781c71d62f3bab0b834061b387c53268 SHA1 910e7b7e9dd15d58466ed8b03df9a3517ebd29fe SHA256 3f5113d61793395503ae99bc78f22da14f012471bda3f99ac9c3d56c33a6800b
+MISC ChangeLog 13991 RMD160 29498897d946d43636e2e56295014a5d04f03035 SHA1 0ee39c28b62b0265f121d45fda6995b7e48fa2e2 SHA256 3262f9c027bbe2393800129d75398c07de4a4ca222e04ee13c4943e2e7e84e7a
+MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOaNFaAAoJEPqDWhW0r/LCs6YP/i/1EUkwEORGKKyIjFwmRudE
-RSn3GvFCQSHq7b9EjFYJb3uXtTujgG7OXJrHLOXn/VEoikN7tGoUlpOekyqCrKYS
-77WMpzyRdkihgsS50kX17xgbm/1S7ND08ihlmJdA3CLpPNTXsdlpZOrgDQSHpTx+
-B14liT18SQ93QPldv9lZk0HKmPphX/lSNoJ27hMkBKWdakl3OiatpQD6jwLKZ3lf
-TeoszW0lqhcsY/GJYNGPuGp/nzSlRgYXrirn9LnoYB1T1JgZimMUMIkVu50P46Oy
-K/iHoORAhz10WXWgvgc07JZ8sfeV0753QCU/YkBzr1Cfv2THEcDIyWd6DYdcGiZm
-e3VRT5JmGj0rpeA/2J/u5HSdeXqluYwE6lL3XCARHRLkYSat8G67neX+vIRE1WPS
-6KW/i+Z1Gbk037nxz09yg+8nn5G6uIYEDyu2HzzSwQ9LD2XaUZCo8/w8Yv21hl9z
-yar0wJsTnUrtVDwMfMuVvqDG8Ncb/09sYE/W7bUfkLCvo7ZlZ/N5Z98qHrFuJVqN
-29tbZbbqd6snERXeLHte03GxhSbNqb9hUI9GRO/ZSMTSqekW5yEU41IBWrxwAYwS
-dM5uzkQkhOi0RvfJUSfXAwtDQ8KuPnrgGefOiPo4TgHMO7MTSZ17arGr+lyAdTiS
-bXOb7bXe0dHyrEESIEQB
-=FuyY
+iQIcBAEBCgAGBQJOebqAAAoJEPqDWhW0r/LCOjYP/i1ROFIYYA7HKsf2EKflh+Ey
+j7FrlyQrtZmOU33zFG8jb/4ey4rCJ6aaIAoueoe4iCIHZPaHSaEHVqT79M4imwaN
+i/Rf11Q9fmbDlVSOxsRSESTk5V2Wm+4QLk6X+eouuAE7OtaFH/Auxt7NhnE0FiyU
+AOZFz7pQLcB5uOqDLv9Mc23V8r/B7DncXKW1IjCX3JCY+iSw5pDDeGvi0ZsFxuPX
+mPthH4HSa2MUpE9JpnpnfeWtRwyCXgQThb2qILqGVb5A6nI3tEF07D+X9jloB3tD
+1XtbOpdgQpFWa9hFz2lCCrqlmG/lPKIoE8l2Bt/xWu2dSq2Un/jN+PMuQLjvKgOk
+EitQB4JbVZ2V90DDf38YUgI3AacvZwqptaZxOXrvkciABMaBtvY/TWB4Q9WPpBd/
+epptkjIxtO70HlN1F0lPSq+ti4kt4Zc5D3NcsMd+cbZxwsK4xgyYCBf9RB7Dp4s6
+tYh4CMTozA2ydBvMlASk7/UHIGHAFbX0KSnd5UB2Tylcpi0QsDTqGeE+j4se6Eia
+YG02smK25nYtGpHcsx2meBh2NN/ga3wWMl3/cER4C1ngXq1sBLlnqTS/2xB7IjOT
+vmJYliN0MZ4paau7BeSxE9hIdg4QiFKHvJYBCkt0O90lJl2IGlbHwKvfQ9VAkIAP
+FqQV1wNEHMKW+ON5eQtW
+=tePX
 -----END PGP SIGNATURE-----

diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index f3654acca1734d5c5712c84b809dcb69c2a2f7ff..755fa84535272a92ea1d2dea31839b00380600a3 100644 (file)
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -10,7 +10,9 @@
        <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>
        <flag name="fakevim">enable vim-like key bindings plugin</flag>
        <flag name="git">enable git 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
new file mode 100644 (file)
index 0000000..a76e475
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.3.0-r1.ebuild,v 1.1 2011/09/21 10:21:13 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit qt4-r2 multilib flag-o-matic versionator
+MY_PN="${PN/-/}"
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+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 +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?]
+       >=x11-libs/qt-sql-${QTVER}
+       >=x11-libs/qt-svg-${QTVER}
+       debug? ( >=x11-libs/qt-test-${QTVER} )
+       !qml? ( >=x11-libs/qt-gui-${QTVER} )
+       qml? (
+               >=x11-libs/qt-declarative-${QTVER}[private-headers]
+               >=x11-libs/qt-core-${QTVER}[private-headers]
+               >=x11-libs/qt-gui-${QTVER}[private-headers]
+               >=x11-libs/qt-script-${QTVER}[private-headers]
+       )
+       qtscript? ( >=x11-libs/qt-script-${QTVER} )
+       !botan-bundled? ( =dev-libs/botan-1.8* )"
+
+RDEPEND="${DEPEND}
+       bazaar? ( dev-vcs/bzr )
+       cmake? ( dev-util/cmake )
+       cvs? ( dev-vcs/cvs )
+       sys-devel/gdb
+       examples? ( >=x11-libs/qt-demo-${QTVER} )
+       git? ( dev-vcs/git )
+       mercurial? ( dev-vcs/mercurial )
+       subversion? ( dev-vcs/subversion )"
+
+PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial
+perforce qml qtscript subversion"
+
+S="${WORKDIR}"/"${MY_P}"-src
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.1.0_rc1-qml-plugin.patch
+)
+
+src_prepare() {
+       qt4-r2_src_prepare
+
+       # fix library path for styleplugin
+       sed -i -e "/target.path/s:lib:$(get_libdir):" \
+               "${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \
+               || die "Failed to fix multilib dir for styleplugin"
+
+       # bug 263087
+       for plugin in ${PLUGINS}; do
+               if ! use ${plugin}; then
+                       einfo "Disabling ${plugin} support"
+                       if [[ ${plugin} == "cmake" ]]; then
+                               plugin="cmakeprojectmanager"
+                       elif [[ ${plugin} == "qtscript" ]]; then
+                               plugin="qtscripteditor"
+                       elif [[ ${plugin} ==  "qml" ]]; then
+                               for x in qmlprojectmanager qmljsinspector qmljseditor qmljstools qmldesigner; do
+                                       einfo "Disabling ${x} support"
+                                       sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
+                                               || die "Failed to disable ${x} plugin"
+                                       done
+                       fi
+                       # Now disable the plugins
+                       sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro
+               fi
+       done
+
+       if use perforce; then
+               ewarn
+               ewarn "You have enabled perforce plugin."
+               ewarn "In order to use it, you need to manually"
+               ewarn "download the perforce client from http://www.perforce.com/perforce/downloads/index.html"
+               ewarn
+       fi
+       # disable rss news on startup ( bug #302978 )
+       if ! use rss; then
+               einfo "Disabling RSS welcome news"
+               sed -i "/m_rssFetcher->fetch/s:^:\/\/:" \
+                       src/plugins/welcome/communitywelcomepagewidget.cpp || die
+       fi
+
+       # add rpath to make qtcreator actual find its *own* plugins
+       sed -i "/^LIBS/s:+=:& -Wl,-rpath,/usr/$(get_libdir)/${MY_PN} :" qtcreator.pri || die
+
+       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}"/${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() {
+       #the path must NOT be empty
+       local qtheaders="False"
+       use qml && qtheaders="/usr/include/qt4/"
+       eqmake4 \
+               ${MY_PN}.pro \
+               IDE_LIBRARY_BASENAME="$(get_libdir)" \
+               QT_PRIVATE_HEADERS=${qtheaders}
+}
+
+src_install() {
+       #install wrapper
+       dobin bin/${MY_PN} bin/qtpromaker
+       if use qml; then
+               # qmlpuppet component. Bug #367383
+               dobin bin/qmlpuppet
+       fi
+       emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets
+       if use doc;then
+               emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs
+       fi
+
+       # Install missing icon
+       doicon "${S}"/share/qtcreator/templates/wizards/qtcreatorplugin/${MY_PN}_logo_24.png \
+               || die "failed to install icon"
+       make_desktop_entry ${MY_PN} "Qt Creator" ${MY_PN}_logo_24 \
+               'Qt;Development;IDE' || die
+
+       # install additional translations
+       insinto /usr/share/${MY_PN}/translations/
+       for x in ${LINGUAS}; do
+               for lang in ${LANGS}; do
+                       if [[ ${x} == ${lang} ]]; then
+                               cd "${S}"/share/${MY_PN}/translations
+                               lrelease ${MY_PN}_${x}.ts -qm ${MY_PN}_${x}.qm || die
+                               doins ${MY_PN}_${x}.qm
+                       fi
+               done
+       done
+}