Restrict tests (they require network access and try to start wine) and add missing dependencies (bug #475918, thanks to Markus Oehme).

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 22 insertions, 3 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 95c92138d663..24d612311786 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.23 2013/06/30 02:29:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.24 2013/07/09 02:29:18 tetromino Exp $
+
+  09 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  winetricks-20130629.ebuild, winetricks-99999999.ebuild:
+  Restrict tests (they require network access and try to start wine) and add
+  missing dependencies (bug #475918, thanks to Markus Oehme).
 
 *winetricks-20130629 (30 Jun 2013)
 
diff --git a/app-emulation/winetricks/winetricks-20130629.ebuild b/app-emulation/winetricks/winetricks-20130629.ebuild
index d2b94f068577..1453eb20c417 100644
--- a/app-emulation/winetricks/winetricks-20130629.ebuild
+++ b/app-emulation/winetricks/winetricks-20130629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130629.ebuild,v 1.1 2013/06/30 02:29:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130629.ebuild,v 1.2 2013/07/09 02:29:18 tetromino Exp $
 
 EAPI=5
 
@@ -27,14 +27,21 @@ IUSE="gtk kde"
 
 DEPEND=""
 RDEPEND="app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unrar
 	app-arch/unzip
 	app-emulation/wine
+	net-misc/wget
+	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
 # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
+# Tests require network access and run wine, which is unreliable from a portage environment
+RESTRICT="test"
+
 S="${WORKDIR}"
 
 src_unpack() {
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 8a3aa2fac294..4320aaea783e 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.9 2013/06/30 02:29:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.10 2013/07/09 02:29:18 tetromino Exp $
 
 EAPI=5
 
@@ -27,14 +27,21 @@ IUSE="gtk kde"
 
 DEPEND=""
 RDEPEND="app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unrar
 	app-arch/unzip
 	app-emulation/wine
+	net-misc/wget
+	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
 # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
+# Tests require network access and run wine, which is unreliable from a portage environment
+RESTRICT="test"
+
 S="${WORKDIR}"
 
 src_unpack() {