old cleanup

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

5 files changed, 19 insertions, 506 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 6f8951a685a3..314ea60e0e5a 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.133 2010/12/05 21:46:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.134 2010/12/05 22:10:16 wired Exp $
+
+  05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-gui-4.6.3-r1.ebuild,
+  -qt-gui-4.7.0.ebuild, -qt-gui-4.7.1.ebuild:
+  old cleanup
 
   05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-gui-4.5.3-r2.ebuild,
   -files/qt-4.5.3-glib-event-loop.patch, -files/qt-4.5.3-libpng14.patch:
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 2c784513cb87..016584134cf1 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -9,29 +9,26 @@ DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c0
 DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
 EBUILD qt-gui-4.6.2-r1.ebuild 5406 RMD160 2d1fffa346058e96ad5bb286f7da1fbb590c0c5a SHA1 d0ab4fe67490e083980dafdfe0f87b834bd00a6c SHA256 9b74117d6ae32f657902eb6a60a6e38fa2117c52b0f02a498257817ec9dafc41
 EBUILD qt-gui-4.6.2.ebuild 5296 RMD160 ab8bb6867607ff4cb26ab80a6c19fee98a3c153a SHA1 38dce089ecf480391beda7679f7584c95f5afb6d SHA256 ff77bcbeeaee3214b8cf66215caeede0b478f53bc3211ca3c246a6c968540286
-EBUILD qt-gui-4.6.3-r1.ebuild 5331 RMD160 23c227e49df64206b2a2056edc927c8367d4943a SHA1 15f70f48396932e6ebbf3163bb8f8c5b4b9c88af SHA256 73c0d3715538932b7c7aa95d3480eac0c17c7304bc15802fd0032e235c26ede2
 EBUILD qt-gui-4.6.3-r2.ebuild 5459 RMD160 6541881d8db2078be86318b1a4e91828f3893e78 SHA1 3913796098062a95abdd22dd3e4250260a46cfb1 SHA256 56614553e86dd21c156ff445f48c8308e86793547765323d6bac2dd9eaece462
 EBUILD qt-gui-4.6.3.ebuild 5451 RMD160 74a039cc4e9290775740a88c3eea69bd9c1ea275 SHA1 d4e547b40287adea06e01645e3214434fbf0e864 SHA256 fa4830f1a60a318e320e532495ba57e5a9c9e6b66e9646af915c21a6dba73873
 EBUILD qt-gui-4.7.0-r1.ebuild 5755 RMD160 e80835b6a9822839d7833a805f2043a5fe99fdfe SHA1 43ba02a86a0d89b58ba9a6df6b4ebcd3f0e0ea90 SHA256 8bec24382a8eff8efca575446b44c0cbf901ce86812525d46dda382de1498e5c
-EBUILD qt-gui-4.7.0.ebuild 5638 RMD160 c85c46fb886f5d99d00ef4fed9c3313e7f598c0c SHA1 d4aa761e03094877e67d0c5210cc24dd27b2a563 SHA256 97d5c633c762d10cce97f34888eb54cb9656c815fd8dad52940c5d8f65dd1f6a
 EBUILD qt-gui-4.7.1-r1.ebuild 5594 RMD160 79eb21af79e2ebe8367905b9252d6275fea6c993 SHA1 f579ee62886147bb7b40a6b3a39146a3714142cc SHA256 383f06c9391a3ea0efdea2668286bbc6931a82b8ab464f1f18d894b71befd56d
-EBUILD qt-gui-4.7.1.ebuild 5636 RMD160 75cffc665d9c6d4398a3d29270b3ce1c46d3f8e5 SHA1 0a7f51f849f0f2ec0642722d913c93f903ffb5bf SHA256 c06915e80c7dba48c7c6db2f91a446addb78042e86b9ddedd4c691083431b4ed
-MISC ChangeLog 20284 RMD160 3d3b01304adca1fe5a1ba4cbc2b363fe0860f5a9 SHA1 8551c1def41402af39f47f199543ec5d2e509cfc SHA256 0f9753e19235d4179ce86a93e33ab63c6d776f8a85cbfeab51638486e696d9a0
+MISC ChangeLog 20419 RMD160 2c4ea971946e3775cbf8d674c778ccd96beb2582 SHA1 5f432dd3d255be8e8b583d3b71e032c03ab260f7 SHA256 1a89a4f4e13f817d2587907e54839ab2aa30335e53cbfb2962e646c163840210
 MISC metadata.xml 1084 RMD160 bc1dd67f584f23b4dd4e5529f38b5f20921076f9 SHA1 c80b810f2a6aac61175e55274f9791439b48a1b4 SHA256 d96e2b40aa3339e1366105deb89479864167e3ce72f94d0aa907a07861abad4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM/AiQAAoJEDZF8K7rm0r6D9cQAJyVtcZl5LL5F0tSpo5j6yIq
-npmG0kcKN5U7m2nO9NAMCgjxjUZUMQ3C95/NGuxDXfmqo9TLaJvc3KN7yYRPiCKW
-JEYUfa6UNzm5QwJzk5bj+wE0Mk2zBrFAFeONlMrHydeCda5o4zgbPjFwE+sHaoDO
-d81HEz9lry4IJcra9nDrKNMMieuK3OukUI8vuv1lZ2V5MgYCj6mfZrzVAUtns6VO
-6wejOJLXxUXa91/JecxZzbLvh6cXQtvXFujTIZjVSXvHuETe591ZSlj6JvKsaSMW
-1tZ5QFAL80c+/yZzr257alpbSVLZxDgBf2dZb/6NueWlpwiK/rHDjryFeDeQG0DL
-BZLqRCqicd6bFOlbsPa5ZhOvQwuO7DvhUV7L8JIXqqhbvBZfGnJfYHZVtiXXNfqq
-GSOMpVfgajM6daPFa/HWmXkD0JMxwpkrOojVsmtQ2Ice05nZ+1unYKK6XP9ahEj1
-44U0Y2rxMMyuiQwFOSHj6rXei0ONOj332e2xx8Qw7OoFiaXfRe2zG1o/i553//Vl
-6VojtS+6q7dFLdmYq16xHOf99Tcaejx6nq4B6OmJ6nNfzYge1x4Zi/lv+piZXuO9
-07qKFipzNEe2thGkRtPbj3RYPrYTwtjOnPqoh+ofgdc9RR0yRuYVnSIfhHlIU8E8
-x1Pdlwrpk7Q4sYswWZsm
-=tvQI
+iQIcBAEBCAAGBQJM/A4bAAoJEDZF8K7rm0r6J/sP/17fD7pfGmh8Wzd6I+L00zwQ
+sMqQc86TQ4s5Tmh2+kE4bkHexvBsIalYvuqaqxfUxDMoDzcuUDOUqS5jIkfAQlav
+v12XvQq2eRiI2IM3vccPA+CT8cKrksmf3maTuBkc5l/qqP5rbAZEBaz4efSCLyQr
+041njYwQMNMK6a8pFQ4RnmJpLB5HGbuj0ULh9b2iN3ArJiAOBDH2KFO7pwx50xRg
+c0U/2hFEeR5SySWFAjIz8oSPB6resBiNXRNmM3HosgiWvciJVXhfDCF9rQPl0glF
+5lNyxQfxePRgFVhMLjSZmqAhkgJojjmw4Nhqg5Y+qj37juvp7rBhF1BuYh71sRGB
+2IO2Lbmg25FFshYDNW27PfPpkUvrq/GnNDkZ9Sy7aJoEAnEnT2GMr4Vlx+8/cMyn
+9Ue59UIMvb3XlVvx73xN5IsGq7onLNpN24SmtWL+sNuGX8RNJafmhFmfWi6+s7QH
+3RPh9sR994Spyl/FHN/ND5r2BO3I5FTfggOz1Swx5PkwDduMgFtqyGXN2UEpbivd
+g0sSGGIwTpg5fTqgvtv5BZ7Ly0CU+Q2j4QVEZ+Mpv4U73aBAZk/5W77UwXuci1cy
+fJ/xwdVdr0kQRNI7YmtdlnyZfTMUHh+ABJq79URgJxPMKGSOesLEyr3/Re2COkTE
+9n5ZAflw9LJjOH0yKGvA
+=zfUe
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild
deleted file mode 100644
index c88b25672309..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,156 +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-gui/qt-gui-4.6.3-r1.ebuild,v 1.4 2010/11/10 21:28:14 hwoarang Exp $
-
-EAPI="2"
-inherit confutils eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus +glib mng nas nis raster tiff trace qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
-	>=media-libs/libpng-1.4
-	sys-libs/zlib
-	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,debug=]
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXfont
-		x11-libs/libSM
-		x11-libs/libXi
-	)
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/inputproto
-	)
-	xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-pkg_setup() {
-	echo
-	elog "Qt's GTK style was moved to x11-themes/qgtkstyle to fix bug #336801"
-	echo
-
-	if ! use qt3support; then
-		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
-	fi
-
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		tools/designer
-		tools/linguist/linguist
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools/linguist/phrasebooks
-		tools/linguist/shared
-		tools/shared"
-
-	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
-	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use dbus qdbus)
-		$(qt_use qt3support)
-		$(qt_use xinerama)"
-
-	use nas	&& myconf="${myconf} -system-nas-sound"
-	use raster && myconf="${myconf} -graphicssystem raster"
-
-	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-xrender -xrandr -xkb -xshape -sm -no-svg -no-gtkstyle"
-
-	# Explicitly don't compile these packages.
-	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
-	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
-		gif png system-png system-jpeg
-		$(use mng && echo system-mng)
-		$(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
-			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
-	qt4-build_src_install
-
-	# qt-creator
-	# some qt-creator headers are located
-	# under /usr/include/qt4/QtDesigner/private.
-	# those headers are just includes of the headers
-	# which are located under tools/designer/src/lib/*
-	# So instead of installing both, we create the private folder
-	# and drop tools/designer/src/lib/* headers in it.
-	dodir /usr/include/qt4/QtDesigner/private/
-	insinto /usr/include/qt4/QtDesigner/private/
-	doins "${S}"/tools/designer/src/lib/shared/*
-	doins "${S}"/tools/designer/src/lib/sdk/*
-
-	# install correct designer and linguist icons, bug 241208
-	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
-		tools/designer/src/designer/images/designer.png \
-		|| die "doicon failed"
-	# Note: absolute image path required here!
-	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
-			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "linguist make_desktop_entry failed"
-	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
-			"${EPREFIX}"/usr/share/pixmaps/designer.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "designer make_desktop_entry failed"
-}
diff --git a/x11-libs/qt-gui/qt-gui-4.7.0.ebuild b/x11-libs/qt-gui/qt-gui-4.7.0.ebuild
deleted file mode 100644
index e0976afe442e..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.7.0.ebuild
+++ /dev/null
@@ -1,166 +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-gui/qt-gui-4.7.0.ebuild,v 1.7 2010/11/07 19:31:49 anarchy Exp $
-
-EAPI="3"
-inherit confutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,debug=]
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXfont
-		x11-libs/libSM
-		x11-libs/libXi
-	)
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-	gtk? ( x11-libs/gtk+:2[aqua=] )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/inputproto
-	)
-	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
-	xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-pkg_setup() {
-	if ! use qt3support; then
-		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
-	fi
-
-	confutils_use_depend_all gtk glib
-
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		tools/designer
-		tools/linguist/linguist
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools/linguist/phrasebooks
-		tools/linguist/shared
-		tools/shared"
-
-	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
-	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use dbus qdbus)
-		$(qt_use dbus)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtk gtkstyle)
-		$(qt_use xinerama)"
-
-	use nas	&& myconf="${myconf} -system-nas-sound"
-	use raster && myconf="${myconf} -graphicssystem raster"
-
-	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
-		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
-		-no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
-		gif png system-png system-jpeg
-		$(use mng && echo system-mng)
-		$(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
-			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
-	qt4-build_src_install
-
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
-	# qt-creator
-	# some qt-creator headers are located
-	# under /usr/include/qt4/QtDesigner/private.
-	# those headers are just includes of the headers
-	# which are located under tools/designer/src/lib/*
-	# So instead of installing both, we create the private folder
-	# and drop tools/designer/src/lib/* headers in it.
-	dodir /usr/include/qt4/QtDesigner/private/ || die
-	insinto /usr/include/qt4/QtDesigner/private/
-	doins "${S}"/tools/designer/src/lib/shared/* || die
-	doins "${S}"/tools/designer/src/lib/sdk/* || die
-	#install private headers
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
-		find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
-	fi
-
-	# install correct designer and linguist icons, bug 241208
-	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
-		tools/designer/src/designer/images/designer.png \
-		|| die "doicon failed"
-	# Note: absolute image path required here!
-	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
-			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "linguist make_desktop_entry failed"
-	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
-			"${EPREFIX}"/usr/share/pixmaps/designer.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "designer make_desktop_entry failed"
-}
diff --git a/x11-libs/qt-gui/qt-gui-4.7.1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.1.ebuild
deleted file mode 100644
index e80b28f953df..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.7.1.ebuild
+++ /dev/null
@@ -1,166 +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-gui/qt-gui-4.7.1.ebuild,v 1.1 2010/11/09 15:47:19 wired Exp $
-
-EAPI="3"
-inherit confutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,debug=]
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXfont
-		x11-libs/libSM
-		x11-libs/libXi
-	)
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
-	gtk? ( x11-libs/gtk+:2[aqua=] )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/inputproto
-	)
-	gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
-	xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
-
-pkg_setup() {
-	if ! use qt3support; then
-		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
-	fi
-
-	confutils_use_depend_all gtk glib
-
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		tools/designer
-		tools/linguist/linguist
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools/linguist/phrasebooks
-		tools/linguist/shared
-		tools/shared"
-
-	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
-	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_configure() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use dbus qdbus)
-		$(qt_use dbus)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtk gtkstyle)
-		$(qt_use xinerama)"
-
-	use nas	&& myconf="${myconf} -system-nas-sound"
-	use raster && myconf="${myconf} -graphicssystem raster"
-
-	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
-		-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit
-		-no-phonon -no-opengl"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas)
-		gif png system-png system-jpeg
-		$(use mng && echo system-mng)
-		$(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
-			$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-
-	qt4-build_src_install
-
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
-	# qt-creator
-	# some qt-creator headers are located
-	# under /usr/include/qt4/QtDesigner/private.
-	# those headers are just includes of the headers
-	# which are located under tools/designer/src/lib/*
-	# So instead of installing both, we create the private folder
-	# and drop tools/designer/src/lib/* headers in it.
-	dodir /usr/include/qt4/QtDesigner/private/ || die
-	insinto /usr/include/qt4/QtDesigner/private/
-	doins "${S}"/tools/designer/src/lib/shared/* || die
-	doins "${S}"/tools/designer/src/lib/sdk/* || die
-	#install private headers
-	if use private-headers; then
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
-		find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
-	fi
-
-	# install correct designer and linguist icons, bug 241208
-	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
-		tools/designer/src/designer/images/designer.png \
-		|| die "doicon failed"
-	# Note: absolute image path required here!
-	make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \
-			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "linguist make_desktop_entry failed"
-	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
-			"${EPREFIX}"/usr/share/pixmaps/designer.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "designer make_desktop_entry failed"
-}