From 9bf19a3956d2bbe1c6e7f354cf8ad6f396e388dc Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 19 Mar 2018 17:59:45 +0000
Subject: [PATCH] libjpeg-turbo: drop conflicts for the base package. (#2347)
 See #2336

---
 media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe b/media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe
index 6b5d29382..329320077 100644
--- a/media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe
+++ b/media-libs/libjpeg-turbo/libjpeg_turbo-1.5.3.recipe
@@ -32,7 +32,7 @@ COPYRIGHT="1991-2018 Thomas G. Lane, Guido Vollbeding
 LICENSE="BSD (3-clause)
 	IJG
 	Zlib"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$portVersion.tar.gz"
 CHECKSUM_SHA256="b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"
 SOURCE_DIR="libjpeg-turbo-$portVersion"
@@ -54,9 +54,6 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
-CONFLICTS="
-	jpeg$secondaryArchSuffix
-	"
 
 PROVIDES_devel="
 	jpeg_turbo${secondaryArchSuffix}_devel = $portVersion