Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
Date: Tue, 26 Jul 2016 04:23:33
Message-Id: 1469506819.a7c5ab06bbefa299cdf7b8f2814a8bdd685009f1.radhermit@gentoo
1 commit: a7c5ab06bbefa299cdf7b8f2814a8bdd685009f1
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 26 04:04:46 2016 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 26 04:20:19 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c5ab06
7
8 app-editors/vim-core: version bump to 7.4.2102
9
10 app-editors/vim-core/Manifest | 2 ++
11 .../{vim-core-9999.ebuild => vim-core-7.4.2102.ebuild} | 13 +++++--------
12 app-editors/vim-core/vim-core-9999.ebuild | 13 +++++--------
13 3 files changed, 12 insertions(+), 16 deletions(-)
14
15 diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
16 index de808a2..02bfaa9 100644
17 --- a/app-editors/vim-core/Manifest
18 +++ b/app-editors/vim-core/Manifest
19 @@ -1,5 +1,7 @@
20 DIST vim-7.4.1583.tar.gz 12559634 SHA256 dbe697fcacca5c50535714a31dbd02e7691943491c4004a867edd4a6fcdc9cf5 SHA512 6e049ea8e711382fd4f69360afaeac904ad7721ccb7bf9990754983efd66963e1bc24919483ac8f4cbededcd22e1e58c2e246d524f059a0648600e49b550fc2b WHIRLPOOL a4e18bfa89b1a2620e96b6688cac41bed8d68d3adb7f8c7b3580a9ae40df0c39d612c051c73b2b91cf3d5d18348651e4bd4808f40b44132ebcc648bc554e451f
21 DIST vim-7.4.1821.tar.gz 12565373 SHA256 452b6346f64b23ab0e7483091ddc09b62540f149fa786bdd14d6712d8b66e1cf SHA512 6bc3698c715860837ab264b9312207f85e0c2a603c15eca92678f301175db93195d83d3f26c4815fc6f0757e5051945b88ce415f358b7396520df6231314cc64 WHIRLPOOL 3699966e5c599ca9090486006a8e1bab5720854f9c44fc249f5cb31d6198e048a6523697ce6416c835154c737ffab87482a72ebe1af321874eef3461b69de90b
22 +DIST vim-7.4.2102-gentoo-patches.tar.bz2 2308 SHA256 1928059fe173b3abf66a96a8205c2e46b5320639d62385aeeae760e99820da67 SHA512 4e678b214fc7b1be89728b8151335ca8af332e8b0c0e25c27287a38ad5ccf14d5dcf82d5dd86af9aa502df4fae986aba98104f150b49a880e34f8283e8e63574 WHIRLPOOL 8a53a8980418f16f8c7883409dea49cfc758fc29dcfaab36f1bd6ae53b32211870a95361c8b63cdfe50795ea11958b113c9909ed6d29de5cb3696efc6ff7888b
23 +DIST vim-7.4.2102.tar.gz 12838026 SHA256 19c059b2d0e61effcd288e2a18969017cbbc031cf19fe775b3f4b4c42bda2578 SHA512 9cf80b1c9e2dd8713b9ba33c39917a8771c7378ae59c2dc1809bf0cabc4545547ad0a5b9f0b87cef2b34f6d1f72b135d1217495716fc482a70a16e1097bd88a2 WHIRLPOOL 301d41e9bf9a6a220776d6e32ab2918c6a8aaf33862725fba9c738e0c99921e631d8c2fdfd9bc2dc9a214a9124ecfa113081a86addf79b023e8421471843f869
24 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
25 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
26 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
27
28 diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-7.4.2102.ebuild
29 similarity index 95%
30 copy from app-editors/vim-core/vim-core-9999.ebuild
31 copy to app-editors/vim-core/vim-core-7.4.2102.ebuild
32 index 5e2f6a1..a3e437e 100644
33 --- a/app-editors/vim-core/vim-core-9999.ebuild
34 +++ b/app-editors/vim-core/vim-core-7.4.2102.ebuild
35 @@ -2,7 +2,7 @@
36 # Distributed under the terms of the GNU General Public License v2
37 # $Id$
38
39 -EAPI=5
40 +EAPI=6
41 VIM_VERSION="7.4"
42 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
43
44 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
45 EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
46 else
47 SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
48 - https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
49 + https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-gentoo-patches.tar.bz2"
50 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
51 fi
52
53 @@ -40,11 +40,8 @@ pkg_setup() {
54
55 src_prepare() {
56 if [[ ${PV} != 9999* ]] ; then
57 - if [[ -d "${WORKDIR}"/patches/ ]]; then
58 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
59 - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
60 - epatch "${WORKDIR}"/patches/
61 - fi
62 + # Gentoo patches to fix runtime issues, cross-compile errors, etc
63 + eapply "${WORKDIR}"/patches
64 fi
65
66 # Fixup a script to use awk instead of nawk
67 @@ -93,7 +90,7 @@ src_prepare() {
68 "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
69 fi
70
71 - epatch_user
72 + default
73 }
74
75 src_configure() {
76
77 diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
78 index 5e2f6a1..a3e437e 100644
79 --- a/app-editors/vim-core/vim-core-9999.ebuild
80 +++ b/app-editors/vim-core/vim-core-9999.ebuild
81 @@ -2,7 +2,7 @@
82 # Distributed under the terms of the GNU General Public License v2
83 # $Id$
84
85 -EAPI=5
86 +EAPI=6
87 VIM_VERSION="7.4"
88 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
89
90 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
91 EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
92 else
93 SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
94 - https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
95 + https://dev.gentoo.org/~radhermit/vim/vim-7.4.2102-gentoo-patches.tar.bz2"
96 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
97 fi
98
99 @@ -40,11 +40,8 @@ pkg_setup() {
100
101 src_prepare() {
102 if [[ ${PV} != 9999* ]] ; then
103 - if [[ -d "${WORKDIR}"/patches/ ]]; then
104 - # Gentoo patches to fix runtime issues, cross-compile errors, etc
105 - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
106 - epatch "${WORKDIR}"/patches/
107 - fi
108 + # Gentoo patches to fix runtime issues, cross-compile errors, etc
109 + eapply "${WORKDIR}"/patches
110 fi
111
112 # Fixup a script to use awk instead of nawk
113 @@ -93,7 +90,7 @@ src_prepare() {
114 "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
115 fi
116
117 - epatch_user
118 + default
119 }
120
121 src_configure() {