| 1 |
commit: 26d39ee7495db76e0c377ded8753dbf5a2c7305c |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 18:41:53 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 20:31:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d39ee7 |
| 7 |
|
| 8 |
media-libs/libptp2: bump EAPI and drop eutils |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
media-libs/libptp2/files/libptp2-1.1.10-configure.patch | 4 ++-- |
| 13 |
media-libs/libptp2/files/libptp2-1.1.10-makefile.patch | 4 ++-- |
| 14 |
media-libs/libptp2/libptp2-1.1.10.ebuild | 17 ++++++++++------- |
| 15 |
3 files changed, 14 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch |
| 18 |
index d8f1260f5e3..5036ff683cb 100644 |
| 19 |
--- a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch |
| 20 |
+++ b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
---- libptp2-1.1.10/configure.in.orig 2007-12-28 10:28:36.000000000 +1100 |
| 23 |
-+++ libptp2-1.1.10/configure.in 2007-12-28 10:36:14.000000000 +1100 |
| 24 |
+--- a/configure.in 2007-12-28 10:28:36.000000000 +1100 |
| 25 |
++++ b/configure.in 2007-12-28 10:36:14.000000000 +1100 |
| 26 |
@@ -25,6 +25,10 @@ |
| 27 |
|
| 28 |
# Checks for programs. |
| 29 |
|
| 30 |
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch |
| 31 |
index 0e7b5adec8f..19fd2590ee2 100644 |
| 32 |
--- a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch |
| 33 |
+++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch |
| 34 |
@@ -1,5 +1,5 @@ |
| 35 |
---- libptp2-1.1.10.orig/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100 |
| 36 |
-+++ libptp2-1.1.10/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100 |
| 37 |
+--- a/src/Makefile.am 2005-11-01 02:39:40.000000000 +1100 |
| 38 |
++++ b/src/Makefile.am 2007-12-28 09:51:01.000000000 +1100 |
| 39 |
@@ -17,7 +17,7 @@ |
| 40 |
else |
| 41 |
ptpcam_SOURCES = ptpcam.c ptpcam.h |
| 42 |
|
| 43 |
diff --git a/media-libs/libptp2/libptp2-1.1.10.ebuild b/media-libs/libptp2/libptp2-1.1.10.ebuild |
| 44 |
index e41d7e0a657..ceffdf3f139 100644 |
| 45 |
--- a/media-libs/libptp2/libptp2-1.1.10.ebuild |
| 46 |
+++ b/media-libs/libptp2/libptp2-1.1.10.ebuild |
| 47 |
@@ -1,8 +1,8 @@ |
| 48 |
-# Copyright 1999-2017 Gentoo Foundation |
| 49 |
+# Copyright 1999-2018 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=2 |
| 53 |
-inherit autotools eutils |
| 54 |
+EAPI=6 |
| 55 |
+inherit autotools |
| 56 |
|
| 57 |
DESCRIPTION="Library and client to communicate with cameras via PTP" |
| 58 |
HOMEPAGE="https://sourceforge.net/projects/libptp/" |
| 59 |
@@ -16,11 +16,13 @@ IUSE="" |
| 60 |
RDEPEND="virtual/libusb:0" |
| 61 |
DEPEND="${RDEPEND}" |
| 62 |
|
| 63 |
-src_prepare() { |
| 64 |
- epatch \ |
| 65 |
- "${FILESDIR}"/${P}-makefile.patch \ |
| 66 |
- "${FILESDIR}"/${P}-configure.patch |
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}/${P}-makefile.patch" |
| 69 |
+ "${FILESDIR}/${P}-configure.patch" |
| 70 |
+) |
| 71 |
|
| 72 |
+src_prepare() { |
| 73 |
+ default |
| 74 |
AT_M4DIR="m4" eautoreconf |
| 75 |
} |
| 76 |
|
| 77 |
@@ -30,4 +32,5 @@ src_test() { |
| 78 |
|
| 79 |
src_install() { |
| 80 |
emake DESTDIR="${D}" install || die |
| 81 |
+ default |
| 82 |
} |
Archives