gentoo resync : 31.03.2018

3 files changed, 5 insertions, 44 deletions

diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 0ea881e3b732..ba9647a2ff61 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,7 +1,5 @@
 DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
-DIST pngquant-2.5.2-src.tar.bz2 54611 BLAKE2B 5938f0be4db3cf167a8a52267807672643002599574beb5f256edb93a7e6d3bf0a035a6231e5e0f9d102bed9c278fd0323c51fdd044280c7000cb5537468e1b8 SHA512 d542765bc1f7e22fd7199cd4aeb8dc7b82fa87fe05c53ca6b7919522e081c861d419a541909284aa4e5dcfeeedb19729a50150d9139389c1949b3aeaf4933401
-DIST pngquant-2.7.2-src.tar.gz 91721 BLAKE2B d8f1952e9188956cfcad802aec9f09728290298355f333e87cd627a75509ebfd7f6b657133b59c040103fe9f8333f83e07887e7dd919c134c1f5eb4b9bbace98 SHA512 ab84651cf0b5f3af2095b5741e0d03f4ddedbed59e75c5c75faeac20efa8dd2fb482f2a8d9447b5673e9ae6970b9af8dfdbe40062bdf377206ee87eaa69ed9d8
+DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621bafa41497a6fe32afe30e41ad04d788946390f382139aea9878f58fc7a84fdbaf597681c9d8769e0e23b785a10d2e0233c SHA512 5325577dcb16acf5dff81a5f3bcf8cfa2a12df07a7c2308ebb9a343b74e56ea21184ed3f87819122c8bb97b4a7ffd3b61046c60f7f339da9a93e76dfa17ebee6
 EBUILD pngquant-2.11.4.ebuild 1001 BLAKE2B b448d71c1b9b5f97cfbb96a2f400933c697cf7821f34a1e78731b6fbf23856fcaa079d9a43d9346a2899b55217f6f7ce65a0f52315f89464ea321ec2c7f75224 SHA512 e3c453cb022071993544a910d95025e88222732fd5b533b4ef7b4b4c8fbe42d052528c9329af704d9ba53e7d8e522b2f87895013a337999afd3fe5656ea805cd
-EBUILD pngquant-2.5.2.ebuild 946 BLAKE2B 1331a1223d2b795427398ffb3c002ab4ec8e3ace914aa9dd45bedcd927c09e325894346f5f164827180a2651cb4953148c64f71c9bcd5ed516989ae0aeddc398 SHA512 0a9e059e99d0c96b4d4506c75edfce6f70ba73b0395bbb4953fbd67b2d790ecc949b111563396b8295168d91a5f196a404d3892e6a16f3fa1b1916db97a4b314
-EBUILD pngquant-2.7.2.ebuild 949 BLAKE2B f1cab7bef58f710abc1ff6a6a190ab47e79f689add003de67877e495855516330268df9a6f467abccdb779a2a3eaf369c3a91c29b10540c1b845171acede851e SHA512 f895a15658ad06e9f18bcd388877bc0519f4131d6cf6aca3924300073dc684bac4d5d07c403040870d14a18ad88e7832506fceba0da38ca2063829d5e398fed8
+EBUILD pngquant-2.11.7.ebuild 1001 BLAKE2B a751e5cb2b1ad19dad8e91d01b8ad82d2ca27cfa6abf7327ebd8f4a6a73f371fb999fb4e90506a42f47102dadd9565499d45be6b247caaeba29d6416b06efd30 SHA512 2ae01ecc887e5e11c36e8719631f04a57a82208396839b7d22ebd6197bbd3dc5c7cc8808361ff12d7b180d98ed27a0cb9388b06243dfa24ea527dfb9aea3433a
 MISC metadata.xml 492 BLAKE2B c60cb6917ca56946f1941feb2de555e4ced9c56ea3f25fae727bbfd2a49567ef3b581e877b7304dffe090ed898cc285f1baf5465380eb30582bc086854fdbc8a SHA512 5afec8077fc4f303cc76de855558049bdebf0d40a76381077866fd9d3e658912936fc2cd63411d378475743f8649e68dcc08793eb066d6adf9b232b8c669cb1b
diff --git a/media-gfx/pngquant/pngquant-2.7.2.ebuild b/media-gfx/pngquant/pngquant-2.11.7.ebuild
index a9d5a186736e..2da09ac80e2e 100644
--- a/media-gfx/pngquant/pngquant-2.7.2.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug lcms openmp cpu_flags_x86_sse2"
 
 RDEPEND="media-libs/libpng:0=
+	media-gfx/libimagequant:=
 	sys-libs/zlib:=
 	lcms? ( media-libs/lcms:2 )"
 DEPEND="${RDEPEND}"
@@ -24,6 +25,7 @@ src_configure() {
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
 		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use openmp && tc-has-openmp && echo --with-openmp) \
diff --git a/media-gfx/pngquant/pngquant-2.5.2.ebuild b/media-gfx/pngquant/pngquant-2.5.2.ebuild
deleted file mode 100644
index 04a3c8e8cd2b..000000000000
--- a/media-gfx/pngquant/pngquant-2.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.bz2"
-
-LICENSE="HPND rwpng"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
-
-RDEPEND="media-libs/libpng:0=
-	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use openmp && tc-has-openmp && echo --with-openmp) \
-		$(use_with lcms lcms2) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELOG README.md
-}