Remove old.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

6 files changed, 20 insertions, 404 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index dda2625ae8a0..71a1dd4734e5 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.105 2012/12/25 09:53:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.106 2012/12/29 13:39:24 kensington Exp $
+
+  29 Dec 2012; Michael Palimaka <kensington@gentoo.org> -qt-demo-4.7.4.ebuild,
+  -qt-demo-4.8.1-r1.ebuild, -qt-demo-4.8.2.ebuild, -qt-demo-4.8.3.ebuild:
+  Remove old.
 
   25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-demo-4.8.4.ebuild:
   Stable for x86, wrt bug #445956
diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest
index 50792f1985d8..b072c9f1fa85 100644
--- a/x11-libs/qt-demo/Manifest
+++ b/x11-libs/qt-demo/Manifest
@@ -1,13 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX qt-demo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
-DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e SHA512 8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c WHIRLPOOL 59cb7e407992665b3685c176906ac661d57844cf64548b878610a5eeea6893a6f3cbb6256b25338a08e03ecb8a79851fb613ba61de4bc896a5317e22f807dfdc
-DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
-DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
-DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-demo-4.7.4.ebuild 1598 SHA256 56680004cbe07118417c08e330e41bf24691b32469b24ff1c7a0ec3c165947df SHA512 9e8636bb1de05b519dcf7eb6dcbcbcbf844c8b96384be1f261e2a73601cdec98d231bba76cdcb2e0756689412b6456d3c0e198235c29814ffb147b02d7325671 WHIRLPOOL fdce97cd689d7e403bd8fab38128817326d71e038396f41c08bb82e343a95223636895986f1a635910d1784da922c5c5b94d450dd3ea484d5784619293e91db3
-EBUILD qt-demo-4.8.1-r1.ebuild 2997 SHA256 af7a4f7d44886cb16a8370e96b8ef35aa24a4a36aa4012ebd0fb2e6c5a1f1ebe SHA512 81106f7d0f84751e3dcfeda53190829c73dadfca90d5e74d4e527f77ee4d3e5a9025b834426aec3db26cbb02c038d0cf8fb1e5630ad244312b52bf884c34c6f2 WHIRLPOOL 376f574f4ecebc88bac186bce9dde20d0fc2e15f79efbcbd1922011b7dcb890806daf514aa48156075cc1c98f1fc2e1ba1e00760abcf71a67025313f9ee5bfb2
-EBUILD qt-demo-4.8.2.ebuild 3054 SHA256 66371f738b2d3a2908dab23aba250e9064d2b598d1b4863ee76b72901d449620 SHA512 754313231a90d62d7932f2a1f1ddc1de4ea385069ac6a9fbe6149dd80859a3b6347c6019d03b8bdcb358ffa4d84fe6e9f9b7a7d1f968885259e04420d8dabd09 WHIRLPOOL 2b414e8e256516f33cf8c5543725b5d2677a097f5416379bc8341e311b41fa681cc440b453fa734d13f95d0a383cf7bfa64098de0478d097453f8b66b13bf02d
-EBUILD qt-demo-4.8.3.ebuild 2876 SHA256 f0dbe127c8c0d759626b4a367b5c9fa380969dbbb530e0e7e2c5ccebef580fbe SHA512 e97a149d3f375b3489ba0c4eaa30da1c49895f599c61851e58c5039ced0aa7a29fd0ec5a6763c40be99795bfc452437419caeeea1958fa919d17f221d56ecd5c WHIRLPOOL 8414ae500bfba9293bea904b20c69f63cd576f9227fbfb280bcebec1cb0ad50f8dff6309c8d3a1dc01d2d66dd152aefc1d50a42b4ae6997cf0d96b687dce3980
 EBUILD qt-demo-4.8.4.ebuild 2869 SHA256 0f84dd82096aa4a21f57b0b389a652537a9392691edf4f5f57ab431ca335e653 SHA512 be548f48d36c621096229a1b6b2d7b09c5035792e060195e4462e11b65132032287a6af91a7f87de369525ab748da8dccb0694b9d03c228d0ec8fb0f6a9a7b1c WHIRLPOOL a4267cfa8baa895564a5048be641d6efba5942f02d99149ca136377166b5a5849682fde8501904f5a6f220420478d70731855c1d66a3400e3a9674dedafa3da1
-MISC ChangeLog 12843 SHA256 111491a8a46b1db835625df9aa9b53e584d026977beca495881c104c3962c0b7 SHA512 958c4c514fcf1161656aef523423d6c1301e5ae0ca71571f6e9e01b2a1d38839e6ba880c0e179cc60bc929887c0d4c6c464a0c3b135521debf85fb523db45348 WHIRLPOOL 93c7d3e297228d634e70dee00dea058880f4aa2ff6db53c418bf325b94e5022fe1f9ade6382c05fa84017796d1911da4d96d94233e349b206a17856b6400295d
+MISC ChangeLog 13018 SHA256 1ded9a4066781e35484b24ac95ec416a3d0ae46b950293582e779f58b78ed0ef SHA512 f6b019db1e7ccb36e53dcc2ca9d3fa0ea780426eea76207c7247dc2ac30d6cd411c09f4bd2d46b5768ed58a12d45a060f53e519f32b10bea6be3f9bad97e93bc WHIRLPOOL 649c07e786704e49b37003c1025e55dfa2394f8822484270464f053942ff352697ec8afe05c4251051f5f926c304bc3c056fb1b58353c0f233cb77c84ec390e6
 MISC metadata.xml 1096 SHA256 c22277ad969b6845176b10b092e40ddf2ac2bc70975dccb98c38e6c78171501f SHA512 6b7f01d3050671e3d0da77524b62689bc5d793ed8e6dfee5284a1e4b266f634dd28b2a8471f5cd8c4dcfa34d11aa93fa91d91efe2333217e161b625e8a897c0e WHIRLPOOL defefdd7ae093fb877d23a5d36cc8899bc402e46c08ea149ade0c98e1e54bda703da341298fe43aa061d19b375969683addfc43beeccc712c8991521a0fd5df7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ3vHRAAoJEMbwO6tnXQ0sy8oIAKq0VZDAc2e4/wCHLwTPkqTR
+nxSgrFDV94QGlkf9c+6UBW1o1j/aldV4RdelS70GAefkP1lXl+tGAANCveke8kwP
+TOB1xra+3QlqYkRSdSRrdhGhKg7xLfqhjNFXh0oJY6KbsWtKeynNscAXSq1m/mfG
++qgIntT1yePjOHpCCzWCwZDYJ59vJ8V6/Rlx1BcZg2B3dGzAivlrjSeJm8iTUn81
+zrGSajBRFJdZjXF7fE9JMAUknfuDCqj+VwF077FiuE2ZKPTzpU/uWuBRR8eK0mRN
+3eojtv28MxkyCRJAFFsIohnyi6p6YGzhOr9kn6Jdk6ApX/s0c1Cgc7pSXRemDlQ=
+=P/10
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-demo/qt-demo-4.7.4.ebuild b/x11-libs/qt-demo/qt-demo-4.7.4.ebuild
deleted file mode 100644
index dfbfe4ad8273..000000000000
--- a/x11-libs/qt-demo/qt-demo-4.7.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.4.ebuild,v 1.5 2012/01/29 23:26:38 josejx Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="kde qt3support"
-
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-core-${PV}:${SLOT}[aqua=,qt3support=]
-	~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,webkit]
-	~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,qt3support=]
-	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
-		media-libs/phonon[aqua=] ) )
-	kde? ( media-libs/phonon[aqua=] )
-	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
-	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-test-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=]
-	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src/
-		include/
-		tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use qt3support) -no-openvg"
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r "${S}"/doc/src/images || die "Installing images failed."
-
-	qt4-build_src_install
-}
diff --git a/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild b/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
deleted file mode 100644
index 8ca85809875a..000000000000
--- a/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild,v 1.7 2012/06/18 21:47:07 pesa Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x64-macos"
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
-
-DEPEND="
-	~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-		media-libs/phonon[aqua=]
-	) )
-	multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
-	openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=,qpa=] )
-	xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'openvg'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	if ! use qt3support; then
-		einfo "Disabling qt3support examples"
-		sed -i -e '/QT_CONFIG, qt3support/d' \
-			examples/graphicsview/graphicsview.pro || die
-	fi
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia)
-		$(qt_use opengl)
-		$(qt_use openvg)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r doc/src/images
-
-	qt4-build_src_install
-}
diff --git a/x11-libs/qt-demo/qt-demo-4.8.2.ebuild b/x11-libs/qt-demo/qt-demo-4.8.2.ebuild
deleted file mode 100644
index 562529441a7b..000000000000
--- a/x11-libs/qt-demo/qt-demo-4.8.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.2.ebuild,v 1.5 2012/07/15 10:51:57 ago Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
-
-DEPEND="
-	~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
-	~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-		media-libs/phonon[aqua=]
-	) )
-	multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
-	openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-	webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=,qpa=] )
-	xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'openvg'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	if ! use qt3support; then
-		einfo "Disabling qt3support examples"
-		sed -i -e '/QT_CONFIG, qt3support/d' \
-			examples/graphicsview/graphicsview.pro || die
-	fi
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia)
-		$(qt_use opengl)
-		$(qt_use openvg)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r doc/src/images
-
-	qt4-build_src_install
-}
diff --git a/x11-libs/qt-demo/qt-demo-4.8.3.ebuild b/x11-libs/qt-demo/qt-demo-4.8.3.ebuild
deleted file mode 100644
index bff9ccb8216a..000000000000
--- a/x11-libs/qt-demo/qt-demo-4.8.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.3.ebuild,v 1.2 2012/09/16 04:26:31 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
-
-DEPEND="
-	~x11-libs/qt-assistant-${PV}:4[aqua=,debug=]
-	~x11-libs/qt-core-${PV}:4[aqua=,debug=,qt3support?]
-	~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qt3support?]
-	~x11-libs/qt-script-${PV}:4[aqua=,debug=]
-	~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qt3support?]
-	~x11-libs/qt-svg-${PV}:4[aqua=,debug=]
-	~x11-libs/qt-test-${PV}:4[aqua=,debug=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=] )
-	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,webkit?] )
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~x11-libs/qt-phonon-${PV}:4[aqua=,debug=]
-		media-libs/phonon[aqua=]
-	) )
-	multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=] )
-	opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qt3support?] )
-	openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qt3support?] )
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=] )
-	webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=] )
-	xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'openvg'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	if ! use qt3support; then
-		einfo "Disabling qt3support examples"
-		sed -i -e '/QT_CONFIG, qt3support/d' \
-			examples/graphicsview/graphicsview.pro || die
-	fi
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia)
-		$(qt_use opengl)
-		$(qt_use openvg)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r doc/src/images
-
-	qt4-build_src_install
-}