Remove useless and vulnerable revision.

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

3 files changed, 21 insertions, 193 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 81b12991c088..4af4648c8e1d 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.79 2015/05/07 08:31:30 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.80 2015/05/07 10:59:31 pesa Exp $
+
+  07 May 2015; Davide Pesavento <pesa@gentoo.org> -qtgui-4.8.6-r3.ebuild:
+  Remove useless and vulnerable revision.
 
 *qtgui-4.8.6-r4 (07 May 2015)
 
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index efd5f164fd7f..7104ed867ca4 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -17,27 +17,26 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0
 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-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256
-EBUILD qtgui-4.8.6-r3.ebuild 6177 SHA256 4eb7ebbedd5084e19f273bdad71cc0623c9d495a3f2ca4650bd4d8d451ebd6a1 SHA512 f45f82a7f2be8c257e944c30759b5a790dfc7e462b952fed8759c81fb340baf8f16859c5a66d3b0ef0c9233c25ed7a8c6f56e080a5f352aab090512252c9d42b WHIRLPOOL 492370ad94ebb7a82f2447f6c317740dc96332385a8acea4a23509edc0e1ca072a07adea583586234f21341bc392be00d58efe2a98ce510c89463d51ece3c1be
 EBUILD qtgui-4.8.6-r4.ebuild 6325 SHA256 fc07622f4a7833ea02e6cefaed2c35a8672da81e7435ef834c194729f0542176 SHA512 00b1e191925a386d153b6a96d17d7bf1b0b3976f8b48704d239f64e14fa9ab7848a56003864deaca5d434edc533910b5b7d16e888bf238b791be6ec484fd3816 WHIRLPOOL f929bfeb91cabd255618982f14d869c1044cce2ba5d1e07c7c72fc421d9926a3f0a414fd763dfbe787c534390a0e08d4236c4eb812aa6f32a7bb5c1896909a21
 EBUILD qtgui-5.4.1-r1.ebuild 3665 SHA256 98b16fdaffd8220389489117d00ff6bcac165a1aecac294b9dd99fd8fed4f4d3 SHA512 831191d651ca2c0c77dab92d83ae89738edbf066a382dd9e1548c92f3040d038eb6395c6fa0f0a133a51e1396212e882f5321418da2729c0a8fa7dea0c1d54d6 WHIRLPOOL ed5be31a585a9ead5d512a00784314dac334b0727be9a427ada2f92d49797073c7f8ec3eae9b597012a395b0fe9a586ddeb6927bf8f2c1fd320096f2e311f14f
-MISC ChangeLog 43732 SHA256 60deb4435aedcd53127c6db8674dc4621149310b11b2e29b58622e488521d083 SHA512 7bbf653504843ba984d02177f2e4461e13a0ae59d5f9a3ab2fbf7e874fbe3782f209c292c45898f409014708c67c1886f6679d34c06b68160c54f3601f79fee1 WHIRLPOOL 1017c9f36be03cd156ad6ca4fdaab1413a602bd45860e48817c16cd07dc53b2add275adb5817911901a315ad22eecda83084b909e228002a9f8118a899fdf274
+MISC ChangeLog 43847 SHA256 5301a29ca1d24ee3ce0c17d1f4b6eb7f80104d6236b4603d8035100bd786abc7 SHA512 3ac5979d10caa802c8e69eb2495d268296d1a10115fd08dbfe7b8e1475559e844374d0f7e25b8ae12a6ed3ef8e7a4aebd7540fdd44ca53e654043b431017a6ff WHIRLPOOL ec59b7f6bca623a6729f5dde4968888dc6040f44ccfb63e15793bd56d89e8b2df401aa04d1819f73235308dec90a8d3de38476c5afd635f4099e3a31d1d667f8
 MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVSyLmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFObOkP+wQQMEcsU16AO1e75xslw/9R
-W3ygp0CHWge/nJ3l01DkR4Ke8PyDueQ3EkAYjeP/OZjZODDjfyb0odnhQNQYMIhJ
-dScXhgg9rwVHuHewt/miUGk6b/Jc5rFOLztW0g6rZiSeb/j/qCf8UDzMiwpVowLg
-6fEj29YfBLt+E48V6PXVd2FejWbWucwnKHda1f79Fh28BSv7NM0qSBBT8BAz1uw9
-CnaNMCf5wp9aTghrKo3uBncL8amz6NncY/3pjS1tBqTEr6Z3nTdZMyo+qj1HZdor
-fDCvCeFJSjRh5QB3fuQrTBjx3ht+ASBHm3lt1gJz8ltHXcxxCRV76DTLtZi+DCj3
-/KQeScwAbwT2MKcMCdHE+vrr/bwDBKVw0jFfQtBv6Nx67Y5V+YJuvStrGo93qeKX
-A3iyR5QJSeWe6GluuaHi31jDqt0VJCucUHrHrLpgnPPosAbMKwKdOsVhH8+ANg13
-c1mAuzi/duxKtKKGo/I+FZkYWWGKlj7paxqt9DPIg/uEOQk1kUccdtML7SRmT1MG
-tZDor6hg0cfRuRe6OBaYmqpkEqG/zUm6z+lgE/tuSKCV1NBAbjtJFVfGM13fcyXx
-9DsxM8c40sQkqEdgdOArwUiNrKtIs6KTIEepifs+c433ccJKGOqy/9vb8SeWHmfr
-3WO783XNWE6UJEvxuinP
-=bqmE
+iQJ8BAEBCABmBQJVS0WbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Kh4P/ihsezRfc2tML2CjqSmqhK9z
+5rNUGHRzAPP2Dv9zt+xUlniQhGdmpbrNt4LC0DQFLmXmHkz31dzjbXYmSVLiZLrN
+tMThisoclMu59SSxTdyr/8ez5PY7g9audhfGule6a74eJr/njItyJNXZpumos7lo
+CdAJF40bOYIZbPKkIqnzAcBd0nc+3DN1E1YWf0/7m2ViQ56oe5vn3wfGDlVnrELR
+ymjIWaKp4x+l8GuB69C7kJp4PJeauBvBiqTNQFvPUjFpLpVvIfu9QafNFEbWqiYx
++Iampe/7BILtY4ucdLwXtuvRG63bPH1VhgA70vxjjM7RD+5/9dG+Gkc9Mkpb8gPw
+g9bl0YCw3z4hbIobojjj8Rxyj9M5w4ZbT04ER5R6k7sp/AJVGbi/j2STnWoQHacH
+/mG6obZR3NT3gpudz13uQ+QojS7AdZ6Zu1hqgRFjCvV9ez9hNY/YGi4pI7mPx47k
+TNgKJx5TmMulbHwYQj178rKEvX9pFxSwUxJUcucV7khJBkMmr8urGXOC4GRQmczl
+htOfzbgElOuzUlzOQKX+KWwAoRHundTiX7oCkNCis7ZwootadrfHsN5OA5v1I6a7
+1F3w6xB6euNm53TU0pMZDNXqKnz1qaQ1X3d12SvuurdsTpg32H9kIi+dDfcdHRPJ
+925DHIyu723ZMRI9DtoL
+=nqwM
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-4.8.6-r3.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r3.ebuild
deleted file mode 100644
index 99eb8b4b0444..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.6-r3.ebuild
+++ /dev/null
@@ -1,174 +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.6-r3.ebuild,v 1.1 2015/05/07 07:48:24 yngwin Exp $
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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-eselect/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-	!aqua? (
-		>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	gtkstyle? (
-		>=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}]
-	)
-	mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? (
-		>=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-		xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
-	)
-"
-PDEPEND="
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-
-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-qclipboard-delay.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
-)
-
-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"
-
-pkg_setup() {
-	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"
-
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	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)"
-}
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-multilib_src_configure() {
-	local 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)
-		-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
-		$([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then
-		newicon tools/qtconfig/images/appicon.png qtconfig.png
-		make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-	fi
-}
-
-pkg_postinst() {
-	qt4-build-multilib_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}