commit:     d93b8b4d71161c8c1c0182b6161f5127b8bf7cee
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 04:37:26 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 05:54:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93b8b4d

app-emulation/wine-staging: Drop osmesa patch

Setting minimum version for mesa to mesa-13 since that is the earliest
version that I can confirm works without this patch

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-emulation/wine-staging/wine-staging-2.0.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-2.1.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-2.2.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-2.3.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-2.4.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-2.5.ebuild  | 3 +--
 app-emulation/wine-staging/wine-staging-9999.ebuild | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-2.0.ebuild 
b/app-emulation/wine-staging/wine-staging-2.0.ebuild
index 3c656e8963d..5420a843d0a 100644
--- a/app-emulation/wine-staging/wine-staging-2.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-2.1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.1.ebuild
index c159999f481..d4643a893e1 100644
--- a/app-emulation/wine-staging/wine-staging-2.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-2.2.ebuild 
b/app-emulation/wine-staging/wine-staging-2.2.ebuild
index c159999f481..d4643a893e1 100644
--- a/app-emulation/wine-staging/wine-staging-2.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.2.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-2.3.ebuild 
b/app-emulation/wine-staging/wine-staging-2.3.ebuild
index c159999f481..d4643a893e1 100644
--- a/app-emulation/wine-staging/wine-staging-2.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.3.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-2.4.ebuild 
b/app-emulation/wine-staging/wine-staging-2.4.ebuild
index bb7ceea6832..10fd20b5110 100644
--- a/app-emulation/wine-staging/wine-staging-2.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.4.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-2.5.ebuild 
b/app-emulation/wine-staging/wine-staging-2.5.ebuild
index bb7ceea6832..10fd20b5110 100644
--- a/app-emulation/wine-staging/wine-staging-2.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.5.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index bb7ceea6832..10fd20b5110 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -341,7 +341,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

Reply via email to