From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-gfx/exiv2/Manifest | 4 +- media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild | 123 ------------------------- media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild | 2 +- 3 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild (limited to 'media-gfx/exiv2') diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 82dbc1f7e402..da0e74ac925e 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -4,9 +4,7 @@ AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f9 AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601 AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1 -DIST exiv2-0.26_p20180811c.tar.xz 1723668 BLAKE2B 0bbba3d04ca063f62797ce5bd9a1a39f87c5ed26ed9eecb73fb11051660c761d2c56dec392d73d3a33573599efa95790d84d59b3c4da3122a1eb564f5978ef65 SHA512 4a7bc11805e204b541819f434defc48ff579b2c84c9504d6c7826a3808f73cda3d68f357a179f14a8277e6a338c3bb94c9e63da9f61a5ea3c548e0ad93df56ce DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e -EBUILD exiv2-0.26_p20180811-r2.ebuild 2965 BLAKE2B 1db92fecf0e2be08f6c4219dc886735f26e3de9883f022a7f617dcee673ea07d3de323f558130b2da6f3180f7fa7455fa47344034ecc20924c78f8a64fbd9b92 SHA512 6086fc058ecb086b31b5a9f178af906c778e371852782f4300c0e4b543e35557792aa8229120882e1401e31c32352bf27855a1f7c822396321ba6aecded8922a -EBUILD exiv2-0.26_p20180811-r3.ebuild 2961 BLAKE2B 7ac5441be6b96e7ff9191c2f5b7c953d2e381241cd8e05af07a7c558fb8fbd80801ee49fcfd4ff84afcfa071105f137421ef3dba58a57cbd9d931860be80be44 SHA512 54b789d32aeba8b9cbc7f9ed0e78434ec1ea13f937292bce62f8d887baf1b368dc42b3c454bb52705650760a9a4d02f5f0c34b0b2ab4ee220e0ef0b537ac039c +EBUILD exiv2-0.26_p20180811-r3.ebuild 2958 BLAKE2B e575cfe4350b3da0c49b483c79b710033284c856e94b4d08224676e42f0f49d91e3c18f2c44cd4694a802f415b58f31821ee9cd48499247ed9019ae7ac7b2734 SHA512 1a6c1f9c26671c9ce187b1bbe174900382ed185bced5d4fd123308c1eddb7707632a3282328e48ccc50e3f9b2350a9ff34ef025e17f6563714ecb135da2ba17f MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild deleted file mode 100644 index ec7d78e78566..000000000000 --- a/media-gfx/exiv2/exiv2-0.26_p20180811-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit cmake-multilib python-any-r1 - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" -SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}c.tar.xz" - -LICENSE="GPL-2" -SLOT="0/26" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="doc examples nls png webready xmp" - -RDEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - webready? ( - net-libs/libssh[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - doc? ( - ${PYTHON_DEPS} - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README doc/ChangeLog doc/cmd.txt ) - -PATCHES=( - # TODO: Take to upstream - "${FILESDIR}"/${PN}-0.26-fix-docs.patch - "${FILESDIR}"/${PN}-0.26-tools-optional.patch -) - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} != *9999 ]] ; then - if [[ -d po ]] ; then - pushd po > /dev/null || die - local lang - for lang in *.po; do - if [[ -e ${lang} ]] \ - && ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then - case ${lang} in - CMakeLists.txt | \ - ${PN}.pot) ;; - *) rm -r ${lang} || die ;; - esac - fi - done - popd > /dev/null || die - else - die "Failed to prepare LINGUAS - po directory moved?" - fi - fi - - # FIXME @upstream: - einfo "Converting doc/cmd.txt to UTF-8" - iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - if use doc; then - einfo "Updating doxygen config" - doxygen &>/dev/null -u config/Doxyfile || die - fi - - edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_ENABLE_BUILD_SAMPLES=NO - -DEXIV2_ENABLE_BUILD_PO=$(usex nls) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_SSH=$(usex webready) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - -DEXIV2_ENABLE_LIBXMP=NO - $(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO) - ) - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - if multilib_is_native_abi; then - use doc && emake -j1 doc - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - use doc && HTML_DOCS=( "${S}"/doc/html/. ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild index abb5993997d6..589539b78afd 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz" LICENSE="GPL-2" SLOT="0/26" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x64-solaris ~x86-solaris" IUSE="doc examples nls png webready xmp" RDEPEND=" -- cgit v1.2.3