[gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/

[Aaron Bauman]

commit:     4f0bb96ef4debf9249c992484c062b3f9521e44e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 23:42:27 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 23:42:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0bb96e

media-libs/openjpeg: drop vulnerable wrt bug #630120

 media-libs/openjpeg/Manifest                       |   5 -
 .../openjpeg/openjpeg-2.1.1_p20160922.ebuild       | 134 ---------------------
 media-libs/openjpeg/openjpeg-2.1.2.ebuild          | 130 --------------------
 media-libs/openjpeg/openjpeg-2.2.0.ebuild          | 130 --------------------
 4 files changed, 399 deletions(-)

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index a3c64a2f7c2..62efea271dd 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,8 +1,3 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
-DIST openjpeg-2.1.1_p20160922.tar.gz 2004620 BLAKE2B b28adce364a9f086182e9996eb566429a117ece1548bb1bc2333d44c81283acce2394c8ba45093f7d2799a55c760336d2b12d842863a5782a47ffe2318464a1d SHA512 e4e40297ab36188bf6d375648d4ca1d96946f30fb86bc6a0fc18f7e19c02a08b700007503acef25cdb086562a273c77d94391b715cc364fdba2c8480d3c5fd1d
-DIST openjpeg-2.1.2.tar.gz 1987071 BLAKE2B 6cce60689d8d8431996a323b361a0c9af30db01dbefd0bb60d103921606aa9f6502765afa30463101c1e6af337281783c18d614192a23444e61cff23cacb69b0 SHA512 411067e33c8e4da9921d0281e932a4ac2af592cf822bfad828daea9e2b9c414859455bcec6d912ce76460ea462fa4cbd94a401333bda5716ec017d18b8e5942c
-DIST openjpeg-2.2.0.tar.gz 2847582 BLAKE2B d7987ec235668e4b9aa06f5373b6196d2333a3227ab9637b7a25c984f28f64fd4e347d7a2e61c0a7cd017e696a97db6b272f18ccb1215b0601a26e1c65005c99 SHA512 20651c380bee582ab1950994c424cc00061ad852e9c5438fb32a9809e3f275571a4cc7e92589add0d91debf2394262e58f441c2dd918809fc1c602ed68396a3a
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
-DIST openjpeg-data_20160921.tar.gz 401771303 BLAKE2B f3ce2f4614a5ae19bed58dd46d1eb5855130b339d715893cd30cd2517c8ce12240d28a4ede046b82e6e0c34d199f6e3413f4f81965bbcf5ea9f6bcf5417818ce SHA512 58521c14f49c546b24a0c7b17ebdb3dfecf6ffdcc814b3c59a79a1325e5adf88047b2bd8a4ae608c5d106b584f08efc4e6c66f03254119763e01abee2da7d027
-DIST openjpeg-data_20170809.tar.gz 497454555 BLAKE2B dba7ded4a19f0139c1ad7e716930a7211d24bfb8d0e4387e171172406dd4df8a3a80b535f3df35f0592cac989456d45ebb345b8febc85a52c8eac5020fe50c48 SHA512 7beb0cb944764b526ed7a011ba0c72768e22516950f337f1df713fa6949b1255e800933aebffde81c6ebeedd32050b7d5627112e44bf7d24cab75274c59d7d49
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24

diff --git a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild b/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
deleted file mode 100644
index 38028f5227e..00000000000
--- a/media-libs/openjpeg/openjpeg-2.1.1_p20160922.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cc09dc4e43850b725a2aaf6e1d58cbf45bc2322c"
-
-MY_P_COMMIT="fac916f72a162483a4d6d804fd070fdf32f402ed"
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/${MY_P_COMMIT}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20160921.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-S="${WORKDIR}/${PN}-${MY_P_COMMIT}"
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || die "Failed to rename test data"
-	fi
-
-	cmake-utils_src_prepare
-
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-
-	# Install doxygen docs to the right directory:
-	sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING="$(usex test)"
-			-DBUILD_SHARED_LIBS=OFF
-			-DBUILD_CODEC="$(usex test)"
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_test() {
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local FAILEDTEST=
-		local HAS_UNKNOWN_TEST_FAILURES=0
-		if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; then
-			# Logic copied from $S/tools/travis-ci/run.sh
-
-			echo ""
-
-			awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-			while read FAILEDTEST; do
-				# Common errors
-				if grep -x "${FAILEDTEST}" "${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-					ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-					continue
-				fi
-				eerror "New/unknown test failure found: '${FAILEDTEST}'"
-				HAS_UNKNOWN_TEST_FAILURES=1
-			done < "${FAILURES_LOG}"
-
-			if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-				die "Test suite failed. New/unknown test failure(s) found!"
-			else
-				echo ""
-				einfo "Test suite passed. No new/unknown test failure found!"
-			fi
-
-			return 0
-		fi
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-}

diff --git a/media-libs/openjpeg/openjpeg-2.1.2.ebuild b/media-libs/openjpeg/openjpeg-2.1.2.ebuild
deleted file mode 100644
index bffdb98ee64..00000000000
--- a/media-libs/openjpeg/openjpeg-2.1.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cc09dc4e43850b725a2aaf6e1d58cbf45bc2322c"
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20160921.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || die "Failed to rename test data"
-	fi
-
-	cmake-utils_src_prepare
-
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-
-	# Install doxygen docs to the right directory:
-	sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING="$(usex test)"
-			-DBUILD_SHARED_LIBS=OFF
-			-DBUILD_CODEC="$(usex test)"
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_test() {
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local FAILEDTEST=
-		local HAS_UNKNOWN_TEST_FAILURES=0
-		if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; then
-			# Logic copied from $S/tools/travis-ci/run.sh
-
-			echo ""
-
-			awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-			while read FAILEDTEST; do
-				# Common errors
-				if grep -x "${FAILEDTEST}" "${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-					ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-					continue
-				fi
-				eerror "New/unknown test failure found: '${FAILEDTEST}'"
-				HAS_UNKNOWN_TEST_FAILURES=1
-			done < "${FAILURES_LOG}"
-
-			if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-				die "Test suite failed. New/unknown test failure(s) found!"
-			else
-				echo ""
-				einfo "Test suite passed. No new/unknown test failure found!"
-			fi
-
-			return 0
-		fi
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-}

diff --git a/media-libs/openjpeg/openjpeg-2.2.0.ebuild b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
deleted file mode 100644
index 97799c976dd..00000000000
--- a/media-libs/openjpeg/openjpeg-2.2.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="40f427cb5e8d6b186fa497618532656331d09d0c"
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20170809.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || die "Failed to rename test data"
-	fi
-
-	cmake-utils_src_prepare
-
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-
-	# Install doxygen docs to the right directory:
-	sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING="$(usex test)"
-			-DBUILD_SHARED_LIBS=OFF
-			-DBUILD_CODEC="$(usex test)"
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_test() {
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local FAILEDTEST=
-		local HAS_UNKNOWN_TEST_FAILURES=0
-		if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; then
-			# Logic copied from $S/tools/travis-ci/run.sh
-
-			echo ""
-
-			awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-			while read FAILEDTEST; do
-				# Common errors
-				if grep -x "${FAILEDTEST}" "${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-					ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-					continue
-				fi
-				eerror "New/unknown test failure found: '${FAILEDTEST}'"
-				HAS_UNKNOWN_TEST_FAILURES=1
-			done < "${FAILURES_LOG}"
-
-			if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-				die "Test suite failed. New/unknown test failure(s) found!"
-			else
-				echo ""
-				einfo "Test suite passed. No new/unknown test failure(s) found!"
-			fi
-
-			return 0
-		fi
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-}