media-libs/libptp2: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
index d8f1260f5e340d418251d383a75702c5c9728b65..5036ff683cbff89ac779e963173f132ed3f06ca6 100644 (file)
--- a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
+++ b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
@@ -1,5 +1,5 @@
---- libptp2-1.1.10/configure.in.orig   2007-12-28 10:28:36.000000000 +1100
-+++ libptp2-1.1.10/configure.in        2007-12-28 10:36:14.000000000 +1100
+--- a/configure.in     2007-12-28 10:28:36.000000000 +1100
++++ b/configure.in     2007-12-28 10:36:14.000000000 +1100
 @@ -25,6 +25,10 @@
  
  # Checks for programs.

diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
index 0e7b5adec8fc860ee0d1943d9c45ef1aed4f4335..19fd2590ee2833966417dee9f2e5f635cc75218d 100644 (file)
--- a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
+++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
@@ -1,5 +1,5 @@
---- libptp2-1.1.10.orig/src/Makefile.am        2005-11-01 02:39:40.000000000 +1100
-+++ libptp2-1.1.10/src/Makefile.am     2007-12-28 09:51:01.000000000 +1100
+--- a/src/Makefile.am  2005-11-01 02:39:40.000000000 +1100
++++ b/src/Makefile.am  2007-12-28 09:51:01.000000000 +1100
 @@ -17,7 +17,7 @@
  else 
  ptpcam_SOURCES = ptpcam.c ptpcam.h

diff --git a/media-libs/libptp2/libptp2-1.1.10.ebuild b/media-libs/libptp2/libptp2-1.1.10.ebuild
index e41d7e0a657b2ae92a3050f42ce9640512212aec..ceffdf3f139f816d4049ac7824fe73ec9ee1f368 100644 (file)
--- a/media-libs/libptp2/libptp2-1.1.10.ebuild
+++ b/media-libs/libptp2/libptp2-1.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+inherit autotools
 
 DESCRIPTION="Library and client to communicate with cameras via PTP"
 HOMEPAGE="https://sourceforge.net/projects/libptp/"
@@ -16,11 +16,13 @@ IUSE=""
 RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${P}-makefile.patch \
-               "${FILESDIR}"/${P}-configure.patch
+PATCHES=(
+       "${FILESDIR}/${P}-makefile.patch"
+       "${FILESDIR}/${P}-configure.patch"
+)
 
+src_prepare() {
+       default
        AT_M4DIR="m4" eautoreconf
 }
 
@@ -30,4 +32,5 @@ src_test() {
 
 src_install() {
        emake DESTDIR="${D}" install || die
+       default
 }