gentoo resync : 17.05.2018

3 files changed, 2 insertions, 67 deletions

diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 19542fde6709..54a102d317c7 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,7 +1,5 @@
 AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
-DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
-EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
-EBUILD jasper-2.0.14.ebuild 1913 BLAKE2B 541191df7ed9dd4817558e63e245cc59931cd3ff7a3b7c782544219748ac8e039fc988229f747a6abc7e747d4ebe12ac67ecd3a141f7fcaf53d44bcf6578aafc SHA512 334d3da15982c086eb85d456551c988ad315e9db40fa575beba37475c6f35455276f82e66300f0ea5409aa9a29686467f7c9e24db95750267eb7272281742806
+EBUILD jasper-2.0.14.ebuild 1911 BLAKE2B 81c9f11098fe6973285624f0a47f2e6a0d58ce91502b861e02aa6d4563a67880a83beb0c45688f17f7a911dd8746f94d9e6a71378de04e322ab441e748808829 SHA512 d6c329e90b3045d3319ef6a1f37cfe82b8e9af057ad070259109e2d9d72d7d5c3ff20289dc980b036ae77bd4d7d2e1771d670836c2c1b23504629305e751cce3
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.12.ebuild b/media-libs/jasper/jasper-2.0.12.ebuild
deleted file mode 100644
index e6fab3f30a0f..000000000000
--- a/media-libs/jasper/jasper-2.0.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DALLOW_IN_SOURCE_BUILD=OFF
-		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
-		-DJAS_ENABLE_ASAN=OFF
-		-DJAS_ENABLE_LSAN=OFF
-		-DJAS_ENABLE_MSAN=OFF
-		-DJAS_ENABLE_SHARED=ON
-		-DJAS_ENABLE_STRICT=ON
-		-DJAS_ENABLE_USAN=OFF
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
-		# Doxygen
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index 7109e0380511..f6420f77c8a5 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes