media-gfx/autopano-sift-C: EAPI-6 bump, drop superfluous versionator

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index 3e9405ae1588a1f736b65d3b2d0216ed1cf33651..6bf149ec6034c9850fe0d441ece4cb07492c2409 100644 (file)
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils versionator
+EAPI=6
+
+inherit cmake-utils
 
 DESCRIPTION="SIFT algorithm for automatic panorama creation in C"
 HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
@@ -13,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)"
-
-RDEPEND="!media-gfx/autopano-sift
+DEPEND="
        dev-libs/libxml2
        media-libs/libpano13:0=
        media-libs/libpng:0=
        media-libs/tiff:0=
        sys-libs/zlib
        virtual/jpeg:0"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+       !media-gfx/autopano-sift
+"
 
 PATCHES=( "${FILESDIR}"/${P}-lm.patch )

diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
index 97619975d9b64edf72bc98cafbf3774792f590a6..e6141fffc0aeb609b30ab7006969d831e3ecbd48 100644 (file)
--- a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch
@@ -1,8 +1,8 @@
 Link against -lm (mathlib) because ScaleSpace.c (which is part of the internal libsift.a)
 is using the exp() function, see http://bugs.gentoo.org/472150
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -121,7 +121,7 @@
  
  ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES})