version bump. EAPI4, code fixes from qting-edge overlay

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

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index ffeb1be3192051b2704bde0c1d18a267c679d4e9..367690f4134ffd4172262ac20590c604b5ef7903 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.95 2011/10/20 18:38:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.96 2011/11/19 20:14:38 hwoarang Exp $
+
+*qt-creator-2.4.0_rc (19 Nov 2011)
+
+  19 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
+  +qt-creator-2.4.0_rc.ebuild:
+  version bump. EAPI4, code fixes from qting-edge overlay
 
   20 Oct 2011; Markos Chandras <hwoarang@gentoo.org> qt-creator-2.1.0.ebuild,
   qt-creator-2.2.0-r1.ebuild, qt-creator-2.2.1.ebuild, qt-creator-2.3.0.ebuild,

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index c67cb1a25ed2ca2dd93cd289b1c679e165100345..7bd0e044050d9576ef7d10cbda72d5f6fc374ec4 100644 (file)
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -9,28 +9,30 @@ DIST qt-creator-2.2.0-src.zip 29849268 RMD160 d71a15f88b5dfd489189ba235b89e3d0ab
 DIST qt-creator-2.2.1-src.zip 29975538 RMD160 dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100 SHA1 6a369dffa7ee52ae068d9ebb3616e29d185a5009 SHA256 7fa583e8363c88334847fe5487341c4e8e22172902f4e627254b22d15cd12eb7
 DIST qt-creator-2.3.0-src.tar.gz 26613891 RMD160 22b606ad15629a8e540a7a4ead1dcd62ab3dc72f SHA1 8fc14416b3f0f1fbb0e604d22142100bd475773f SHA256 45f195c2439d7146709295ca9f8117b1b917a1af3ba19219ed22d242c048433d
 DIST qt-creator-2.3.1-src.tar.gz 26820259 RMD160 06cdd661954a72125a5a6a7c75a293338c2df6c4 SHA1 620fe944994fffe0812a1474deff78e07b34025b SHA256 e9d25f5d8d489b44300a68f446ad30d2f9259f1d27c7e8e1ac7bb145772d481a
+DIST qt-creator-2.4.0-rc-src.tar.gz 26289503 RMD160 e9317abd0460175d79ef6fb92081561f7f5dacaf SHA1 e7c0a1348ffb66b3539a933668323818bb247ec5 SHA256 238293fbed61e4b9df0b24f0de6ec2b1472ad92448e5bcceed2e433d64b992a6
 EBUILD qt-creator-2.1.0.ebuild 4366 RMD160 7bb6643a50343ba236fff12a4c43a44ab109a317 SHA1 bfe69de1ae21e45ec2144a8ea75a558aa34fbe26 SHA256 9e07242bfddf41eb585118cefb41650c8b18d34378c7be263e775acfa50cf70f
 EBUILD qt-creator-2.2.0-r1.ebuild 3932 RMD160 f51b1c5acb7902dcf6ef0dd01b629cd398035cb2 SHA1 2c3ab1a7636b53effc3c909cfac776b99c753f79 SHA256 7a320d6fe40f3c14b8beaac6d947939ba016a4070b762c79e5d0d1cc14cd6ea4
 EBUILD qt-creator-2.2.1.ebuild 3927 RMD160 08e20c15e7a9b5f7858f63034392cf45b4c269ce SHA1 d2ca1e76a4410dd61d3ccc2e89d8a72b189aa08c SHA256 ffd9d9e2a05b4f25419848ab76b25d264fb08bc018b5c61b95cdea0cd329b9da
 EBUILD qt-creator-2.3.0-r2.ebuild 5419 RMD160 fd0a43d234a24ed3f0c8877968db8252fbb13d38 SHA1 0e0750b9e277b6c9e28a9e01442b1cf4b8716256 SHA256 a1a93fdc227ae36ea1a49a2df2d7752ced82775442c6243ea18f5ad389e43b07
 EBUILD qt-creator-2.3.0.ebuild 4177 RMD160 d4e25423c057df9f595997f886f30c4a0f18af57 SHA1 8952da5fab69de8a83fa5fe34197f4fae56baaae SHA256 eb14bdce530cb94614f7e46391b7857235c0747ca4596c3832c8d0fd2a0d5e34
 EBUILD qt-creator-2.3.1.ebuild 5416 RMD160 4bc9b2046f226b183cdea34e7d5ee0eee0ca2323 SHA1 6c9d7f33b7fab3b8374bd43533c21b786ffcd603 SHA256 86bce36ac98bba54f1427661beb45e8085639b364836557eecfe99e530b1baf7
-MISC ChangeLog 14963 RMD160 de5b69c1b15cfb32a7b4bd1ba580934dd9366a54 SHA1 a856d3b57e29dd51b64e32c588155ee41f9eef09 SHA256 875eabba4d8754501c7af95638184c5e8238eadc8d32d58efc1ac3ed4f8a6917
+EBUILD qt-creator-2.4.0_rc.ebuild 5503 RMD160 a8cb84bb992569d7bb28ef62bda413e756fff9a6 SHA1 b6a37dd68d315d18704a461bac0af8e7dc29f2ca SHA256 35d02037c7149d8e5243ef3c5fec98279e81fddda49771996539661b6107906c
+MISC ChangeLog 15142 RMD160 93525c48fb959b3982b0b908eebb4cd3290718fe SHA1 3426a1fc171aa80f24e4f9b43d5078f16c84d864 SHA256 de82f9d905668c351ca3010688ccd1f22a4c8a3147c457c66a8549e645952a94
 MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOoGqWAAoJEPqDWhW0r/LC5dAP/29Ay/rGbECOI8SQv046dH9q
-G2q2vrE9o1rut2pGfyhoOJUkOUXPF8Rzr3UaY47qF9bM45Y0PZX8gbmREQy4HpZn
-zfiXPJ590cGkHIzfZelUNP1gQEVjYABiE0IMakGB669lZHmffJTfDZ2zQLFDnY5Z
-SFk9eeS71eR6WwpL/kl66KTMv7VRJsg4E8ounqZx7BhpxIkZc+FpW8ZauH315fVr
-7MPUKDitLJe8aeE3N2LjgHIJAFpewdki3RMtzefAl4dF+KhQkSmBfJReoCZMQRUT
-4FY/3B8PjZ0vwA7UOq2p6URLzWDoPKDVyqVt2lJHO5X4aUyhAq49IgkMatxMkUE8
-32Zsjo8M7OXGgvSl9SzX3wig9O9onOjsyZ6JoJAKjRFBZLsvUr2JrevOSfzTf0WD
-I614T2gfw3xHE26LYiW5dHSfeAK8B4bRwvytyAwFjccIUM7l61pOzt0K784BlAdv
-8assGTLigD3025ChUk7bUlFHF4IydE/DUUqkH+OiGGbtG99CzSwg+8GHrO5eDOsk
-LHo7u0fs14QtACm4w6qeljotw6PwZrN2PhFcYnyLg3+xn1xyRUETtDK1etSdrv6s
-zwfSdW4lDiD8ifQRomPBg3S4Ch9XKavHht/t7PEmr1D7YD3e2XtVn063MBdn72Xt
-qY3ra7tHWdpJOxDRx0gu
-=mDua
+iQIcBAEBCgAGBQJOyA4yAAoJEPqDWhW0r/LCoJ4P/jICPoXtZ1umu5xr9G4WXa0r
+X+yqWbLwqNGEyrtl8pBV8Z12cCKlhamukWumfKUQQ/cJz0PfyAnKpAhIyEpNN05T
+NnCacXMvflj9m+ng5muSgAvQldZbQ+tfgu29dq2xgrKbwJqRwsecHSrzpu4qxdQB
+y54dL6IKJdus7EjRWMmyfqUTiDBrDIWrs0Mn5WYSPqRsTwnj4DUC3R1JdCGNEEzR
+xzNhmUUIqNw56ESouDFBjUvLoNwK4/Zlwges48O/qxmfdiDI2ase6ii2Y09EkU2f
+Qmyyqltdg9w1wVxWabJvvgxgRBjFmrk0pNRU9bRN65MZHZNMe3HHMGwExdCQl5r8
+D7B1aV1Wj/w+T4Lp57kNBt4EVM+x5JhYWB+1pIvQcx/ZiEeTRetrJd/lihT0dXaX
+ynvNluDU/9Xr4trfoSlrosHIOPSHV/dcNKC3rG0VKVBoM8LIFHHqeexQxDamkc3/
+dh1/J7UDtpeNrbBO+5XbZhpXLQhDYotwdJMlecfPsYxmEQ99kGQhe9VwlHxW1oiH
+VwFnJx5IUK3mhfLu9DcaKUVTaFMbT7coUhxzZQx04AJOlcpVnvA7ckypSsQeBE9+
+RvTUWy4nFG8MYNRq0ilszEX75L0hRbOTjXxdUR4Pd5CBXtD9KhrSK0TdPqXWKCW7
+6pTWH4OylNEd5d712i2J
+=iZ1R
 -----END PGP SIGNATURE-----

diff --git a/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild b/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild
new file mode 100644 (file)
index 0000000..a53902c
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.4.0_rc.ebuild
@@ -0,0 +1,170 @@
+# 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.4.0_rc.ebuild,v 1.1 2011/11/19 20:14:38 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"
+CDEPEND=">=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* )"
+
+DEPEND="${CDEPEND}
+       !botan-bundled? ( dev-util/pkgconfig )"
+
+RDEPEND="${CDEPEND}
+       bazaar? ( dev-vcs/bzr )
+       cmake? ( dev-util/cmake )
+       cvs? ( dev-vcs/cvs )
+       sys-devel/gdb[python]
+       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
+
+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
+
+       # fix translations
+       sed -i "/^LANGUAGES/s:=.*:= ${LANGS}:" \
+               share/${MY_PN}/translations/translations.pro || die
+
+       # 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_compile() {
+       emake
+       use doc && emake docs
+}
+
+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
+               [[ -e "${S}"/share/doc/${MY_PN}/${MY_PN}.qch ]] || die "${MY_PN}.qch is missing"
+               emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_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
+
+       # Remove unneeded translations
+       for lang in ${LANGS}; do
+               if ! has $lang ${LINGUAS}; then
+                       rm "${D}"/usr/share/${MY_PN}/translations/${MY_PN}_${lang}.qm \
+                               || die "failed to remove translations"
+               fi
+       done
+}