5 files changed, 6 insertions, 208 deletions
diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index 852ba14bcb0d..fb25f5c40204 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.18 2011/03/05 07:36:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.19 2011/04/13 21:04:54 wired Exp $
+
+  13 Apr 2011; Alex Alexander <wired@gentoo.org> -qt-declarative-4.7.0.ebuild,
+  -qt-declarative-4.7.1.ebuild, -qt-declarative-4.7.1-r1.ebuild,
+  -qt-declarative-4.7.1-r2.ebuild:
+  old version cleanup
 
   05 Mar 2011; Jonathan Callen <abcd@gentoo.org>
   qt-declarative-4.7.1-r2.ebuild, qt-declarative-4.7.2.ebuild:
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
deleted file mode 100644
index f7baef69efc0..000000000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v 1.8 2010/11/06 19:35:06 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="private-headers qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-multimedia-${PV}[aqua=]
-	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=]
-	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-svg-${PV}[aqua=]
-	~x11-libs/qt-webkit-${PV}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QCONFIG_ADD="declarative"
-
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		tools/qml"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -declarative $(qt_use qt3support)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
-		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-	fi
-}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.1-r1.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.1-r1.ebuild
deleted file mode 100644
index 1577a2c02057..000000000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.1-r1.ebuild,v 1.1 2010/11/22 22:25:20 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="private-headers qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=]
-	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-svg-${PV}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QCONFIG_ADD="declarative"
-
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		src/imports
-		tools/qml"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -declarative $(qt_use qt3support)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
-		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-	fi
-}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.1-r2.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.1-r2.ebuild
deleted file mode 100644
index 3c4d0d8ab665..000000000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.1-r2.ebuild,v 1.3 2011/03/05 07:36:37 abcd Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="private-headers qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=]
-	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-svg-${PV}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QCONFIG_ADD="declarative"
-
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		src/imports
-		tools/designer/src/plugins/qdeclarativeview
-		tools/qml"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -declarative $(qt_use qt3support)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-	if use private-headers; then
-		if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
-			insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
-			# ran for the 2nd time, need it for the updated headers
-			fix_includes
-		else
-			insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
-		fi
-		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-	fi
-}
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild
deleted file mode 100644
index 973746e8c4a8..000000000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.1.ebuild,v 1.2 2010/11/16 23:20:29 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="private-headers qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=]
-	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
-	~x11-libs/qt-svg-${PV}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QCONFIG_ADD="declarative"
-
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		tools/qml"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -declarative $(qt_use qt3support)"
-	qt4-build_src_configure
-}
-
-src_install() {
-	qt4-build_src_install
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
-		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-	fi
-}