Revert "dev-util/qt-creator: Bump to 2.7.0"

This reverts commit c3066e3d3e2796a65f1df148db6f8b44b161bce4.

In tree and improved.

3 files changed, 1 insertions, 134 deletions

diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
deleted file mode 100644
index 2e175851..00000000
--- a/dev-util/qt-creator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-creator-2.7.0-beta-src.tar.gz 21630612 SHA256 e7db17e14fd181b563b6779c23895e9d5b2ecdade785bc803bd6b8e7386e7768 SHA512 ea1b72a2d5bd1e68a05b693ca0dcae20154e7691d51b0e7299c071e42031db87966cc777cd151cd070ea3b10734a06ed6e0c8dcf311d44dfd08fc6333861a4c5 WHIRLPOOL 9b88e16872e6336f586966d8695238d9549567dd235a89fb802da3a77515c811bd2d8cab14fed2fe1b620a9735b18a7b5093101ecae492554337b0678b1378f3
diff --git a/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
deleted file mode 100644
index e97a856e..00000000
--- a/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PLOCALES="cs de fr hu ja pl ru sl zh_CN"
-
-inherit eutils flag-o-matic l10n multilib qt4-r2
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
-LICENSE="LGPL-2.1"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
-		https://git.gitorious.org/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}-src
-	SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
-	clearcase cmake:cmakeprojectmanager cvs fakevim git
-	madde mercurial perforce qnx subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.0:4"
-
-CDEPEND="
-	>=x11-libs/qt-assistant-${QT_PV}[doc?]
-	>=x11-libs/qt-core-${QT_PV}[ssl]
-	>=x11-libs/qt-declarative-${QT_PV}
-	>=x11-libs/qt-gui-${QT_PV}
-	>=x11-libs/qt-script-${QT_PV}
-	>=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.10.2 )
-"
-DEPEND="${CDEPEND}
-	!botan-bundled? ( virtual/pkgconfig )
-"
-RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[python]
-	examples? ( >=x11-libs/qt-demo-${QT_PV} )
-"
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	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 )
-"
-
-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
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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=yes
-}
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-2.*,known-issues}
-
-	# 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 desktop file
-	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE'
-}
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index e97a856e..38d864be 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -16,16 +16,15 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
 		https://git.gitorious.org/${PN}/${PN}.git"
-	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}-src
 	SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
 SLOT="0"
+KEYWORDS=""
 
 QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
 	clearcase cmake:cmakeprojectmanager cvs fakevim git