gentoo resync : 29.05.2018

4 files changed, 16 insertions, 18 deletions

diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index dc3eb261bf64..12c6ad3e37b9 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,5 +1,5 @@
-AUX libptp2-1.1.10-configure.patch 1119 BLAKE2B 6a688f8ec540f0b6e1f8a0a52295ccbc5e16cdcfc27786c5169fdbb27bebbbe819d2b59c4c0aced5f4759031966b2eb2195aa2a626395d6126559acd9ddeb5e5 SHA512 1bfab2967ac108c2329ea83d86ddf80bab0a778f4ccfed32866503d37f1ac99aefdd479565152a306b9f2a1403401416fb7b243aa25baf99e07acd766fbad33b
-AUX libptp2-1.1.10-makefile.patch 373 BLAKE2B 2f119df2f91b0286bbf8e6d5e2ea79c0fb37c956040a55aa2c4b51c8beb1d976a8a444b1ad860c6554395d7fb39f63102e7dcbaabf20ea64b9f5925be5c137ef SHA512 6567cf03c85e73a1f3dbbea8fb2bef6539491ffe1a729efbf5ae93e5e5ff0efda9634ebac1b7d33db16432fa7cae20cdbea5839da0179997df0cfa3e709a0a01
+AUX libptp2-1.1.10-configure.patch 1088 BLAKE2B 850c6cae1dbeff2f445c5c5bee6a2d0f3b26ca75579d42727e92225c3a58f7197fb7c57634595b15e094a273f5c8c9199f2d8f16a47d849398b91798603b17bb SHA512 3680f6166736816595ebf85c1bf0435d3db8c38c5efa2e60d35df61ed77e8d5204eb25d64bc317ba982a1319afde55d02e1438f67e19b4869e00135d5873a43e
+AUX libptp2-1.1.10-makefile.patch 342 BLAKE2B 956fc9c05873ec4906d86a705cbd298d0fa99c97ff2ab509a6f6dec10d2c165b38c0a92540df4e54bd70f5378822de680b5781ab7b766ad8a051e4ec932c840e SHA512 7d81142155a61821ce2bce4b8999720685b996fa84f95615e9c83b7b8e3b320afa1275fc565307ffc3cc09de8d29441d2155a76b7365a58f065fea751681cf5b
 DIST libptp2-1.1.10.tar.gz 380767 BLAKE2B 479739abc45d8feff4dd0f70fbee1ac7ad24f78aec99ad176858e8b835cef73135ae3537ffe000cf8321a91e4437cc2606ddaf4f24c8725bc4e2540baddfc4d8 SHA512 9c6140c389f995d08cf49e5215e407131f51b17fc901e47c5ee675d9fff9d49075554ebc21549b239013fd7d2bd5ab8fb8ad9645ded149901479f6b85c808d44
-EBUILD libptp2-1.1.10.ebuild 686 BLAKE2B f98f1fed9344500350363fe4f490b97179100575b00d6394c575ced4ea22b32b018899dc740ba6662319bc42d139551c0429fcf7dcacbe61f475538535e3c5d4 SHA512 63253a72f1d6ada12dbbb1cc000e4b315668e7cc96cc9b2755ed116cf424b7feec7fb3aaf68c8f9f1f82fa4df4a00c1a887e75c3389eed261defc96da4c88e7c
+EBUILD libptp2-1.1.10.ebuild 630 BLAKE2B 5ac252b4b4471c166f8ef4b099737b3e678766ecaf3b8a91f0dd65383bbe76e3ee34864ffab2c27a6f4fed3abdecd920a89f73b8c60e09d5aab0edcc278f81f3 SHA512 4fc5256bcc4f29e91860e3f68e491968f392954e5771b02456ea206e7e55ee002c7551c680031e440481829d80cf190204efd409d075424f817214e770c240c6
 MISC metadata.xml 248 BLAKE2B 971b392f3b96576417ef6c659ac405ad884d73547191b312ea466790e3827ded89f585758471e52acb356ad7271b27cd033861f900519bcd1897aa2cf7cb469a SHA512 205bb9045d9fdc9cc2eaa9e7f67694a70ecd74934a9067a6de0413edbed1a1a651d8658f9d61f4a3671858445ab82616883fb6236c499072e3d6223971ac9477
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 d8f1260f5e34..5036ff683cbf 100644
--- 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 0e7b5adec8fc..19fd2590ee28 100644
--- 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 e41d7e0a657b..53c5e01c7093 100644
--- 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,18 +16,16 @@ 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
 }
 
 src_test() {
 	env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}