[gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/

[Andreas Sturmlechner]

commit:     621ead54fbdb1dc156f1a73eed3b29c875f8fd92
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 03:24:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621ead54

media-gfx/exiv2: Use edos2unix, restore keywords

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-gfx/exiv2/exiv2-0.26_p20180319.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild 
b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 26cb222f277..09c446bf32e 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 else
        COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
        SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> 
${P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~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"
 fi
 inherit cmake-multilib python-any-r1
 
@@ -33,7 +33,6 @@ RDEPEND="
        xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-       app-text/dos2unix
        doc? (
                ${PYTHON_DEPS}
                app-doc/doxygen
@@ -92,7 +91,7 @@ src_prepare() {
                doxygen &>/dev/null -u config/Doxyfile || die
        fi
 
-       dos2unix samples/exiv2json.cpp || die # workaround for CVE-2017-18005 
patch
+       edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch
 
        cmake-utils_src_prepare
 }