Cleanup

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

5 files changed, 6 insertions, 296 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 94ade1689116..369685d84eb3 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # 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.122 2012/07/11 20:01:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.123 2012/07/12 11:09:56 pesa Exp $
+
+  12 Jul 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/qt-creator-2.1.0_rc1-qml-plugin.patch, -qt-creator-2.1.0.ebuild,
+  -qt-creator-2.4.1.ebuild, metadata.xml:
+  Cleanup
 
   11 Jul 2012; Michael Weber <xmw@gentoo.org> qt-creator-2.5.0.ebuild:
   ppc stable (bug 408711)
diff --git a/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch b/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch
deleted file mode 100644
index 03977c913d51..000000000000
--- a/dev-util/qt-creator/files/qt-creator-2.1.0_rc1-qml-plugin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri.qtquickplugin-lib-fix qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri
---- qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri.qtquickplugin-lib-fix	2010-11-24 17:28:38.000000000 +0200
-+++ qt-creator-2.1.0-rc1-src/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri	2010-11-30 14:13:19.065191548 +0200
-@@ -1,5 +1,7 @@
- macx {
-   DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
- } else {
--  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
-+  DESTDIR = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qmldesigner
-+  target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
-+  INSTALLS += target
- }
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 77288bcd8380..91bd2aea8aa1 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -13,18 +13,13 @@
 <use>
 	<flag name="autotools">Enable autotools project manager 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">Add support for Perforce version control system (requires manual installation of Perforce client)</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>
 </pkgmetadata>
diff --git a/dev-util/qt-creator/qt-creator-2.1.0.ebuild b/dev-util/qt-creator/qt-creator-2.1.0.ebuild
deleted file mode 100644
index bd6f8ec23b30..000000000000
--- a/dev-util/qt-creator/qt-creator-2.1.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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.1.0.ebuild,v 1.9 2012/05/21 20:09:32 ssuominen Exp $
-
-EAPI="2"
-LANGS="de es fr it ja pl ru sl"
-
-inherit eutils 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="bineditor bookmarks +cmake cvs debug +designer doc examples fakevim git
-	mercurial perforce +qml qtscript rss subversion"
-QTVER="4.7.1:4"
-DEPEND="app-arch/unzip
-	>=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}
-	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 designer 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"
-			# Make sure that qt4project manager does NOT depend
-			# on designer
-			elif [[ ${plugin} == "designer" ]];then
-				plugin="designer"
-				sed -i -e "/designer/d" \
-					src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri \
-					|| die "failed to disable qml plugin"
-			fi
-			# Now disable the plugins
-			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
-				|| die "Failed to disable ${plugin} plugin"
-			# qml needs special treatment
-			if [[ ${plugin} == "qml" ]]; then
-				# remove qml support from debugger and qt4project manager
-				sed -i -e "/^include(qml\/qml.pri)/d" \
-						src/plugins/debugger/debugger.pro \
-					-e "/qmljseditor/d" \
-						src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
-					# drop all the qml plugins
-					for x in qmlprojectmanager qmljsinspector qmljseditor qmldesigner; do
-						sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
-							|| die "Failed to disable ${x} plugin"
-					done
-			fi
-		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 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
-}
diff --git a/dev-util/qt-creator/qt-creator-2.4.1.ebuild b/dev-util/qt-creator/qt-creator-2.4.1.ebuild
deleted file mode 100644
index 0d14ce2fb77b..000000000000
--- a/dev-util/qt-creator/qt-creator-2.4.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.1.ebuild,v 1.6 2012/05/03 14:29:46 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[@]%:*}"
-
-QT_PV="4.7.4:4"
-
-CDEPEND="
-	>=x11-libs/qt-assistant-${QT_PV}[doc?]
-	>=x11-libs/qt-core-${QT_PV}[private-headers(+)]
-	>=x11-libs/qt-declarative-${QT_PV}[private-headers(+)]
-	>=x11-libs/qt-gui-${QT_PV}[private-headers(+)]
-	>=x11-libs/qt-script-${QT_PV}[private-headers(+)]
-	>=x11-libs/qt-sql-${QT_PV}
-	>=x11-libs/qt-svg-${QT_PV}
-	debug? ( >=x11-libs/qt-test-${QT_PV} )
-	!botan-bundled? ( =dev-libs/botan-1.8* )
-"
-DEPEND="${CDEPEND}
-	!botan-bundled? ( virtual/pkgconfig )
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[python]
-	examples? ( >=x11-libs/qt-demo-${QT_PV} )
-"
-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
-		echo
-		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"
-		echo
-	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="${ED}usr" install
-
-	# Install documentation
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	# Install icon & desktop file
-	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png
-	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE'
-
-	# Remove unneeded translations
-	local lang
-	for lang in ${LANGS}; do
-		if ! has ${lang} ${LINGUAS}; then
-			rm "${ED}"usr/share/qtcreator/translations/qtcreator_${lang}.qm \
-				|| eqawarn "Failed to remove ${lang} translation"
-		fi
-	done
-}