Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/stk/, media-libs/stk/files/stk-4.5.1/
Date: Tue, 01 May 2018 21:31:15
Message-Id: 1525210243.afbe6249505f8f74b452058d59e4729f45be5dcd.monsieurp@gentoo
1 commit: afbe6249505f8f74b452058d59e4729f45be5dcd
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Sat Apr 21 12:25:26 2018 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue May 1 21:30:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afbe6249
7
8 media-libs/stk: epatch->PATCHES=() / default.
9
10 Package-Manager: Portage-2.3.31, Repoman-2.3.9
11
12 media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch | 6 ++----
13 media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch | 6 ++----
14 media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch | 6 ++----
15 media-libs/stk/stk-4.5.1-r1.ebuild | 8 +++++---
16 4 files changed, 11 insertions(+), 15 deletions(-)
17
18 diff --git a/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch b/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
19 index 3fcc28fb763..b816f3acae6 100644
20 --- a/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
21 +++ b/media-libs/stk/files/stk-4.5.1/010_all_removeForcedFlags.patch
22 @@ -1,7 +1,5 @@
23 -Index: stk-4.4.3/configure.ac
24 -===================================================================
25 ---- stk-4.4.3.orig/configure.ac
26 -+++ stk-4.4.3/configure.ac
27 +--- a/configure.ac
28 ++++ b/configure.ac
29 @@ -65,7 +65,7 @@ if test "$debug" = "yes"; then
30 else
31 AC_SUBST( debug, [no] )
32
33 diff --git a/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch b/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
34 index 77d643593b4..59990650b61 100644
35 --- a/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
36 +++ b/media-libs/stk/files/stk-4.5.1/020_all_noExamplesOrDemo.patch
37 @@ -1,7 +1,5 @@
38 -Index: stk-4.5.0/Makefile.in
39 -===================================================================
40 ---- stk-4.5.0.orig/Makefile.in
41 -+++ stk-4.5.0/Makefile.in
42 +--- a/Makefile.in
43 ++++ b/Makefile.in
44 @@ -6,35 +6,14 @@ REALTIME = @realtime@
45
46 all :
47
48 diff --git a/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch b/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
49 index d2cc4e5be33..23defa39d37 100644
50 --- a/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
51 +++ b/media-libs/stk/files/stk-4.5.1/050_all_cxxflags.patch
52 @@ -1,7 +1,5 @@
53 -Index: stk-4.5.0/configure.ac
54 -===================================================================
55 ---- stk-4.5.0.orig/configure.ac
56 -+++ stk-4.5.0/configure.ac
57 +--- a/configure.ac
58 ++++ b/configure.ac
59 @@ -100,7 +100,7 @@ fi
60 CPPFLAGS="$CPPFLAGS $cppflag"
61
62
63 diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.5.1-r1.ebuild
64 index 8d6a4005c32..53e78246741 100644
65 --- a/media-libs/stk/stk-4.5.1-r1.ebuild
66 +++ b/media-libs/stk/stk-4.5.1-r1.ebuild
67 @@ -20,10 +20,12 @@ DEPEND="${RDEPEND}
68 virtual/pkgconfig
69 dev-lang/perl"
70
71 -src_prepare() {
72 - EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
73 - eapply_user
74 +PATCHES=(
75 + "${FILESDIR}/${P}"
76 +)
77
78 +src_prepare() {
79 + default
80 eautoreconf
81 }