[gentoo-commits] repo/gentoo:master commit in: dev-vcs/stgit/

[Yixun Lan]

commit:     9378b27076d7b333fdf267668a4f6fb5e8de79aa
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 01:28:08 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 01:29:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9378b270

dev-vcs/stgit: drop epatch from EAPI=6

replace epatch with eapply for EAPI=6

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-vcs/stgit/Manifest          | 6 +++---
 dev-vcs/stgit/stgit-0.18.ebuild | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index c1234aaaea7..eb2e3a71aaf 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,5 @@
 DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 
f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 
29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1
 WHIRLPOOL 
c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194
 DIST stgit-0.16.tar.gz 362687 SHA256 
02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 
782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd
 WHIRLPOOL 
e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1
-DIST stgit-0.17.1-upstream-patches-1.tar.xz 15324 SHA256 
4ec973ee6a16daee616c5f675294e9351e4953b4d171059cddb504d286939cd3 SHA512 
2d756d960b5bd803258afe0bb89cb29a960bc2745adf37f2b574fd114579a867ec51628f2267744ec2eec70090376274bfd720a612093a36f4bb8e4ecb8f6d30
 WHIRLPOOL 
538a060e8628b9d43af56568a267c2026a9088156af188d5a745adfbb11807dcf948f216e6492d51069c85e80985f156196df6b28eb2664b3e5e27a09b169c57
-DIST stgit-0.17.1.tar.gz 398466 SHA256 
d43365a0c22e41a6fb9ba1a86de164d6475e79054e7f33805d6a829eb4056ade SHA512 
3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe
 WHIRLPOOL 
a7c4c83cfeace12ced60e846ed9daaffadea3ed201a90e72239e3f8df310164e00ce5a89174df177f89df4a609a66ac35e905f31419ed654081c3ab0c2cba859
-DIST stgit-0.18.tar.gz 235852 SHA256 
00c83a0a057ee61a300f2291b8926f85521ffd1c92b4cb5152e2be3bf836d3a5 SHA512 
5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f
 WHIRLPOOL 
330f97dd43cc0c617d2cdd5eafccf332e1e1debf916d596370f75b02b6a77abc22f0543f397d72f1db3c4a0a539221d2eee4ab82db9c983607108ae15bb2f18d
+DIST stgit-0.17.1-upstream-patches-1.tar.xz 15324 BLAKE2B 
c312121484bd0c309a7dc6d9bd7e99e9cc99672bee2d84c03ba2c1add04a62f972a6ca7802ab1488bed1237c35e85360a10adcc1eff6bc212719997d251ac7a4
 SHA512 
2d756d960b5bd803258afe0bb89cb29a960bc2745adf37f2b574fd114579a867ec51628f2267744ec2eec70090376274bfd720a612093a36f4bb8e4ecb8f6d30
+DIST stgit-0.17.1.tar.gz 398466 BLAKE2B 
8ecd7a6a74df85219fb5ded03b3a8f956ec0978dce4a921998688d01a35e38410dda3f59b9f6fa1ebbba22438e77b630a281af311acafc1b7455e308b45a86f9
 SHA512 
3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe
+DIST stgit-0.18.tar.gz 235852 BLAKE2B 
ff35856c1f20a6a611a2faa22ba573b1c33636c9e913322456011c4c5a73c3207ddbd8bfe41cb81b11dffe8db8b89594c1598989ae9fb896cd686594a21d96b2
 SHA512 
5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f

diff --git a/dev-vcs/stgit/stgit-0.18.ebuild b/dev-vcs/stgit/stgit-0.18.ebuild
index 9ecaaef6894..e56d0dbace5 100644
--- a/dev-vcs/stgit/stgit-0.18.ebuild
+++ b/dev-vcs/stgit/stgit-0.18.ebuild
@@ -47,11 +47,8 @@ pkg_setup() {
 
 python_prepare_all() {
        # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
+       [[ -n ${UPSTREAM_VER} ]] && \
+               eapply "${WORKDIR}"/patches-upstream
 
        # this will be a noop, as we are working with a tarball,
        # but throws git errors --> just get rid of it