Remove vulnerable version wrt bug #508984

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

3 files changed, 21 insertions, 220 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 94ef8ef7c8d4..eac664345ebc 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.32 2014/06/08 10:51:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.33 2014/06/08 13:29:42 pesa Exp $
+
+  08 Jun 2014; Davide Pesavento <pesa@gentoo.org> -qtgui-4.8.5-r1.ebuild:
+  Remove vulnerable version wrt bug #508984
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> qtgui-4.8.5-r2.ebuild:
   Stable for sparc, wrt bug #508984
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 57653e5cabc9..85f4de1d0dfe 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -5,24 +5,25 @@ AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63
 AUX qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch 1440 SHA256 f76ec92367e32cbff23b7fd5064ca7da4fa1146f458630b8897862072cbca554 SHA512 ce1a06dbb52f200b21621a4b7febbd2938d9fb2fa9117c7e1fd2e24283784d645b36bb79ebf411f07ecff774f8c4cde1fa5d27956e4f95f28e0181e5953817b3 WHIRLPOOL a4ee9986ab5df6a6c85282b7367afb2f1708b1a1f8b52e940fe09669bf2e9c6db0fd2cb1fe0b98df9a95a22ad2a6f35f7901d1521ea7acb798327716f53a3817
 AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtgui-4.8.5-r1.ebuild 5661 SHA256 bc8ed1ba030dc609d567346b51bc8581e5aba7429834507a3309a3b397668b3a SHA512 676f6c4b1355ac97358316c6647ae98b4a3256531e605711d08a081e4b9f57948a5f334a1666bc890e423ab98a5d32c9b112bceeb71d0eb26c8e9275f6a26821 WHIRLPOOL f090a7f16a02e5f85d9346ef83d6cb6688f1881237e33792d491bd7ec034e1907637d54fa7c01bfa10d620fb5e85644581750af48c274e1d25df12650d2dc6c0
 EBUILD qtgui-4.8.5-r2.ebuild 5812 SHA256 7947c585082d4415ac75c2fbca785555fc6cd1e858de4c51c3c5f3f30476ba63 SHA512 728096468333a84b74c7c877014d95f8d613b3588e943714ca6d6c9ce450ce40e8566ec0f218c24d4bd738f1f92efbde3fd0988a4be041dd320050cf5254d1e3 WHIRLPOOL ccf0e77bd3406542b236a88e79654d81e25c48da5f0637ed8757ff12c61f979c1476dd4c50e7b6e8c92838293f0f8cef45b767f91a4dc5cf8efe7200674d161a
-MISC ChangeLog 37348 SHA256 37c28d0439fcbcd89959089cbd02f92d86d0c1551ba4619ed974ed1e7d7a0fcc SHA512 4559d7a597f4a8634d1fe85ab5f5a44136144f963411bd226a86fe96c5011511af62aef07d381d5c42e8f1144bf00f27b42fadc4eae290833e4ae0bed60996d4 WHIRLPOOL 5784ee66b989095e9fcd97cc652824c3e3d174322b667fc38fac5709727dac62c7b210ab8642cdca7f3c637254eb627d4df23bd400a243b9b4d3dc8077bf1e46
+MISC ChangeLog 37468 SHA256 a58964031607c800656aecf5cfb17407d2549ccfb4f46cca32cb3f87016fd96f SHA512 3b1d62918b55b87226923eecdcd1115431396ebd12b4a978ff8d3bc0e2c989e6fda9dbdc79b1fb68a41b6246ffe22f6c87c7cf3959f200461b3c2615c3cb3ab4 WHIRLPOOL cfcba07c606d268a9af3613279cefe63a87007014577334171d7cd2b6b4eecc8fb4ba965d5c29c802aec64a1e2c2e1046196c69513f8a21435821d6080cb4365
 MISC metadata.xml 1058 SHA256 fea87cdb725fa8f278ed1310f49796cf553025a0e05d54fa813bd455ad4ab923 SHA512 360984939e4ff6607bfb207e826a54c8faf6c08f5f2b71d10cc7c08b374d2edb9cb91bff959a9626212d2548c09ed85a8c253e22c41aae28c885795e17cee0bb WHIRLPOOL 1d27158db4c3e2c735c5881972d9e10e12087789597a96042e8a9031d3eb847745101bd0fe7c68b42350ea581dcda8851c472e8c8db7982661a1ac89ceb117ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTlEA2AAoJELp701BxlEWfE0oP/jpoIjXMUWWkZkHgA/ucF1RJ
-wYhLkOlZEMxklK/AZ3wHNOjP3kQfK/PPJJsniYhW1h6Xqdd3lRwAdJaM23P/3MJf
-dpDYkm5SNnaw0ybVpcAx3cyhEnZuSIp+WwQ+fl+1n0pbw4jsBqqpiqUhvjQ6fv53
-jVniKOGKSNRzj6WIwrt09wSLftwAUf4P4dHy+P0k9rIwD92KsbcOJa76WvmAnp7N
-K/zKGVVK2Otr3DeNybqgVgrygpF68Lu5RxJUJ+TdQSimMJdTqVH4xi16EWsTJiuW
-MDijggdY+FveUqpXVjQPMZ3NHqnHHIy+O8W1/anorw3b680gll1qN+GfebmxGTzF
-w0PD+Hbes8Zflm/FQVUJYCx2fTAhFSysQzbCQNnc1mn2VRgtfajthVc9So961uzu
-gQNvYVffjB2P2zvcm6ctuEYxYNWeemCP0RFfS5bXp9/ev5VUZHxp9TlLQ4M8jDtS
-qMQtagrbQ+Qvyc0kYjqbeUqANHXejCGImsfh/m7X9iRA+kZNSDeJoiY36KMXQ/iu
-mn76kIrk6kslEbZofsJXPQxYK5vzjelsXqSzCe9LqxOL5ReGdKXiGec0wSzscw0w
-b+RZiXIUchM84vChcMXUBH6N5jhNpox8qbErhA9r9zv+oXpqQiRGUnVuJwcPrKHe
-SFzYSplygsNCiCPgWpmK
-=mmLR
+iQJ8BAEBCABmBQJTlGWKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9iHUP/2O+BUCMWoRIsv8NNfe643/5
+odTFEjdiVRLrDdpe13u6gQg/kc4RrzWvK95HjfFS98fU+RjPiWrNgDrg+mFpdCpn
+9FcjQh5VnZZ8KDW2hNm3ThtKX3URPfmh4TEObp9wmjtGnvn7bZXTsL+kzxWXdVMQ
+Vvwd1zk6Qq+dzcOf8AA/82CH+TxO2bCYxVV4+WvItPfzD/m/v+m4mJj2BvcNIBlz
+OuJTaaDLnEBbQv13hPZCMWJvg8n4MURE2kMYYe0v/ktSUKqonaFCvvKX5N+klvtl
+h4suJLiJpj3jXVwfB/Bg6RRbJ/kBw+J3AYoXECq8NBBcIItDocCMfrCvqJLHXAST
+4GRWSrJKWZXq7ksMl7bllE++I0g7/KINjn6kcNY+enPQ2Xyc+kT9FIWcqZRkt4jc
+IM1t+/Wo+4GXFY/LM+i33zLZDL6zmuopSM6ap7+UONDJO7U/oWzE+1Lld0TlqpM0
+NhBAWale53oo+W/4jTs1KXGq2KuxJpnPSbv4EnfJlVIH7MFoeGt+9nRjCBY13q/T
+MHW81bOqnFhsJAp+5rIdK93c5k+9cnAEHVc58KKKs3D8/znOXGvtaBNxdR2U9Wqj
+XSmS3C+rUbiR3C8mlBV5i/NX06BgTUecW+lSB3d6GDKsbmipIOR3NmjkZ77rMswC
+uAXcDy/lGVS8tzL7Sjg+
+=vJsG
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
deleted file mode 100644
index 46bbe59f3d3a..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2014 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-r1.ebuild,v 1.11 2014/01/26 11:55:54 ago Exp $
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-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/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	cups? ( net-print/cups )
-	egl? ( media-libs/mesa[egl] )
-	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=(
-	"${FILESDIR}/${PN}-4.7.3-cups.patch"
-	"${FILESDIR}/${P}-keyboard-shortcuts.patch"
-)
-
-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="
-		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
-}
-
-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"
-
-	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
-
-	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
-	touch "${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
-}