Gentoo Archives: gentoo-commits

From: "Diego Elio Pettenò" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/flameeyes:master commit in: app-emacs/actionscript-mode/files/, app-emacs/actionscript-mode/
Date: Sun, 08 Apr 2012 21:27:03
Message-Id: 1333920393.608c23c60bdbf21d1d50bd09c86d69f9234483ab.flameeyes@gentoo
1 commit: 608c23c60bdbf21d1d50bd09c86d69f9234483ab
2 Author: Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
3 AuthorDate: Sun Apr 8 21:26:33 2012 +0000
4 Commit: Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 21:26:33 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/flameeyes.git;a=commit;h=608c23c6
7
8 Bump to a snapshot that includes my patch already.
9
10 (Portage version: 2.2.0_alpha100/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 app-emacs/actionscript-mode/ChangeLog | 7 ++
14 app-emacs/actionscript-mode/Manifest | 2 +-
15 ...ld => actionscript-mode-7.2.2_p20120405.ebuild} | 10 +--
16 .../files/actionscript-mode-7.2.2-font-lock.patch | 86 --------------------
17 4 files changed, 11 insertions(+), 94 deletions(-)
18
19 diff --git a/app-emacs/actionscript-mode/ChangeLog b/app-emacs/actionscript-mode/ChangeLog
20 index 955bb7d..18ec8e1 100644
21 --- a/app-emacs/actionscript-mode/ChangeLog
22 +++ b/app-emacs/actionscript-mode/ChangeLog
23 @@ -1,3 +1,10 @@
24 +*actionscript-mode-7.2.2_p20120405 (08 Apr 2012)
25 +
26 + 08 Apr 2012; Diego E. Pettenò <flameeyes@g.o>
27 + +actionscript-mode-7.2.2_p20120405.ebuild, -actionscript-mode-7.2.2.ebuild,
28 + -files/actionscript-mode-7.2.2-font-lock.patch:
29 + Bump to a snapshot that includes my patch already.
30 +
31 *actionscript-mode-7.2.2 (04 Apr 2012)
32
33 04 Apr 2012; Diego E. Pettenò <flameeyes@g.o>
34
35 diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
36 index a14e54e..279629d 100644
37 --- a/app-emacs/actionscript-mode/Manifest
38 +++ b/app-emacs/actionscript-mode/Manifest
39 @@ -1 +1 @@
40 -DIST actionscript-mode-7.2.2.tar.gz 8601 RMD160 eb311229f485e3c296981946cd271ba70a5bb9f9 SHA1 a6badb6769e0aa9a352184c7ce3da3da878b9497 SHA256 183b0191ea42fa22f0f98d83ff4c3dd975f3508168adc9960164cab961442be9
41 +DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 RMD160 11cdcea34e2b14d914fdf01ef931d075d3a33857 SHA1 29877b717a875a59eaee9d59397f5199f9df4b15 SHA256 f752546eab05c5249187b79489b74dcce385f99814b5ec708a1e347aabc154c4
42
43 diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
44 similarity index 84%
45 rename from app-emacs/actionscript-mode/actionscript-mode-7.2.2.ebuild
46 rename to app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
47 index 76f4c1f..5623766 100644
48 --- a/app-emacs/actionscript-mode/actionscript-mode-7.2.2.ebuild
49 +++ b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
50 @@ -4,14 +4,15 @@
51
52 EAPI=4
53
54 -inherit elisp eutils
55 +inherit elisp
56
57 GITHUB_USER="austinhaas"
58 GITHUB_PROJECT="${PN}"
59 +GITHUB_TAG="aa7e63d566a815152e7e652010becd46a406abb2"
60
61 DESCRIPTION="A major mode for GNU emacs for editing ActionScript 3 files."
62 HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
63 -SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${P}.tar.gz"
64 +SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 @@ -25,11 +26,6 @@ S="${WORKDIR}"
69
70 SITEFILE=50${PN}-gentoo.el
71
72 -src_prepare() {
73 - cd "${WORKDIR}"/${GITHUB_USER}-${GITHUB_PROJECT}-*
74 - epatch "${FILESDIR}"/${P}-font-lock.patch
75 -}
76 -
77 src_compile() {
78 cd "${WORKDIR}"/${GITHUB_USER}-${GITHUB_PROJECT}-*
79
80
81 diff --git a/app-emacs/actionscript-mode/files/actionscript-mode-7.2.2-font-lock.patch b/app-emacs/actionscript-mode/files/actionscript-mode-7.2.2-font-lock.patch
82 deleted file mode 100644
83 index 71845db..0000000
84 --- a/app-emacs/actionscript-mode/files/actionscript-mode-7.2.2-font-lock.patch
85 +++ /dev/null
86 @@ -1,86 +0,0 @@
87 -diff --git a/actionscript-mode.el b/actionscript-mode.el
88 -index 668e002..7cd7bc8 100644
89 ---- a/actionscript-mode.el
90 -+++ b/actionscript-mode.el
91 -@@ -366,24 +366,24 @@
92 - (defconst actionscript-font-lock-keywords-1
93 - ;; The following only highlight specific words that exist in the language.
94 - (list
95 -- `(,(regexp-opt preprocessor-kwds 'words) 0 'actionscript-preprocessor-kwds-face)
96 -- `(,(regexp-opt actionscript-constant-kwds 'words) 0 'actionscript-constant-kwds-face)
97 -- `(,(regexp-opt actionscript-global-funcs 'words) 0 'actionscript-global-funcs-face)
98 -- `(,(regexp-opt actionscript-global-props 'words) 0 'actionscript-global-props-face)
99 -+ `(,(regexp-opt preprocessor-kwds 'words) 0 'font-lock-proceprocessor-face)
100 -+ `(,(regexp-opt actionscript-constant-kwds 'words) 0 'font-lock-constant-face)
101 -+ `(,(regexp-opt actionscript-global-funcs 'words) 0 'font-lock-function-name-face)
102 -+ `(,(regexp-opt actionscript-global-props 'words) 0 'font-lock-variable-name-face)
103 - ;; `(,(regexp-opt actionscript-symbol-operators) 0 'actionscript-operators-face)
104 -- `(,(regexp-opt actionscript-word-operators 'words) 0 'actionscript-operators-face)
105 -- `(,(regexp-opt actionscript-specifier-kwds 'words) 0 'actionscript-specifier-kwds-face)
106 -- `(,(regexp-opt actionscript-class-kwds 'words) 0 'actionscript-class-kwds-face)
107 -- `(,(regexp-opt actionscript-package-kwds 'words) 0 'actionscript-package-kwds-face)
108 -- `(,(regexp-opt actionscript-other-decl-kwds 'words) 0 'actionscript-other-decl-kwds-face)
109 -- `(,(regexp-opt actionscript-other-decl-2-kwds 'words) 0 'actionscript-other-decl-2-kwds-face)
110 -- `(,(regexp-opt actionscript-decl-level-kwds 'words) 0 'actionscript-decl-level-kwds-face)
111 -- `(,(regexp-opt actionscript-conditional-kwds 'words) 0 'actionscript-conditional-kwds-face)
112 -- `(,(regexp-opt actionscript-block-stmt-1-kwds 'words) 0 'actionscript-block-stmt-1-kwds-face)
113 -- `(,(regexp-opt actionscript-simple-stmt-kwds 'words) 0 'actionscript-simple-stmt-kwds-face)
114 -- `(,(regexp-opt actionscript-label-kwds 'words) 0 'actionscript-label-kwds-face)
115 -- `(,(regexp-opt actionscript-expr-kwds 'words) 0 'actionscript-expr-kwds-face)
116 -- `(,(regexp-opt actionscript-other-kwds 'words) 0 'actionscript-other-kwds-face))
117 -+;; `(,(regexp-opt actionscript-word-operators 'words) 0 'font-lock--face)
118 -+ `(,(regexp-opt actionscript-specifier-kwds 'words) 0 'font-lock-keyword-face)
119 -+ `(,(regexp-opt actionscript-class-kwds 'words) 0 'font-lock-keyword-face)
120 -+ `(,(regexp-opt actionscript-package-kwds 'words) 0 'font-lock-keyword-face)
121 -+ `(,(regexp-opt actionscript-other-decl-kwds 'words) 0 'font-lock-keyword-face)
122 -+ `(,(regexp-opt actionscript-other-decl-2-kwds 'words) 0 'font-lock-keyword-face)
123 -+ `(,(regexp-opt actionscript-decl-level-kwds 'words) 0 'font-lock-keyword-face)
124 -+ `(,(regexp-opt actionscript-conditional-kwds 'words) 0 'font-lock-keyword-face)
125 -+ `(,(regexp-opt actionscript-block-stmt-1-kwds 'words) 0 'font-lock-keyword-face)
126 -+ `(,(regexp-opt actionscript-simple-stmt-kwds 'words) 0 'font-lock-keyword-face)
127 -+ `(,(regexp-opt actionscript-label-kwds 'words) 0 'font-lock-constant-face)
128 -+ `(,(regexp-opt actionscript-expr-kwds 'words) 0 'font-lock-keyword-face)
129 -+ `(,(regexp-opt actionscript-other-kwds 'words) 0 'font-lock-keyword-face))
130 - "Subdued level highlighting for Actionscript mode.")
131 -
132 - (defconst actionscript-font-lock-keywords-2
133 -@@ -394,24 +394,24 @@
134 - ;; Fontify package names in import directives.
135 - ;; TODO: support '*' as the last symbol in the package name.
136 - (list (concat (regexp-opt actionscript-other-decl-kwds 'words) "[ \t]*\\(?:" actionscript-identifier-re "\\.\\)*\\(" actionscript-identifier-re "\\)?")
137 -- '(2 'actionscript-class-name-face nil t)
138 -- (list (concat "[ \t]*\\(" actionscript-identifier-re "\\)\\.") '(goto-char (match-end 1)) '(goto-char (match-end 0)) '(1 'actionscript-package-name-face nil t)))
139 -+ '(2 'font-lock-type-face nil t)
140 -+ (list (concat "[ \t]*\\(" actionscript-identifier-re "\\)\\.") '(goto-char (match-end 1)) '(goto-char (match-end 0)) '(1 'font-lock-constant-face nil t)))
141 -
142 - ;; Fontify package names.
143 - (list (concat (regexp-opt (append actionscript-package-kwds) 'words) "[ \t]*\\(" actionscript-identifier-re "\\)?")
144 -- '(2 'actionscript-package-name-face nil t))
145 -+ '(2 'font-lock-constant-face nil t))
146 -
147 - ;; Fontify class names.
148 - (list (concat (regexp-opt (append actionscript-class-kwds actionscript-decl-level-kwds) 'words) "[ \t]*\\(" actionscript-identifier-re "\\)?")
149 -- '(2 'actionscript-class-name-face nil t))
150 -+ '(2 'font-lock-type-face nil t))
151 -
152 - ;; Function names.
153 - (list (concat "\\<function\\>[ \t\n]+\\(?:\\(?:get\\|set\\)[ \t\n]+\\)?\\(?:\\(" actionscript-identifier-re "\\)\\)?")
154 -- '(1 'actionscript-function-name-face nil t))
155 -+ '(1 'font-lock-function-name-face nil t))
156 -
157 - ;; The 'in' in 'for..in.'
158 - (list (concat "\\<for\\>[ \t\n]*([ \t\n]*\\(?:var[ \t\n]+\\)?" actionscript-identifier-re "[ \t\n]*\\(?::[ \t\n]*\\([a-zA-Z0-9_$*]*\\)\\)?[ \t\n]+\\(in\\)[ \t\n]+")
159 -- '(2 'actionscript-other-kwds-face nil t))
160 -+ '(2 'font-lock-keyword-face nil t))
161 -
162 - ;; The 'each' and the 'in' in 'for each..in.'
163 - ;; (list (concat "\\<for\\>[ \t\n]+\\(?:\\(each\\)[ \t\n]*\\)([ \t\n]*\\(?:var[ \t\n]+\\)?" actionscript-identifier-re "[ \t\n]*\\(?::[ \t\n]*\\([a-zA-Z0-9_$*]*\\)\\)?[ \t\n]+\\(in\\)[ \t\n]+")
164 -@@ -428,7 +428,7 @@
165 - ;; Start and finish with point after the type specifier.
166 - (goto-char (match-beginning 1))
167 - (goto-char (match-beginning 1))
168 -- (1 'actionscript-variable-name-face)))
169 -+ (1 'font-lock-variable-name-face)))
170 -
171 - ;; Objects and their functions
172 - ;; package(s) class property