# ChangeLog for dev-util/qt-creator
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.104 2012/01/02 17:50:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.105 2012/01/03 22:17:42 pesa Exp $
+
+*qt-creator-2.4.0-r1 (03 Jan 2012)
+
+ 03 Jan 2012; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.4.0-r1.ebuild,
+ -qt-creator-2.4.0.ebuild, metadata.xml:
+ Revbump with major changes: remove USE=qml and always depend on qt-declarative
+ and qt-script (they're required by some core plugins); remove pointless and/or
+ obsolete USE flags; add madde and valgrind USE flags; move VCS packages to
+ PDEPEND; stop adding a custom rpath, the build system already takes care of
+ setting it; install a better icon; other misc cleanups. Also added myself as
+ maintainer.
02 Jan 2012; Davide Pesavento <pesa@gentoo.org> -files/docs_gen.patch,
-files/qt-creator-1.3.1-qt47.patch, metadata.xml:
DIST qt-creator-2.4.0-src.tar.gz 26105130 RMD160 c8be1e24e100b856a8f78b52848ad7053e7fa366 SHA1 12934e34fdda3f493812e671f8db1fb789578e91 SHA256 3d83013d9d6842f1dfe4d345dd837b83855c8686035b9fe55aec2a0ecb901af0
EBUILD qt-creator-2.1.0.ebuild 4366 RMD160 7bb6643a50343ba236fff12a4c43a44ab109a317 SHA1 bfe69de1ae21e45ec2144a8ea75a558aa34fbe26 SHA256 9e07242bfddf41eb585118cefb41650c8b18d34378c7be263e775acfa50cf70f
EBUILD qt-creator-2.3.1.ebuild 5412 RMD160 6e3b8aa2202fc12906ae719b32ab0d2d4b6a7511 SHA1 84b44670fa726265229afab3cdadd6d68190bbfb SHA256 beaad6d1aa7b9f2a1e3895960568153894def2f7dc62e0bc524af0e152f31073
-EBUILD qt-creator-2.4.0.ebuild 5363 RMD160 ef5c3f8673687449b05e0c8bb0961b70ce7043b2 SHA1 1828be36fabe560d7166576a42f3f1134a8c8b9b SHA256 faed766f4d12e8b1023f37385191b8e71137f61cbd3fda7dddcdcd402a96903d
-MISC ChangeLog 16291 RMD160 b2131c675e43c90e4a05bf7089ca00cce6091c39 SHA1 cb52fa52d750a8b6fbe3d9f0b1037c66f45c6f33 SHA256 9448d4ea80ccc8c2e9031a030f255057bee2523ec82b02bea045a3ae292b82a0
-MISC metadata.xml 1130 RMD160 a9f9e1eed0a4e5691f810349ce65351a4ebfefa2 SHA1 8634c51acebb74ab96b1c6047fa88d1b04eeed56 SHA256 968f31018327d78af74d235cfd8ea116f7845d0a6482d7d5f51725f4d53bdeed
+EBUILD qt-creator-2.4.0-r1.ebuild 4088 RMD160 145cee52e8897536e40f6949448fc6c612f61ad7 SHA1 3019ca53fb53e9c2872bfac5b684be68b11a7887 SHA256 b2cda0db577b716b8293a7c2afe79e4b58aa981c78555d7d4e9a0c937aa790dd
+MISC ChangeLog 16859 RMD160 c67a74fa4f6615a9688e76d39fc6e17e09a69aa8 SHA1 aa08640fd9705f7bafede2de8eebb5d3f5511732 SHA256 1a9253ce84469126ca1786bc890df016fa13dc575d61d96ccec56ea46b5536ee
+MISC metadata.xml 1463 RMD160 b8a89ed65e589882eb76b2b6121af00ce418759c SHA1 ccbec1b219fbf78e1d788d05fdc278b98581d080 SHA256 3025ff87f1d0ce4cee9dd0710c10f5c6df1b68e8784a5562884ac0aef5dc045d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJPAe5VAAoJENXLsxwXqFxyjk0P/iZbwoQHpd8W5I55K1eZkkOf
-IV3GthLRnFbtB9X8tZ8aak3tU62EbLiFmCrCDbX2/r8odTtuD05Wv7e01sWzKLJW
-2P1sNTQg+qCTssb6WVKeH6OidU1Fbdy06akMxXJUNU2PFXQhVylKqMCyRJF5www7
-l4MdmQclAs3DPDNdxsP+FeAMOuwWsI2edneu/Vnpo1HdyAfHAMbXVed3gTjDV8d7
-5SUwL2OWf0OTetv+2P8Y3ACR+w/Xy30Gy7L6VzOu2nVzSmCY0iDn2BqxuJh8NQql
-86lHoV7IyHS8xg7O+P+wi/W1fdKOOGDqcxMqljbcL19qFn3SnXOgQ1nV9EFQYGYF
-ejHzGYUKeQOyE4hUIigDgBvBHXVjGx+TLWoaSTm2kS4nFnSzGubnxndZx95XiKVJ
-JZTDc4vrwYgYgSV5bEsIyzLvP+er7xUvs+KAVti2H44KubtBW1f+w1h4uhB3wixC
-4Y2oqcfvY4wpB4dtkWbAlGymognIsg3Xfns3l9rr26aUTf1P6DhRWSsveiAzJxU4
-dXuZ475IAmrcmp71oF6U1vwCDZeNFhmoe+C2iurzsKChvdLPBFAv8fwuJz7LJKDN
-JhBvbiXuNbg5Yqf8pw27dbo/4Wq/h7hNNbagJE2hWx5lqfVlCExshLfoeBD3fhjm
-jtuDSdBRzR14S1BwEprg
-=R1eP
+iQIcBAEBCgAGBQJPA36GAAoJENXLsxwXqFxyaHwP/0LSVvvhdXg7VnOvjRwiwc7L
+wTfX8e9usr7l0BSf1QIuEmZRMCJZfj6DrAr7ZmLzdjM2ARlAsnfIHjTQlfOeuvux
+m9uRA7N+jIzsbWuGk2LSaoqk+CaY3dvZ8D/L8N8af6qYMWCT08XkQikyo1go0ajD
+07yaqtQqa4Z24FmQqOsGa3bcDYGcRgwHyv3UDcyyts8dE3tIojA4ICY6WtGVJb1r
+LHdyiccmGFPBGIutsE2T/uj8QzNg9jPf7jGA4qZizLa8wahkBAj0EXpkCG4OfCNk
+8vDQIuoZIMElDV5ljnJ4gOmAhNf9c90WOgkWHT6zSzO4SYXcozuStlHYFddA2e05
+m9vs4qPimlqGFu1oZ4rug9W7AVsp5rW8mHvp+Cvq3lLUBjmd/ILnMUCNMsk9Wict
+paqclu2gh9o+ZpJxkhhs/PfGTUDy3UhJ3A5yxJf6LQsYs/L6QL5/jaQwUmZNG0Ak
+ByOaHdAQ1nEbNThfs003T/w4Q86b12g1IuFJC6dSkbsZ5U5w5kgr02EN0KEm6i0U
+39Xog6VABBdiBxGtuTZYOLns4JAFWOprSR9deQq1R8zn+8gHhVc+bihj/F4iJgwY
+q0szZLxN6pUo8GjHXUraaVeIBgIR0i4G5DJqthsnul4btpc48liwsLvW5Vp0p6r7
+4knrD6jYVEPl7dl8RQMC
+=zk/e
-----END PGP SIGNATURE-----
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+ <email>pesa@gentoo.org</email>
+ <name>Davide Pesavento</name>
+</maintainer>
<use>
- <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="designer">enable designer plugin</flag>
- <flag name="fakevim">enable vim-like key bindings plugin</flag>
- <flag name="git">enable git plugin</flag>
- <flag name="mercurial">enable mercurial plugin</flag>
- <flag name="perforce">enable perforce software configuration manager plugin</flag>
- <flag name="qml">Simple way of building UIs based on Qt Declarative module</flag>
- <flag name="qtscript">enable qt script editor plugin</flag>
- <flag name="subversion">enable subversion plugin</flag>
+ <flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> 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 <pkg>dev-libs/botan</pkg></flag>
+ <flag name="cmake">Enable cmake project manager plugin</flag>
+ <flag name="designer">Enable Qt Designer integration</flag>
+ <flag name="fakevim">Enable support for vim-like key bindings</flag>
+ <flag name="git">Add support for <pkg>dev-vcs/git</pkg> version control system</flag>
+ <flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
+ <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+ <flag name="perforce">Enable perforce software configuration manager plugin</flag>
+ <flag name="qml">Build QML support and many other QML-related tools (recommended)</flag>
+ <flag name="qtscript">Enable QtScript editor plugin</flag>
+ <flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
</use>
-<longdescription lang="en">
-</longdescription>
</pkgmetadata>
--- /dev/null
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/01/03 22:17:42 pesa Exp $
+
+EAPI="4"
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit multilib eutils flag-o-matic qt4-r2
+
+MY_P=${PN}-${PV/_/-}-src
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
+ git madde mercurial perforce subversion valgrind)
+IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
+
+QTVER="4.7.4:4"
+CDEPEND="
+ >=x11-libs/qt-core-${QTVER}[private-headers(+)]
+ >=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
+ >=x11-libs/qt-gui-${QTVER}[private-headers(+)]
+ >=x11-libs/qt-script-${QTVER}[private-headers(+)]
+ >=x11-libs/qt-sql-${QTVER}
+ >=x11-libs/qt-svg-${QTVER}
+ debug? ( >=x11-libs/qt-test-${QTVER} )
+ doc? ( >=x11-libs/qt-assistant-${QTVER}[doc] )
+ !botan-bundled? ( =dev-libs/botan-1.8* )
+"
+DEPEND="${CDEPEND}
+ !botan-bundled? ( dev-util/pkgconfig )
+"
+RDEPEND="${CDEPEND}
+ sys-devel/gdb[python]
+ examples? ( >=x11-libs/qt-demo-${QTVER} )
+"
+PDEPEND="
+ bazaar? ( dev-vcs/bzr )
+ cmake? ( dev-util/cmake )
+ cvs? ( dev-vcs/cvs )
+ git? ( dev-vcs/git )
+ mercurial? ( dev-vcs/mercurial )
+ subversion? ( dev-vcs/subversion )
+ valgrind? ( dev-util/valgrind )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ # disable unwanted plugins
+ for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+ if ! use ${plugin%:*}; then
+ einfo "Disabling ${plugin%:*} plugin"
+ sed -i -e "/^[[:space:]]\+plugin_${plugin#*:}/d" src/plugins/plugins.pro \
+ || die "failed to disable ${plugin} plugin"
+ fi
+ done
+
+ if use perforce; then
+ ewarn
+ ewarn "You have enabled the perforce plugin."
+ ewarn "In order to use it, you need to manually download the perforce client from"
+ ewarn " http://www.perforce.com/perforce/downloads/index.html"
+ ewarn
+ fi
+
+ # fix translations
+ sed -i -e "/^LANGUAGES/s:=.*:= ${LANGS}:" \
+ share/qtcreator/translations/translations.pro || 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}"/qtcreator.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() {
+ eqmake4 qtcreator.pro \
+ IDE_LIBRARY_BASENAME="$(get_libdir)" \
+ IDE_PACKAGE_MODE=true
+}
+
+src_compile() {
+ emake
+ use doc && emake docs
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
+
+ if use doc; then
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
+ fi
+
+ # Install icon & desktop file
+ doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die
+ make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die
+
+ # Remove unneeded translations
+ local lang
+ for lang in ${LANGS}; do
+ if ! has ${lang} ${LINGUAS}; then
+ rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
+ || eqawarn "failed to remove ${lang} translation"
+ fi
+ done
+}
+++ /dev/null
-# 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.ebuild,v 1.2 2011/12/31 12:14:39 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 rss 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} == "rss" ]]; then
- plugin="welcome"
- 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
-
- # 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
-}
projects / gentoo.git / commitdiff