1 |
commit: b31404dbb83dac20670f803c81878b5d0643d26e |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 28 08:46:08 2018 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 28 09:08:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b31404db |
7 |
|
8 |
app-editors/vim-core: version bump to 8.1.0648 |
9 |
|
10 |
Move gvim.svg install from gvim to vim-core since vim now uses it as |
11 |
well. |
12 |
|
13 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
14 |
|
15 |
app-editors/vim-core/Manifest | 1 + |
16 |
app-editors/vim-core/files/gvim.svg | 94 ++++++++++++++++++++++ |
17 |
...m-core-9999.ebuild => vim-core-8.1.0648.ebuild} | 7 +- |
18 |
app-editors/vim-core/vim-core-9999.ebuild | 7 +- |
19 |
4 files changed, 105 insertions(+), 4 deletions(-) |
20 |
|
21 |
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest |
22 |
index 100f5698d8f..03ef5c341e2 100644 |
23 |
--- a/app-editors/vim-core/Manifest |
24 |
+++ b/app-editors/vim-core/Manifest |
25 |
@@ -3,3 +3,4 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7 |
26 |
DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 |
27 |
DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 |
28 |
DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e |
29 |
+DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 |
30 |
|
31 |
diff --git a/app-editors/vim-core/files/gvim.svg b/app-editors/vim-core/files/gvim.svg |
32 |
new file mode 100644 |
33 |
index 00000000000..b82742a7901 |
34 |
--- /dev/null |
35 |
+++ b/app-editors/vim-core/files/gvim.svg |
36 |
@@ -0,0 +1,94 @@ |
37 |
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
38 |
+<!-- Created with Inkscape (http://www.inkscape.org/) --> |
39 |
+ |
40 |
+<svg |
41 |
+ xmlns:dc="http://purl.org/dc/elements/1.1/" |
42 |
+ xmlns:cc="http://creativecommons.org/ns#" |
43 |
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
44 |
+ xmlns:svg="http://www.w3.org/2000/svg" |
45 |
+ xmlns="http://www.w3.org/2000/svg" |
46 |
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
47 |
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
48 |
+ width="256" |
49 |
+ height="256" |
50 |
+ id="svg2" |
51 |
+ version="1.1" |
52 |
+ inkscape:version="0.47 r22583" |
53 |
+ sodipodi:docname="vim.svg"> |
54 |
+ <defs |
55 |
+ id="defs4"> |
56 |
+ <inkscape:perspective |
57 |
+ sodipodi:type="inkscape:persp3d" |
58 |
+ inkscape:vp_x="0 : 526.18109 : 1" |
59 |
+ inkscape:vp_y="0 : 1000 : 0" |
60 |
+ inkscape:vp_z="744.09448 : 526.18109 : 1" |
61 |
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1" |
62 |
+ id="perspective10" /> |
63 |
+ <inkscape:perspective |
64 |
+ id="perspective2884" |
65 |
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1" |
66 |
+ inkscape:vp_z="1 : 0.5 : 1" |
67 |
+ inkscape:vp_y="0 : 1000 : 0" |
68 |
+ inkscape:vp_x="0 : 0.5 : 1" |
69 |
+ sodipodi:type="inkscape:persp3d" /> |
70 |
+ </defs> |
71 |
+ <sodipodi:namedview |
72 |
+ id="base" |
73 |
+ pagecolor="#ffffff" |
74 |
+ bordercolor="#666666" |
75 |
+ borderopacity="1.0" |
76 |
+ inkscape:pageopacity="0.0" |
77 |
+ inkscape:pageshadow="2" |
78 |
+ inkscape:zoom="0.7" |
79 |
+ inkscape:cx="107.83967" |
80 |
+ inkscape:cy="146.01885" |
81 |
+ inkscape:document-units="px" |
82 |
+ inkscape:current-layer="layer1" |
83 |
+ showgrid="false" |
84 |
+ inkscape:window-width="743" |
85 |
+ inkscape:window-height="605" |
86 |
+ inkscape:window-x="88" |
87 |
+ inkscape:window-y="321" |
88 |
+ inkscape:window-maximized="0" /> |
89 |
+ <metadata |
90 |
+ id="metadata7"> |
91 |
+ <rdf:RDF> |
92 |
+ <cc:Work |
93 |
+ rdf:about=""> |
94 |
+ <dc:format>image/svg+xml</dc:format> |
95 |
+ <dc:type |
96 |
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
97 |
+ <dc:title></dc:title> |
98 |
+ </cc:Work> |
99 |
+ </rdf:RDF> |
100 |
+ </metadata> |
101 |
+ <g |
102 |
+ inkscape:label="Layer 1" |
103 |
+ inkscape:groupmode="layer" |
104 |
+ id="layer1" |
105 |
+ transform="translate(0,-796.36218)"> |
106 |
+ <path |
107 |
+ style="fill:#19953f;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
108 |
+ d="M 128.02596,805.31213 8.0259779,926.7407 127.31168,1046.0264 l 120,-120.71427 -119.28572,-120 z" |
109 |
+ id="path2890" /> |
110 |
+ <path |
111 |
+ style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
112 |
+ d="m 26.24294,816.92274 -5,5 0,19.28572 5.446429,5.26785 7.232142,0.17858 0.178571,168.12501 7.142857,7.1429 22.142858,0 177.142853,-180.00006 0,-18.57143 -5,-5 -80,-0.71428 -5,7.14285 0,15.71429 5,6.42857 6.42857,0 -62.142855,60.00001 0.625005,-59.73215 7.14285,-10e-6 5.80357,-5.98214 0,-15.71429 -6.42857,-7.14286 -80.71428,-1.42857 0,10e-6 z" |
113 |
+ id="path3664" |
114 |
+ sodipodi:nodetypes="cccccccccccccccccccccccc" /> |
115 |
+ <path |
116 |
+ style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
117 |
+ d="m 136.90826,933.24978 4.28572,-3.57143 12.14285,0.35715 3.92857,3.92857 -4.28571,12.14286 -3.57143,3.21428 -12.64794,-0.14794 -3.42349,-4.13777 3.57143,-11.78572 z" |
118 |
+ id="path3666" |
119 |
+ sodipodi:nodetypes="ccccccccc" /> |
120 |
+ <path |
121 |
+ style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
122 |
+ d="m 121.90826,956.10693 28.57143,0.35714 -15,45.00003 5.35714,0 -3.21428,8.9285 -26.78572,-0.3571 14.64286,-43.21429 -7.14286,0.35714 3.57143,-11.07142 z" |
123 |
+ id="path3668" /> |
124 |
+ <path |
125 |
+ style="fill:#d0d0cf;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
126 |
+ d="m 157.2654,956.46407 -3.71936,9.68618 6.82905,0 -15.25254,44.24235 23.57143,0 3.40554,-8.7193 -6.11475,-0.4005 8.42349,-26.2373 15,-0.35715 -11.07143,34.99995 23.15301,0.3572 2.91579,-8.2576 -5.56371,-0.1633 9.13777,-26.5791 12.85714,0 -11.07143,35 24.32904,0.2525 3.00508,-8.2729 -5.81626,-0.1939 11.69643,-37.14285 -4.64286,-7.5 -14.64285,0 -5.71429,5.71429 -5.71429,0 -6.07142,-6.07143 -12.5,0 -5.35715,5.35714 -6.07143,0 -6.07142,-5.71428 -18.92858,0 z" |
127 |
+ id="path3670" |
128 |
+ sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> |
129 |
+ </g> |
130 |
+</svg> |
131 |
|
132 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-8.1.0648.ebuild |
133 |
similarity index 96% |
134 |
copy from app-editors/vim-core/vim-core-9999.ebuild |
135 |
copy to app-editors/vim-core/vim-core-8.1.0648.ebuild |
136 |
index 49bba1db86d..3c18feca903 100644 |
137 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
138 |
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild |
139 |
@@ -1,9 +1,9 @@ |
140 |
-# Copyright 1999-2018 Gentoo Foundation |
141 |
+# Copyright 1999-2018 Gentoo Authors |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
|
144 |
EAPI=6 |
145 |
VIM_VERSION="8.1" |
146 |
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix |
147 |
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop |
148 |
|
149 |
if [[ ${PV} == 9999* ]] ; then |
150 |
inherit git-r3 |
151 |
@@ -201,6 +201,9 @@ src_install() { |
152 |
fi |
153 |
|
154 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
155 |
+ |
156 |
+ # install gvim icon since both vim/gvim desktop files reference it |
157 |
+ doicon -s scalable "${FILESDIR}"/gvim.svg |
158 |
} |
159 |
|
160 |
pkg_postinst() { |
161 |
|
162 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
163 |
index 49bba1db86d..3c18feca903 100644 |
164 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
165 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
166 |
@@ -1,9 +1,9 @@ |
167 |
-# Copyright 1999-2018 Gentoo Foundation |
168 |
+# Copyright 1999-2018 Gentoo Authors |
169 |
# Distributed under the terms of the GNU General Public License v2 |
170 |
|
171 |
EAPI=6 |
172 |
VIM_VERSION="8.1" |
173 |
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix |
174 |
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop |
175 |
|
176 |
if [[ ${PV} == 9999* ]] ; then |
177 |
inherit git-r3 |
178 |
@@ -201,6 +201,9 @@ src_install() { |
179 |
fi |
180 |
|
181 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
182 |
+ |
183 |
+ # install gvim icon since both vim/gvim desktop files reference it |
184 |
+ doicon -s scalable "${FILESDIR}"/gvim.svg |
185 |
} |
186 |
|
187 |
pkg_postinst() { |