gentoo resync : 15.09.2018

3 files changed, 2 insertions, 79 deletions

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 75addfcc6b16..6c80989a6f6a 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,7 +1,6 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 1952 BLAKE2B 9808eab663351d512cc39795b76a7f80b0ae4a9df3a05b963a331f52c4ade9f5bd504d1a06a61792c45d0c839951e184b23b7add6affc50e36dfeca662c6f362 SHA512 2daa1f1b746dc0e0dc6344322744f7bdd1577a8e535bed6a801ea5ebc90f402364fa7127a9c5879cf70182da1bec711036d7393c7a55b90a9849e87618d2309c
-EBUILD openjpeg-1.5.2.ebuild 1976 BLAKE2B bd26fc11be332bfd1fe76224f954dec1a7cece04e39f2b7efb53b8c562927ad7e8eb9805bd76764dac4199f3dde7d86fd68073618a0ed107900079c359a05f7d SHA512 fc47ec23e0b47b90a5aeff8a1c0eed45a666068fc13f3528a382958dd30fc001b5c8d924ab8d456dcb6627ec79a0489b0677ae61879ff07f653cde2314572976
+EBUILD openjpeg-1.5.2-r1.ebuild 1950 BLAKE2B 5b4ef91a75eb0f8196c49fc96c8801b41aa56023beef1ade06288a4c0a2e18671c8f3502fea5062fdeb5bd80a4f413c81795866f1560934b376e342207fc46b9 SHA512 37659e14af22aa43470897c3a057c7b7afe445982cac3967bdff0d669ae80420f354482e3b8a1c384665a8b0baa1e5985c136cde8de3337ce0d9bce0753b46fb
 EBUILD openjpeg-2.3.0.ebuild 4071 BLAKE2B 784812951b98f3f4fd114ab22961e10422313202006b2b4ad64fc0104225ccaa7294b1f5718b2e4196da8b33d3fdf3116ec39eb7d4eeec812f4c63d48afe4048 SHA512 70aa6abd0d7be04667f3ec4ee8605637c588a436555dcbfaa63d38406a659810c5d5bb9e4ceafff6714f0d5d64bfd943e41b80f175d4abd78cc211de060460e6
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 5d368bee1fc8..d0044af48162 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/openjpeg/openjpeg-1.5.2.ebuild b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
deleted file mode 100644
index c2d195857f43..000000000000
--- a/media-libs/openjpeg/openjpeg-1.5.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
-SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5" # based on SONAME
-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 ~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 CHANGES NEWS README THANKS )
-
-RESTRICT="test" #409263
-
-src_prepare() {
-	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
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		$(cmake-utils_use_build test TESTING)
-		)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=( $(cmake-utils_use_build doc) )
-	else
-		mycmakeargs+=( -DBUILD_CODEC=OFF )
-	fi
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			$(cmake-utils_use_build test TESTING)
-			-DBUILD_SHARED_LIBS=OFF
-			-DBUILD_CODEC=OFF
-			)
-		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_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-		#static bins overwritten by shared install
-	fi
-
-	cmake-utils_src_install
-
-	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
-	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
-}