From 848a206dec4f9da2f1f6ad7416bb34c7cc8d0f01 Mon Sep 17 00:00:00 2001 From: NP-Hardass Date: Fri, 21 Apr 2017 00:44:14 -0400 Subject: app-emulation/wine-any: 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-any/wine-any-2.0.ebuild | 3 +-- app-emulation/wine-any/wine-any-2.1.ebuild | 3 +-- app-emulation/wine-any/wine-any-2.2.ebuild | 3 +-- app-emulation/wine-any/wine-any-2.3.ebuild | 3 +-- app-emulation/wine-any/wine-any-2.4.ebuild | 3 +-- app-emulation/wine-any/wine-any-2.5.ebuild | 3 +-- app-emulation/wine-any/wine-any-9999.ebuild | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app-emulation/wine-any/wine-any-2.0.ebuild b/app-emulation/wine-any/wine-any-2.0.ebuild index 46f82d35e09c..ab406bde1776 100644 --- a/app-emulation/wine-any/wine-any-2.0.ebuild +++ b/app-emulation/wine-any/wine-any-2.0.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-2.1.ebuild b/app-emulation/wine-any/wine-any-2.1.ebuild index 6ab6d458225e..9a8c94e64f60 100644 --- a/app-emulation/wine-any/wine-any-2.1.ebuild +++ b/app-emulation/wine-any/wine-any-2.1.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-2.2.ebuild b/app-emulation/wine-any/wine-any-2.2.ebuild index 6ab6d458225e..9a8c94e64f60 100644 --- a/app-emulation/wine-any/wine-any-2.2.ebuild +++ b/app-emulation/wine-any/wine-any-2.2.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-2.3.ebuild b/app-emulation/wine-any/wine-any-2.3.ebuild index 6ab6d458225e..9a8c94e64f60 100644 --- a/app-emulation/wine-any/wine-any-2.3.ebuild +++ b/app-emulation/wine-any/wine-any-2.3.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-2.4.ebuild b/app-emulation/wine-any/wine-any-2.4.ebuild index 85c256b157c0..d5aa54de17b2 100644 --- a/app-emulation/wine-any/wine-any-2.4.ebuild +++ b/app-emulation/wine-any/wine-any-2.4.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-2.5.ebuild b/app-emulation/wine-any/wine-any-2.5.ebuild index 85c256b157c0..d5aa54de17b2 100644 --- a/app-emulation/wine-any/wine-any-2.5.ebuild +++ b/app-emulation/wine-any/wine-any-2.5.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index 85c256b157c0..d5aa54de17b2 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -101,7 +101,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}] ) @@ -355,7 +355,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 ) -- cgit v1.2.3-65-gdbad