1 |
commit: b5435eeb5778fc22f2323822af7c4d9a29f651c4 |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 30 03:26:28 2016 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 30 03:30:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5435eeb |
7 |
|
8 |
app-vim/gentoo-syntax: version bump to 20160530 |
9 |
|
10 |
Also, minor trimming of DESCRIPTION. |
11 |
|
12 |
app-vim/gentoo-syntax/Manifest | 1 + |
13 |
app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild | 2 +- |
14 |
...ax-20150823.ebuild => gentoo-syntax-20160530.ebuild} | 16 +++++++++++----- |
15 |
app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild | 17 ++++++++++++----- |
16 |
4 files changed, 25 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest |
19 |
index d06780a..3756862 100644 |
20 |
--- a/app-vim/gentoo-syntax/Manifest |
21 |
+++ b/app-vim/gentoo-syntax/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST gentoo-syntax-20150823.tar.bz2 25848 SHA256 72eba1cf2d0ffb481aa5bc56dbdeb2a9172565cfd3b454ce56eb9fdf665ec6ca SHA512 9d6f82aba6aa33f5d49dfd085628aacb7584614acf82954fa0e814b7fac5eda47c8d3eb6672ad38144a1444d507babad8805ea3029ccc35210a8752ea10eab82 WHIRLPOOL 85cebe212b1e86e79e92b55b7456da7d053973877485c9855580308b49d892fffc2fdbf98c6be2c7df843bf72246a5251d4716f25fc010afeace6255f9e0a9f5 |
24 |
+DIST gentoo-syntax-20160530.tar.gz 18950 SHA256 819495c10e594b2fef1fdcd80afa24ee437fe20b94ad9e7eb9e91f0a5be31919 SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd WHIRLPOOL 41018200b7f79eec005f55e80d3f8b1eec1f33acdbf1a8bce03b282a27cf63bb08a4959e0fcd74ecc9972322bbf4b0b89755dbde35cedc87ee9a228d07519a33 |
25 |
|
26 |
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild |
27 |
index 3013153..a0f79f3 100644 |
28 |
--- a/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild |
29 |
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild |
30 |
@@ -6,7 +6,7 @@ EAPI=5 |
31 |
|
32 |
inherit vim-plugin |
33 |
|
34 |
-DESCRIPTION="vim plugin: Gentoo and portage related syntax highlighting, filetype, and indent settings" |
35 |
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings" |
36 |
HOMEPAGE="https://github.com/gentoo/gentoo-syntax" |
37 |
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2" |
38 |
|
39 |
|
40 |
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild |
41 |
similarity index 67% |
42 |
copy from app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild |
43 |
copy to app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild |
44 |
index 3013153..5a4e2c9 100644 |
45 |
--- a/app-vim/gentoo-syntax/gentoo-syntax-20150823.ebuild |
46 |
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild |
47 |
@@ -2,22 +2,28 @@ |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Id$ |
50 |
|
51 |
-EAPI=5 |
52 |
+EAPI=6 |
53 |
|
54 |
inherit vim-plugin |
55 |
|
56 |
-DESCRIPTION="vim plugin: Gentoo and portage related syntax highlighting, filetype, and indent settings" |
57 |
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax" |
58 |
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2" |
59 |
+if [[ ${PV} == 9999* ]] ; then |
60 |
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git" |
61 |
+ inherit git-r3 |
62 |
+else |
63 |
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
64 |
+ 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" |
65 |
+fi |
66 |
|
67 |
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings" |
68 |
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax" |
69 |
LICENSE="vim" |
70 |
-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" |
71 |
IUSE="ignore-glep31" |
72 |
|
73 |
VIM_PLUGIN_HELPFILES="gentoo-syntax" |
74 |
VIM_PLUGIN_MESSAGES="filetype" |
75 |
|
76 |
src_prepare() { |
77 |
+ default |
78 |
if use ignore-glep31 ; then |
79 |
for f in ftplugin/*.vim ; do |
80 |
ebegin "Removing UTF-8 rules from ${f} ..." |
81 |
|
82 |
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild |
83 |
index de309d8..5a4e2c9 100644 |
84 |
--- a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild |
85 |
+++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild |
86 |
@@ -1,14 +1,20 @@ |
87 |
-# Copyright 1999-2015 Gentoo Foundation |
88 |
+# Copyright 1999-2016 Gentoo Foundation |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
# $Id$ |
91 |
|
92 |
-EAPI=5 |
93 |
+EAPI=6 |
94 |
|
95 |
-inherit vim-plugin git-2 |
96 |
+inherit vim-plugin |
97 |
|
98 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoo-syntax.git" |
99 |
+if [[ ${PV} == 9999* ]] ; then |
100 |
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git" |
101 |
+ inherit git-r3 |
102 |
+else |
103 |
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
104 |
+ 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" |
105 |
+fi |
106 |
|
107 |
-DESCRIPTION="vim plugin: Gentoo and portage related syntax highlighting, filetype, and indent settings" |
108 |
+DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings" |
109 |
HOMEPAGE="https://github.com/gentoo/gentoo-syntax" |
110 |
LICENSE="vim" |
111 |
IUSE="ignore-glep31" |
112 |
@@ -17,6 +23,7 @@ VIM_PLUGIN_HELPFILES="gentoo-syntax" |
113 |
VIM_PLUGIN_MESSAGES="filetype" |
114 |
|
115 |
src_prepare() { |
116 |
+ default |
117 |
if use ignore-glep31 ; then |
118 |
for f in ftplugin/*.vim ; do |
119 |
ebegin "Removing UTF-8 rules from ${f} ..." |