gentoo resync : 22.05.2021

5 files changed, 35 insertions, 18 deletions

diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 31ff7daa05ca..a9438a3be2ee 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,10 +1,11 @@
-AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
+AUX libimagequant-2.12.2-fix-pkgconfig.patch 698 BLAKE2B e3e80b1904f7c683d12df2197a343df16f67eacda9941526622fe32623313f8e5ac6da8ed508a378f1e6002ebc03c96b87672b0dc70f00514b51f9afadebf82c SHA512 c49d32ce790d4771aa98f75e0fa4c729020b7bea388c7ee15534cca4c575a60934ce56e68fbbfd48e53b2702bfa843c0be9f2ce2e39a5ebeafa374408b0694c7
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1209 BLAKE2B 9a6ea44db62524b454c37abd236d9a7186e3dc5cbda4b0d55a4f96216bd74db13e6bcf8d9d06a490e7ba1a717f7ec8de320780ee3699e10e1c700f441a4d18a5 SHA512 fad1505e2037b87f031838643443d0e2f728855d4a1929b1cae3f37b3d2d22c2408f11461b81818d4c68f52c99d981a134ad8c0ae738fe9240b41e4a460155fc
+AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1051 BLAKE2B 5790e6ee46239fe3df00c6d8add3ca5b7e08818890443ca54e786d7dec6f7bbcdb557f65e6b6ebdfdb14bb072e274d8b05024c327150314e1add561d50cfc6a7 SHA512 3274ff5d3a461160e4f5e8f9e64dbad1ec1c68d22a7c3a13b380c05b808470c541531227768a77cb6b4bae9a8864296ecedf68d7b1c1f4c687ba5307e46f4ac8
+AUX libimagequant-2.15.1-fix-pkgconfig.patch 708 BLAKE2B e282ff891cee6f9a7ec16302932680d918564be3752beadbbf60ca9d14662836226715cc37d508646e8979a62183522307544e53d2f64b62de9e84095fc66ac7 SHA512 395af8861add7df7d9e81dc55046840c06c02fc0033faf072594320c9bf0ea994a4744bae20fe583954bdfde3a6eb044bf813bd55ec17c7d29484b53eefd6b20
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
-DIST libimagequant-2.15.0.tar.gz 98668 BLAKE2B 916bb32ad848c5076502be7f471bd693396e8a7bd36878ec928f294776bd3343e76c2323372e577d58f5bb5c4f4e6aa3a32d5103901b190b0a036684cbf5cf56 SHA512 b856daaf79dd748ed3bb4cdc432dcffebf6678f8dffd6b4b0e79b96ec9c64ebf19597de35cf56ed47d3202947f3f5f208745c2c2c92fadf6c5b62f17e61b3f13
+DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd
-EBUILD libimagequant-2.15.0.ebuild 1158 BLAKE2B cc58a7fe5e2d4e5b18b2064ebe25e644520586b3a3eb0e3b3d4e4f6f81ebb5dff744c41becb74bf6acbc9c6d36e7891b6aceab874b45727a617277abacb0cb27 SHA512 51c3c8a5b695fd899dbcdf458a590d7e7126d63da32d30e388588871b50688e92f122fae830bad895894397a7d3000354a2fe0dffbe1a6a350df12b319f328a4
+EBUILD libimagequant-2.15.1.ebuild 1292 BLAKE2B 1d56a55b0f8d42ab7fae6a9282740299563d09897a9ffadb9f1b15b3e22d4495432331bbc3c7f2ec0966d6d83aace8358029ef1db480bbf74e34a04ec4fd58bd SHA512 923f18cefd479cd53e466911b011916c22c548b53ad8c2358a93d1d15a4fb70377f35ec10df9079bdf21e3d58e17b0040518b88cb227b8496c5bad45d1e76216
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
index 0b058fbecc23..ce9cc2b8c99f 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2666b3d..ba58cf1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
@@ -11,8 +9,6 @@ index 2666b3d..ba58cf1 100644
  
  .PHONY: all static shared clean dist distclean dll java cargo
  .DELETE_ON_ERROR:
-diff --git a/imagequant.pc.in b/imagequant.pc.in
-index 980da8c..6c6569d 100644
 --- a/imagequant.pc.in
 +++ b/imagequant.pc.in
 @@ -1,6 +1,6 @@
diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
index 7e2d58619618..f355453ece6c 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
@@ -2,13 +2,6 @@ From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
 From: Kornel <kornel@geekhood.net>
 Date: Wed, 27 Jan 2021 17:36:33 +0000
 Subject: [PATCH] Update OMP pragma
-
----
- libimagequant.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/libimagequant.c b/libimagequant.c
-index 4f0b48f..828f768 100644
 --- a/libimagequant.c
 +++ b/libimagequant.c
 @@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
diff --git a/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
new file mode 100644
index 000000000000..fbf3bc735579
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -134,7 +134,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
+ endif
+ 
+ $(PKGCONFIG): config.mk
+-	sed 's|@PREFIX@|$(PREFIX)|;s|@VERSION@|$(VERSION)|' < imagequant.pc.in > $(PKGCONFIG)
++	sed 's|@PREFIX@|$(PREFIX)|;s|@VERSION@|$(VERSION)|;s|LIBDIR|$(LIBDIR)|' < imagequant.pc.in > $(PKGCONFIG)
+ 
+ .PHONY: all static shared clean dist distclean dll java cargo
+ .DELETE_ON_ERROR:
+--- a/imagequant.pc.in
++++ b/imagequant.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@PREFIX@
+ includedir=${prefix}/include
+-libdir=${prefix}/lib
++libdir=LIBDIR
+ 
+ Name: imagequant
+ Description: Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.
diff --git a/media-gfx/libimagequant/libimagequant-2.15.0.ebuild b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
index e0d9b920c44d..2eb73642deb8 100644
--- a/media-gfx/libimagequant/libimagequant-2.15.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.15.1-fix-pkgconfig.patch
 )
 
 pkg_pretend() {
@@ -25,7 +25,13 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-	sed -i '/install.*STATICLIB/d' Makefile || die
+
+	# Avoid always building static library
+	# (Fixes side-effect of compiling in src_install too)
+	sed -i \
+		-e '/install.*STATICLIB/d' \
+		-e 's/all: static shared/all: shared/' \
+		Makefile || die
 }
 
 src_configure() {