Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 20 insertions, 232 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 0bb7653b1360..fb0432fab5fb 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.73 2015/03/30 10:02:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.74 2015/03/30 14:02:29 kensington Exp $
+
+  30 Mar 2015; Michael Palimaka <kensington@gentoo.org> -qtgui-4.8.5-r3.ebuild:
+  Remove old.
 
   30 Mar 2015; Agostino Sarubbo <ago@gentoo.org> qtgui-4.8.5-r4.ebuild:
   Stable for alpha, wrt bug #541972
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 73b58bfccae6..4af08a3c52c4 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -14,26 +14,26 @@ DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
-EBUILD qtgui-4.8.5-r3.ebuild 6304 SHA256 9e38cadd5922673b139ab7a3730e5bbdcf56026cebecba937773820556ce25d2 SHA512 314378554a3b45528e2f6d9a0d49e20401e4f3eb8e68731daf376e7dd31697ca509d8553dc019095a1c3baebd098d8bc65d04622bdfd93789ffb4b8f97f1db43 WHIRLPOOL 82464370aee87e9cb306d378c58f2249f1dc3244b3badeee9ffac1d660c4249396f9cb0ba96877b4fbb41330d586b3bfd0497b8062c383f73cab3f91c27ce02a
 EBUILD qtgui-4.8.5-r4.ebuild 6393 SHA256 a7270026a4de98cc3b5055d300492566daad440d8763a6b1e17f5eed7dced0fb SHA512 0ce493f859cc7aff8dccf62316433a608e1269ab8f65c61f9b21ba243a46387fb5756b0553936e4f275bec3b0b9e4a125705f017b2695d9cb23fc8f97869b88e WHIRLPOOL 99a58a48e3ee56e84bd492687c87ada8585e4c0ee462c7955fa23acedb4d664532347673f2f38ea4e9ca668e72ec424df6ad648432c76d3fc5cf4445c5412c1a
 EBUILD qtgui-4.8.6-r2.ebuild 6171 SHA256 fa06cdd344874f1dab37ae0df5c0107eddc95dddd514ba1c7ebc083b0273af3d SHA512 1c8dc0d5dd945c0c5815d4f695dc2a326274d4a1d16b2b90f88900edb73e77f3ce07bea82e38f14b4eb49f42a86b51200f4edd7fab749bd34b5de9d80774a8aa WHIRLPOOL c38423d4b3c790747bf56e21cda7d0c8730972c67daf51358159b325c220201428d1ec4059a14e21a4ba15a47f4ac329e5d14e2b0c0a5492cf0314799dd64a28
 EBUILD qtgui-5.4.1-r1.ebuild 3438 SHA256 808969499a1a19c849b30e495ff302b0c99cea08b5109878bc3ee5d56e371fb2 SHA512 19d61fdf25e5cc666d2d153e5dd365e20c8851cb8f42498520af2d9e72377b0ba02783ea5340bf0106e90469a745174ad4def1f4779d5276c2facb32ebff8af4 WHIRLPOOL 8954a8bd034d8d97bac92a63ba5136a2e56decea737a3d28364902aa4282c17baf6b30b5d8a90695862fb4c85dcd0b35bef68a130b63470958c3ce6b19100ae4
-MISC ChangeLog 42701 SHA256 bb61a4dbd4e2470507ef6b19423ad48fe9ea9e4e9ccc8e881afb72b2dfe0b10f SHA512 270d267da4deda76bbe02819004a6bdb297b8beb64b24f582377e2bc3e32a8a3837b79603ff717425e6bf28baad32bfb331371b02d62d3e9928a9d2a020c0ab6 WHIRLPOOL e651751d8c4a0860be3de3882875fbcff50142c43e7f6348ea2d1a58892ab837d440f320bcfc596b004ab81d8f4570c9e7699b937e7f823cccf84a144144bef5
+MISC ChangeLog 42803 SHA256 2c1330a38fddaff9a0279ec623c97afed9a9963a90c52a23bd326edec126fb82 SHA512 f1e9e75feaae0cc20c00e6ce771754cf978a5e90b9db886f6df3db7a6efd6c481e49dd9d705f7cbea5e5850ca27928f0e366fd4264c3e5191d5595a63712dd50 WHIRLPOOL 6ec8db51323edb00127dc95f5ee280d07d9fa0acf3ce64c07096ac72ea49595f0f4f844d4ff115c4dcfff21a4618ab494593dedcfffc5ff1b198afb4b3a4e48f
 MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVGR82AAoJELp701BxlEWfKdgP/A4RDAZuCVkrXd7lBM5j9PYE
-3K6vMIargstC+mu6H7FgkBipZhvtaAIHuyHeMhiphS4P5KLXA7/FE5GfXPufgvWn
-g+xQQQjDJqRARJ6gHgGqqveTLSx31MI39ogrcDUnAcbpzRE3f5C5DnvmSroDCBsQ
-zA7b63NGvc3gX9INrmWZYoXrofpaZSUQYseHjCu4WyWcgTobTViDAxuRrl4PO837
-EpTw5WC7YcKMuu7UZqeGv5aVVMzUW8XIcSCZEuxCAmbXOgWmUT17GRnNT3PfnnPJ
-TgEvbNfrUkBPUUBYworcgJBFAV3hO75ZlhFIcFrvFmmnqn3oT3lDP0O4tfOgH8pY
-lKXyZzZckRaBiU8YQTw6aZfnipopVoCAIIFBSy7fddB++d/U6U1NZAs7GjucLLSt
-xPn4zvRbxMxf4gja85Sc7sDQYHCdkItUTK7qfceMrReQoVw415dHe5l1j+1YjaiX
-diDgp/R6MzAbCzdqb4FOdPWslsdDQliQLC3aoahJpYnBF4/cRJnC5+Zwds8RhG0m
-aygWJ3YSXMBe9HTQVNnDGfwRZ6rdSwA5JVVJqT/oEL2N2qEV+096h+NQsd4FPnZ6
-f7h9PYcqVQBJrkOLRapQXcKj+/oW9brS8UPB/P+uuo0LOuyZKeUKWmZ3Bn3ne17G
-AXe0A+6yvX/L6TVPBrPo
-=kVeQ
+iQJiBAEBCABMBQJVGVd+RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7AkrD/9Ysyp75HC82fGobg1LviwuJkisUDpimUjQa84DrVMdHqrXmRPw7XplrrsQ
+5cAY7nf8xR4bGpYj28SFNbyUP+mgYUVjabfmFka6SeC0tUPzzbGhbvGq/YvBMQtx
+S2oEL0O0/9hYR2Og1sABeiIbSL39Vvi8QDjZONngi8DCOqMYgXJxNckqphxM5e1z
+k4a/KwSOxqlXAY01KVDksNQWKH6q7Uhs/bGnR22GkM1cS0KSjrddnSyNhzqFfOPJ
+8pn/Rznc0romy9CNSRk+3QqQ41U8HmjGZqoE3LqdXQd/lCCNMtJEn5tDulVHJ29b
+QFXRXQcPh3O18puWptP2l4k1bP6VOdhkIytIZVoq0mGDJ8bys/BKsVBApUR2hTbj
+nUsVFoOzPgYU2D2S2/t4RLTNB++sT6nllTq20xA45I+ZWA1YFXns2HbtLtBRmbs2
+0sNcjmVtZoIVRkQUSBcrSmoXGy4X5jcwEkcFkoXTjfAnJOX2sIneeP+UlPSDQDc9
+aUFCVb4z+Fx2WdCEy094b1DQe6TW5B+LmSqy3w4BuAwc6Agen0rLdWnimS3O0nMN
+Hdewt05LO/Xv2zPZ3ZFrZETEjI0U4wyndCQgoY47Bmx7wZZxXvKhqU+GR9UzbxZi
+DSbcqDvH5s1Tj2vtsVqqTVRDm6TXSkotmOtR8xqZleUyGDJMQw==
+=hlbp
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r3.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r3.ebuild
deleted file mode 100644
index 6e5c2ec4ebe2..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.5-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r3.ebuild,v 1.12 2015/03/26 01:55:56 tetromino Exp $
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
-	gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
-	app-admin/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	cups? ( net-print/cups )
-	egl? ( media-libs/mesa[egl] )
-	glib? ( dev-libs/glib:2 )
-	gtkstyle? (
-		x11-libs/cairo[-qt4(-)]
-		x11-libs/gtk+:2[aqua=]
-	)
-	mng? ( >=media-libs/libmng-1.0.9:= )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff:0 )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		xinerama? ( x11-proto/xineramaproto )
-		xv? ( x11-proto/videoproto )
-	)
-"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
-	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
-	"${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
-	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
-	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
-	"${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796
-	"${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182
-	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/imageformats/tga
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		examples/desktop/systray
-		include
-		src"
-
-	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
-	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
-	# mac version does not contain qtconfig?
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-src_configure() {
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nas nas-sound system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)
-		$(qt_use xv xvideo)"
-
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	# bug 367045
-	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
-	qt4-build_src_configure
-
-	if use gtkstyle; then
-		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
-	fi
-
-	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
-	QCONFIG_ADD="
-		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
-		fontconfig system-freetype gif png system-png jpeg system-jpeg
-		$(usev accessibility)
-		$(usev cups)
-		$(use mng && echo system-mng)
-		$(usev nas)
-		$(usev nis)
-		$(use tiff && echo system-tiff)
-		$(usev xinerama)
-		$(use xv && echo xvideo)"
-	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS)
-			$(use egl && echo QT_EGL)
-			QT_FONTCONFIG QT_FREETYPE
-			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS)
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
-			$(use xinerama && echo QT_XINERAMA)
-			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
-			$(use xv && echo QT_XVIDEO)"
-
-	qt4-build_src_install
-
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
-	else
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
-	fi
-	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		# rerun to get links to headers right
-		fix_includes
-	fi
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	newicon tools/qtconfig/images/appicon.png qtconfig.png
-	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-
-	# bug 388551
-	if use gtkstyle; then
-		local tempfile=${T}/${PN}${SLOT}.sh
-		cat <<-EOF > "${tempfile}"
-		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
-		EOF
-		insinto /etc/profile.d
-		doins "${tempfile}"
-	fi
-}
-
-pkg_postinst() {
-	qt4-build_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}