From c97907dac5cf90d203587134f9de6a23756261b7 Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Tue, 17 May 2011 15:57:09 +0000
Subject: Install missing qtpromaker and qmlpuppet binaries. Bug #367383

(Portage version: 2.1.9.47/cvs/Linux x86_64)
---
 dev-util/qt-creator/ChangeLog                  |   8 +-
 dev-util/qt-creator/qt-creator-2.2.0-r1.ebuild | 131 +++++++++++++++++++++++++
 dev-util/qt-creator/qt-creator-2.2.0.ebuild    | 127 ------------------------
 3 files changed, 138 insertions(+), 128 deletions(-)
 create mode 100644 dev-util/qt-creator/qt-creator-2.2.0-r1.ebuild
 delete mode 100644 dev-util/qt-creator/qt-creator-2.2.0.ebuild

(limited to 'dev-util')

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 80ba0f317571..0c60eec18456 100644
--- 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.79 2011/05/13 10:39:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.80 2011/05/17 15:57:09 hwoarang Exp $
+
+*qt-creator-2.2.0-r1 (17 May 2011)
+
+  17 May 2011; Markos Chandras <hwoarang@gentoo.org> -qt-creator-2.2.0.ebuild,
+  +qt-creator-2.2.0-r1.ebuild:
+  Install missing qtpromaker and qmlpuppet binaries. Bug #367383
 
   13 May 2011; Markos Chandras <hwoarang@gentoo.org> qt-creator-2.1.0.ebuild,
   qt-creator-2.2.0.ebuild:
diff --git a/dev-util/qt-creator/qt-creator-2.2.0-r1.ebuild b/dev-util/qt-creator/qt-creator-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..a77438105429
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.2.0-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.2.0-r1.ebuild,v 1.1 2011/05/17 15:57:09 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit qt4-r2 multilib
+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.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git
+	mercurial perforce +qml qtscript rss subversion"
+QTVER="4.7.1: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} )"
+
+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
+
+	# 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
+}
+
+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 || die "dobin failed"
+	if use qml; then
+		# qmlpuppet component. Bug #367383
+		dobin bin/qmlpuppet || die "Failed to install qmlpuppet component"
+	fi
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die
+	fi
+	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
+		'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 || die
+			fi
+		done
+	done
+}
diff --git a/dev-util/qt-creator/qt-creator-2.2.0.ebuild b/dev-util/qt-creator/qt-creator-2.2.0.ebuild
deleted file mode 100644
index e01f1e39e3df..000000000000
--- a/dev-util/qt-creator/qt-creator-2.2.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.2.0.ebuild,v 1.2 2011/05/13 10:39:50 hwoarang Exp $
-
-EAPI="4"
-LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
-
-inherit qt4-r2 multilib
-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.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git
-	mercurial perforce +qml qtscript rss subversion"
-QTVER="4.7.1: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} )"
-
-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
-
-	# 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
-}
-
-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} || die "Failed to install launcher"
-	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
-	if use doc;then
-		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_qch_docs || die
-	fi
-	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
-		'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 || die
-			fi
-		done
-	done
-}
-- 
cgit v1.2.3-65-gdbad