Fix libpng and openssl slot dependencies (bug #455962, thanks to Samuli Suominen).

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

30 files changed, 101 insertions, 88 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0e7c7c2a861a..4acc39f03b11 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.452 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.453 2013/02/08 05:12:28 tetromino Exp $
+
+  08 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.3.ebuild,
+  wine-1.3.28.ebuild, wine-1.4.ebuild, wine-1.4.1.ebuild, wine-1.5.0.ebuild,
+  wine-1.5.1.ebuild, wine-1.5.2.ebuild, wine-1.5.3.ebuild, wine-1.5.4.ebuild,
+  wine-1.5.5.ebuild, wine-1.5.6.ebuild, wine-1.5.7.ebuild, wine-1.5.8.ebuild,
+  wine-1.5.9.ebuild, wine-1.5.10-r1.ebuild, wine-1.5.11-r1.ebuild,
+  wine-1.5.12-r1.ebuild, wine-1.5.13-r1.ebuild, wine-1.5.14-r1.ebuild,
+  wine-1.5.15-r2.ebuild, wine-1.5.16-r1.ebuild, wine-1.5.17.ebuild,
+  wine-1.5.18.ebuild, wine-1.5.19.ebuild, wine-1.5.20.ebuild,
+  wine-1.5.21.ebuild, wine-1.5.22.ebuild, wine-1.5.23-r1.ebuild,
+  wine-9999.ebuild:
+  Fix libpng and openssl slot dependencies (bug #455962, thanks to Samuli
+  Suominen).
 
   06 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.3.ebuild,
   wine-1.3.28.ebuild, wine-1.4.ebuild, wine-1.4.1.ebuild, wine-1.5.0.ebuild,
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
index f99c115b5ec2..9b4211e71f31 100644
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.3.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/wine/wine-1.2.3.ebuild,v 1.22 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.23 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -82,8 +82,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild
index d604d150b465..dd8c3460c37e 100644
--- a/app-emulation/wine/wine-1.3.28.ebuild
+++ b/app-emulation/wine/wine-1.3.28.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/wine/wine-1.3.28.ebuild,v 1.15 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.16 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -81,8 +81,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.4.1.ebuild b/app-emulation/wine/wine-1.4.1.ebuild
index cabe2d859e9a..a5f75171e3ab 100644
--- a/app-emulation/wine/wine-1.4.1.ebuild
+++ b/app-emulation/wine/wine-1.4.1.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/wine/wine-1.4.1.ebuild,v 1.9 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.10 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.4.ebuild b/app-emulation/wine/wine-1.4.ebuild
index 16701e0e86c8..4f1b6bc54df6 100644
--- a/app-emulation/wine/wine-1.4.ebuild
+++ b/app-emulation/wine/wine-1.4.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/wine/wine-1.4.ebuild,v 1.13 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.ebuild,v 1.14 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.0.ebuild b/app-emulation/wine/wine-1.5.0.ebuild
index a21cbfccdd76..0bdb8f38e278 100644
--- a/app-emulation/wine/wine-1.5.0.ebuild
+++ b/app-emulation/wine/wine-1.5.0.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/wine/wine-1.5.0.ebuild,v 1.11 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.0.ebuild,v 1.12 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.1.ebuild b/app-emulation/wine/wine-1.5.1.ebuild
index 8681cbad29b8..480cf81f4937 100644
--- a/app-emulation/wine/wine-1.5.1.ebuild
+++ b/app-emulation/wine/wine-1.5.1.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/wine/wine-1.5.1.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.1.ebuild,v 1.11 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.10-r1.ebuild b/app-emulation/wine/wine-1.5.10-r1.ebuild
index f69bad7a536d..ce40a47ae0bf 100644
--- a/app-emulation/wine/wine-1.5.10-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.10-r1.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/wine/wine-1.5.10-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -96,8 +96,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.11-r1.ebuild b/app-emulation/wine/wine-1.5.11-r1.ebuild
index 7881322d5046..2ac23c3f59bc 100644
--- a/app-emulation/wine/wine-1.5.11-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.11-r1.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/wine/wine-1.5.11-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -96,8 +96,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.12-r1.ebuild b/app-emulation/wine/wine-1.5.12-r1.ebuild
index 35a0b2f57b76..2186f3e555d6 100644
--- a/app-emulation/wine/wine-1.5.12-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.12-r1.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/wine/wine-1.5.12-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -96,8 +96,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.13-r1.ebuild b/app-emulation/wine/wine-1.5.13-r1.ebuild
index 2fb009cb373f..6ee60ed33cd9 100644
--- a/app-emulation/wine/wine-1.5.13-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.13-r1.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/wine/wine-1.5.13-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -96,8 +96,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.14-r1.ebuild b/app-emulation/wine/wine-1.5.14-r1.ebuild
index e27581b111d1..8d1f7615fef4 100644
--- a/app-emulation/wine/wine-1.5.14-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.14-r1.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/wine/wine-1.5.14-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.14-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -96,8 +96,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.15-r2.ebuild b/app-emulation/wine/wine-1.5.15-r2.ebuild
index 90309be49bb6..5f6ad7b4f6b3 100644
--- a/app-emulation/wine/wine-1.5.15-r2.ebuild
+++ b/app-emulation/wine/wine-1.5.15-r2.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/wine/wine-1.5.15-r2.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r2.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -100,8 +100,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.16-r1.ebuild b/app-emulation/wine/wine-1.5.16-r1.ebuild
index 2ef8764c58fc..46287384857d 100644
--- a/app-emulation/wine/wine-1.5.16-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.16-r1.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/wine/wine-1.5.16-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.16-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -100,8 +100,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.17.ebuild b/app-emulation/wine/wine-1.5.17.ebuild
index a2d85b753ffc..5738a2525061 100644
--- a/app-emulation/wine/wine-1.5.17.ebuild
+++ b/app-emulation/wine/wine-1.5.17.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/wine/wine-1.5.17.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.17.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -100,8 +100,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.18.ebuild b/app-emulation/wine/wine-1.5.18.ebuild
index 812ba2e0ed2a..60060cbf4637 100644
--- a/app-emulation/wine/wine-1.5.18.ebuild
+++ b/app-emulation/wine/wine-1.5.18.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/wine/wine-1.5.18.ebuild,v 1.4 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.18.ebuild,v 1.5 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -102,8 +102,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.19.ebuild b/app-emulation/wine/wine-1.5.19.ebuild
index b273cb9f3d60..108bea5f0631 100644
--- a/app-emulation/wine/wine-1.5.19.ebuild
+++ b/app-emulation/wine/wine-1.5.19.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/wine/wine-1.5.19.ebuild,v 1.4 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.19.ebuild,v 1.5 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -102,8 +102,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.2.ebuild b/app-emulation/wine/wine-1.5.2.ebuild
index f0a6733d685f..ffbb0b47a49f 100644
--- a/app-emulation/wine/wine-1.5.2.ebuild
+++ b/app-emulation/wine/wine-1.5.2.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/wine/wine-1.5.2.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.2.ebuild,v 1.11 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.20.ebuild b/app-emulation/wine/wine-1.5.20.ebuild
index dacae377d691..2991e0a85b22 100644
--- a/app-emulation/wine/wine-1.5.20.ebuild
+++ b/app-emulation/wine/wine-1.5.20.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/wine/wine-1.5.20.ebuild,v 1.6 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.7 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -99,8 +99,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.21.ebuild b/app-emulation/wine/wine-1.5.21.ebuild
index dab625ff446e..5bda8d9f3e03 100644
--- a/app-emulation/wine/wine-1.5.21.ebuild
+++ b/app-emulation/wine/wine-1.5.21.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/wine/wine-1.5.21.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.21.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -99,8 +99,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.22.ebuild b/app-emulation/wine/wine-1.5.22.ebuild
index c41a60f65be8..8b820e6e6783 100644
--- a/app-emulation/wine/wine-1.5.22.ebuild
+++ b/app-emulation/wine/wine-1.5.22.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/wine/wine-1.5.22.ebuild,v 1.2 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.22.ebuild,v 1.3 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -99,8 +99,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.23-r1.ebuild b/app-emulation/wine/wine-1.5.23-r1.ebuild
index b96ebd0923e8..bc6fbeed8d7a 100644
--- a/app-emulation/wine/wine-1.5.23-r1.ebuild
+++ b/app-emulation/wine/wine-1.5.23-r1.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/wine/wine-1.5.23-r1.ebuild,v 1.3 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.23-r1.ebuild,v 1.4 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -99,9 +99,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? (
-		dev-libs/openssl:=
+		dev-libs/openssl:0=
 		net-libs/gnutls:= )
-	png? ( media-libs/libpng:= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.3.ebuild b/app-emulation/wine/wine-1.5.3.ebuild
index fb81c6e4c8ee..6b8612624f34 100644
--- a/app-emulation/wine/wine-1.5.3.ebuild
+++ b/app-emulation/wine/wine-1.5.3.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/wine/wine-1.5.3.ebuild,v 1.10 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.3.ebuild,v 1.11 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.4.ebuild b/app-emulation/wine/wine-1.5.4.ebuild
index c4fd25a964f8..bcdbceaddee9 100644
--- a/app-emulation/wine/wine-1.5.4.ebuild
+++ b/app-emulation/wine/wine-1.5.4.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/wine/wine-1.5.4.ebuild,v 1.8 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.4.ebuild,v 1.9 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.5.ebuild b/app-emulation/wine/wine-1.5.5.ebuild
index 83b7c95cb0bc..9e0f46fe5092 100644
--- a/app-emulation/wine/wine-1.5.5.ebuild
+++ b/app-emulation/wine/wine-1.5.5.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/wine/wine-1.5.5.ebuild,v 1.8 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.5.ebuild,v 1.9 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -87,8 +87,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.6.ebuild b/app-emulation/wine/wine-1.5.6.ebuild
index 515fce4de32d..c6a3b7fbbd7d 100644
--- a/app-emulation/wine/wine-1.5.6.ebuild
+++ b/app-emulation/wine/wine-1.5.6.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/wine/wine-1.5.6.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.6.ebuild,v 1.8 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -90,8 +90,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.7.ebuild b/app-emulation/wine/wine-1.5.7.ebuild
index 5438829f8b84..e56e9c0e2338 100644
--- a/app-emulation/wine/wine-1.5.7.ebuild
+++ b/app-emulation/wine/wine-1.5.7.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/wine/wine-1.5.7.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.7.ebuild,v 1.8 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -93,8 +93,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.8.ebuild b/app-emulation/wine/wine-1.5.8.ebuild
index 0e3692cf0ed1..fc89c79479e7 100644
--- a/app-emulation/wine/wine-1.5.8.ebuild
+++ b/app-emulation/wine/wine-1.5.8.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/wine/wine-1.5.8.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.8.ebuild,v 1.8 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -93,8 +93,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-1.5.9.ebuild b/app-emulation/wine/wine-1.5.9.ebuild
index 572b28dcf170..92b54868268e 100644
--- a/app-emulation/wine/wine-1.5.9.ebuild
+++ b/app-emulation/wine/wine-1.5.9.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/wine/wine-1.5.9.ebuild,v 1.7 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.9.ebuild,v 1.8 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -93,8 +93,8 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:= )
-	png? ( media-libs/libpng:= )
+	ssl? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 056374dabd63..a52f6b1c70c5 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.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/wine/wine-9999.ebuild,v 1.133 2013/02/06 05:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.134 2013/02/08 05:12:28 tetromino Exp $
 
 EAPI="5"
 
@@ -99,9 +99,9 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? (
-		dev-libs/openssl:=
+		dev-libs/openssl:0=
 		net-libs/gnutls:= )
-	png? ( media-libs/libpng:= )
+	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	!win64? ( ${MLIB_DEPS} )
 	win32? ( ${MLIB_DEPS} )