Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 8 insertions, 81 deletions

diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 227d69624c21..ff200860c6a4 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.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
-DIST jasper-2.0.15.tar.gz 1311926 BLAKE2B 39b6e0af590bbf849a172b97148465e68b9b5682286b882e41bf8f58e3ff4f18a4762a29b08529d9589a63aa22a9125aeed8c2dc7e61198f5eb15f1ca7b60ae0 SHA512 360cadfa0f3cb502ce6354267df71a48bac5a5f6bf60c280f6943c8ede72c727ca178cad411c7824c727731aaa7def92298ebd259a262d9776c6e137f12b16c7
 EBUILD jasper-2.0.14.ebuild 1899 BLAKE2B f9f034ecb4e7cb7362957b91ae6712853cefafad55d069adcc893a5094ebb91a7a35aeb75178d5002fa9ff04f41ceb89d9fc36c53c575addb99e9bf0d0142ace SHA512 0f6f272f0428aaebfe568fdc5d898f36c93df54ecb91001b1302344e67f7386fd11694ec652c57d8437436946e0c7bf8bf4203fbe285f978f067036d3fe3224b
-EBUILD jasper-2.0.15.ebuild 1871 BLAKE2B 186c1e6333eb6b92b00c575b178140da7200b6ae1fab74eeecaa83e561f49fdfc6fa555493a3352d90721e353c34cfffe5fa03f8cbb444219cf855c2f0fca934 SHA512 c24f73126cd6f4f229a81c17a1fddb65bca248a3e324fc7522ea9296d8cbe2d457d03641d5194046e32f56192d35d7f07ba05c8423873ff79e26adf844100de0
-EBUILD jasper-9999.ebuild 1871 BLAKE2B 186c1e6333eb6b92b00c575b178140da7200b6ae1fab74eeecaa83e561f49fdfc6fa555493a3352d90721e353c34cfffe5fa03f8cbb444219cf855c2f0fca934 SHA512 c24f73126cd6f4f229a81c17a1fddb65bca248a3e324fc7522ea9296d8cbe2d457d03641d5194046e32f56192d35d7f07ba05c8423873ff79e26adf844100de0
+EBUILD jasper-9999.ebuild 1803 BLAKE2B eccda8d15f0ff80c4ccbba400c144f098736284f1fa26831ecc60c34dca36c74501907c6149849a9235c0c5720d803c316b691ad5b614d6200781a87445c76b4 SHA512 aa00138f755b8c929bdcaaeabeecb33b94dbfc69dae08d5de170ca169ca00f101bdcad13b84ac51f7fe4ff9cce9dc0d7d31567d56096b59b65271ea34be1521d
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.15.ebuild b/media-libs/jasper/jasper-2.0.15.ebuild
deleted file mode 100644
index 39254dafd4cc..000000000000
--- a/media-libs/jasper/jasper-2.0.15.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${PN}-version-${PV}"
-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 test"
-
-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}"
-BDEPEND="
-	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)
-
-		-DJAS_ENABLE_PROGRAMS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index 39254dafd4cc..ed20cb057f96 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 inherit cmake-multilib
 
@@ -12,17 +12,17 @@ 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${PN}-version-${PV}"
 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 test"
+SLOT="0"
+IUSE="doc jpeg opengl"
 
 RDEPEND="
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -33,10 +33,8 @@ RDEPEND="
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXmu[${MULTILIB_USEDEP}]
 	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
@@ -60,8 +58,6 @@ multilib_src_configure() {
 
 		# Doxygen
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-
-		-DJAS_ENABLE_PROGRAMS=$(usex test)
 	)
 	cmake-utils_src_configure
 }