gentoo resync : 31.12.2018

6 files changed, 28 insertions, 104 deletions

diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 828c046271c0..88645ebb2c3a 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,9 +1,3 @@
-DIST CImg-1.5.2.zip 12824193 BLAKE2B ca4746a546b3dad74e994e6d788acdf4755d1ee8db27d828cc2adcd16395a8e9b177a8a1ff1ac9e42192d572b471a810f39a29e859a8c105898dafe94f7a7641 SHA512 a6927cecb524da128a58de9d655c2bb948bb61f654d6f95c7fe2690d39a521fea5313326610c2b56b370f76139f753469b7e4366196dd83db18c5a0c3b307b52
-DIST cimg-1.7.8.tar.gz 17805881 BLAKE2B 24508bba89c1b2e4e11ff27eec65866a4b38fc6fbdc2cbd7de566a9382d0219ef0a8fa7dee32b7e8474732e349945b55da62d931f898de24d762173128f54efd SHA512 6d8f29ba5a98e340d2b0957775459778c811c028a2b0e59cb0d1fad46f1477ad21c7ff565fb71b12d38c67ede307d84c787cad35c28eeec0cec9e68f5b454798
-DIST cimg-1.7.9.tar.gz 17828648 BLAKE2B 7c6ac8453df519bf6720c2c5339fe359733128e1a481a03b0c3b37ef1050282be3cfd625687dab6c4830e4b292ce735cd7a77db09c06afb0bd9bad3598de2616 SHA512 4a7f3316c3ebdd751f7e5b504eda3a990087de8e3b21c5df259eea2ba853d0094365f20e7715e488db77f9fdb4e7244058403f4710065f5959245de631dbbf4b
-DIST cimg-2.0.0.tar.gz 17894467 BLAKE2B 9cbdf92b72a8845709e023ffc642fadde35928dbe618eb6c83020a430337895ed9bbeff7621a159dbcece6bab6be1d3f7599e708ca7f9e440e301139f3debe36 SHA512 432a4d7b60905b509c169a49bc16a2fd34abbebca0d74894f1c7d4729595ae59cc91d1bb0f64a5e888a2a0b13245144e3abdb96d543dc5ca3f28a40e0549cc46
-EBUILD cimg-1.5.2.ebuild 476 BLAKE2B 20e585b995a0dd6f99b54ce0c7d9cabcd7b69d2227b99d3d93d48f9a3a263360d111e590d5e3892651cc4e94ba07c12f08c3185c20dedcf0e324c21ec4986a86 SHA512 5c9ebbad9b634335204c5c4a14925d492ab37e6f091835d3b402c77ff780a4d1f8a98182d3a7ce1093ad61c89e11600786ab395f07c78e25b6dc400e5b93585f
-EBUILD cimg-1.7.8.ebuild 526 BLAKE2B 957c438406495ac90edb1c2a0d5de29bcc9d59a8012ce3ba8d578dbf6af21ac216896cb2282198bf000099602eeb269d4b95688e964112179a29dae00b9b7d38 SHA512 53ffc418ac9415d049c90935064455d701dfa448efd547e50b1f560faee2ecbb76613e14217b8e5386a91b891ea9a6414596d16e4724b5b6624bfd6784032d33
-EBUILD cimg-1.7.9.ebuild 526 BLAKE2B 957c438406495ac90edb1c2a0d5de29bcc9d59a8012ce3ba8d578dbf6af21ac216896cb2282198bf000099602eeb269d4b95688e964112179a29dae00b9b7d38 SHA512 53ffc418ac9415d049c90935064455d701dfa448efd547e50b1f560faee2ecbb76613e14217b8e5386a91b891ea9a6414596d16e4724b5b6624bfd6784032d33
-EBUILD cimg-2.0.0.ebuild 526 BLAKE2B f60bdc84201df236e94baeb70c84f720f7abc8481754204a0f754433bd27239c422fe1c1497c804c96a586e9b5bc5f823b1c240b0f23c4fb44bedaba72a54d47 SHA512 0a14dfcbc1163ba69ee0dee9aa9e338339b23b84f8cb8ed8a5d66e7efed8ad7bf61f5278a571d3459bcd564aa0f4403190e177f6b0c7ba7a9b96007640fad4a5
+DIST cimg-2.4.3.tar.gz 11074736 BLAKE2B 097da7f5b214470247296265950061acefec19a169139c65eb12b27ed8e1256b97f77d28deb910bb444f38d396e36c204c761437e8991421422e840fd7505a95 SHA512 3409fde40780d293051914ce988193063139f1f805e5b0205e829234944c76b877a2723dd7c616158bbb58238baf653a03f34d55052103286d3ee28a33136d15
+EBUILD cimg-2.4.3.ebuild 589 BLAKE2B 91b3c36c716f6e60a9652906cf7ef61bb2aab6ab56d7a40d6bcbccf924aab632886f6acc7d71c6d1ec5c8fc0e1c69d8e4c18258f45eee025f597587f247bb3fd SHA512 a1692a63111073a207c64e7e963af46be35d4b363eaf35f178cbf593391125d53232436a17a1e33426972e135452781887fc74eae68e36b5675c37520018bff3
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-1.5.2.ebuild b/media-libs/cimg/cimg-1.5.2.ebuild
deleted file mode 100644
index ae25304758c2..000000000000
--- a/media-libs/cimg/cimg-1.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="CImg-${PV}"
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="http://cimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodoc README.txt
-	doheader CImg.h
-	use doc && dohtml -r html/
-}
diff --git a/media-libs/cimg/cimg-1.7.8.ebuild b/media-libs/cimg/cimg-1.7.8.ebuild
deleted file mode 100644
index 5f02f816fae4..000000000000
--- a/media-libs/cimg/cimg-1.7.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV//./}
-MY_P="CImg-v.${MY_PV}"
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="http://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodoc README.txt
-	doheader CImg.h
-	use doc && dodoc -r html
-}
diff --git a/media-libs/cimg/cimg-1.7.9.ebuild b/media-libs/cimg/cimg-1.7.9.ebuild
deleted file mode 100644
index 5f02f816fae4..000000000000
--- a/media-libs/cimg/cimg-1.7.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV//./}
-MY_P="CImg-v.${MY_PV}"
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="http://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodoc README.txt
-	doheader CImg.h
-	use doc && dodoc -r html
-}
diff --git a/media-libs/cimg/cimg-2.0.0.ebuild b/media-libs/cimg/cimg-2.0.0.ebuild
deleted file mode 100644
index 0e9df6902803..000000000000
--- a/media-libs/cimg/cimg-2.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV//./}
-MY_P="CImg-v.${MY_PV}"
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="http://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodoc README.txt
-	doheader CImg.h
-	use doc && dodoc -r html
-}
diff --git a/media-libs/cimg/cimg-2.4.3.ebuild b/media-libs/cimg/cimg-2.4.3.ebuild
new file mode 100644
index 000000000000..f4273ef1db47
--- /dev/null
+++ b/media-libs/cimg/cimg-2.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+	doheader CImg.h
+	dodoc README.txt
+
+	use doc && dodoc -r html
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}