Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Sun, 26 Feb 2017 11:31:53
Message-Id: 1488108703.f49b0e3afee3c713ec88fe461dbf2f10e487403d.polynomial-c@gentoo
1 commit: f49b0e3afee3c713ec88fe461dbf2f10e487403d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 11:31:28 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 11:31:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49b0e3a
7
8 dev-vcs/git: gitview has been removed (bug #610946).
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-vcs/git/git-2.12.0.ebuild | 16 +++-------------
13 dev-vcs/git/git-9999-r1.ebuild | 16 +++-------------
14 dev-vcs/git/git-9999-r2.ebuild | 16 +++-------------
15 dev-vcs/git/git-9999-r3.ebuild | 16 +++-------------
16 dev-vcs/git/git-9999.ebuild | 16 +++-------------
17 5 files changed, 15 insertions(+), 65 deletions(-)
18
19 diff --git a/dev-vcs/git/git-2.12.0.ebuild b/dev-vcs/git/git-2.12.0.ebuild
20 index a1f5e74e5a..0be668f045 100644
21 --- a/dev-vcs/git/git-2.12.0.ebuild
22 +++ b/dev-vcs/git/git-2.12.0.ebuild
23 @@ -43,7 +43,7 @@ fi
24
25 LICENSE="GPL-2"
26 SLOT="0"
27 -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
28 +IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
29
30 # Common to both DEPEND and RDEPEND
31 CDEPEND="
32 @@ -75,12 +75,8 @@ RDEPEND="${CDEPEND}
33 cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
34 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
35 )
36 - python? ( gtk?
37 - (
38 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
39 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
40 - )
41 - ${PYTHON_DEPS} )"
42 + python? ( ${PYTHON_DEPS} )
43 +"
44
45 # This is how info docs are created with Git:
46 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
47 @@ -112,7 +108,6 @@ REQUIRED_USE="
48 mediawiki-experimental? ( mediawiki )
49 subversion? ( perl )
50 webdav? ( curl )
51 - gtk? ( python )
52 python? ( ${PYTHON_REQUIRED_USE} )
53 "
54
55 @@ -423,11 +418,6 @@ src_install() {
56 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
57 fi
58
59 - if use python && use gtk ; then
60 - python_doscript "${S}"/contrib/gitview/gitview
61 - dodoc "${S}"/contrib/gitview/gitview.txt
62 - fi
63 -
64 #dobin contrib/fast-import/git-p4 # Moved upstream
65 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
66 newbin contrib/fast-import/import-tars.perl import-tars
67
68 diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
69 index 996fd1fa4b..6cc2e4ddc3 100644
70 --- a/dev-vcs/git/git-9999-r1.ebuild
71 +++ b/dev-vcs/git/git-9999-r1.ebuild
72 @@ -43,7 +43,7 @@ fi
73
74 LICENSE="GPL-2"
75 SLOT="0"
76 -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
77 +IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
78
79 # Common to both DEPEND and RDEPEND
80 CDEPEND="
81 @@ -75,12 +75,8 @@ RDEPEND="${CDEPEND}
82 cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
83 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
84 )
85 - python? ( gtk?
86 - (
87 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
88 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
89 - )
90 - ${PYTHON_DEPS} )"
91 + python? ( ${PYTHON_DEPS} )
92 +"
93
94 # This is how info docs are created with Git:
95 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
96 @@ -112,7 +108,6 @@ REQUIRED_USE="
97 mediawiki-experimental? ( mediawiki )
98 subversion? ( perl )
99 webdav? ( curl )
100 - gtk? ( python )
101 python? ( ${PYTHON_REQUIRED_USE} )
102 "
103
104 @@ -423,11 +418,6 @@ src_install() {
105 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
106 fi
107
108 - if use python && use gtk ; then
109 - python_doscript "${S}"/contrib/gitview/gitview
110 - dodoc "${S}"/contrib/gitview/gitview.txt
111 - fi
112 -
113 #dobin contrib/fast-import/git-p4 # Moved upstream
114 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
115 newbin contrib/fast-import/import-tars.perl import-tars
116
117 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
118 index 1924612f28..e9fecdd35e 100644
119 --- a/dev-vcs/git/git-9999-r2.ebuild
120 +++ b/dev-vcs/git/git-9999-r2.ebuild
121 @@ -43,7 +43,7 @@ fi
122
123 LICENSE="GPL-2"
124 SLOT="0"
125 -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
126 +IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
127
128 # Common to both DEPEND and RDEPEND
129 CDEPEND="
130 @@ -75,12 +75,8 @@ RDEPEND="${CDEPEND}
131 cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
132 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
133 )
134 - python? ( gtk?
135 - (
136 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
137 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
138 - )
139 - ${PYTHON_DEPS} )"
140 + python? ( ${PYTHON_DEPS} )
141 +"
142
143 # This is how info docs are created with Git:
144 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
145 @@ -112,7 +108,6 @@ REQUIRED_USE="
146 mediawiki-experimental? ( mediawiki )
147 subversion? ( perl )
148 webdav? ( curl )
149 - gtk? ( python )
150 python? ( ${PYTHON_REQUIRED_USE} )
151 "
152
153 @@ -423,11 +418,6 @@ src_install() {
154 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
155 fi
156
157 - if use python && use gtk ; then
158 - python_doscript "${S}"/contrib/gitview/gitview
159 - dodoc "${S}"/contrib/gitview/gitview.txt
160 - fi
161 -
162 #dobin contrib/fast-import/git-p4 # Moved upstream
163 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
164 newbin contrib/fast-import/import-tars.perl import-tars
165
166 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
167 index faa18537ad..ede0b64737 100644
168 --- a/dev-vcs/git/git-9999-r3.ebuild
169 +++ b/dev-vcs/git/git-9999-r3.ebuild
170 @@ -43,7 +43,7 @@ fi
171
172 LICENSE="GPL-2"
173 SLOT="0"
174 -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
175 +IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
176
177 # Common to both DEPEND and RDEPEND
178 CDEPEND="
179 @@ -75,12 +75,8 @@ RDEPEND="${CDEPEND}
180 cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
181 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
182 )
183 - python? ( gtk?
184 - (
185 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
186 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
187 - )
188 - ${PYTHON_DEPS} )"
189 + python? ( ${PYTHON_DEPS} )
190 +"
191
192 # This is how info docs are created with Git:
193 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
194 @@ -112,7 +108,6 @@ REQUIRED_USE="
195 mediawiki-experimental? ( mediawiki )
196 subversion? ( perl )
197 webdav? ( curl )
198 - gtk? ( python )
199 python? ( ${PYTHON_REQUIRED_USE} )
200 "
201
202 @@ -423,11 +418,6 @@ src_install() {
203 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
204 fi
205
206 - if use python && use gtk ; then
207 - python_doscript "${S}"/contrib/gitview/gitview
208 - dodoc "${S}"/contrib/gitview/gitview.txt
209 - fi
210 -
211 #dobin contrib/fast-import/git-p4 # Moved upstream
212 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
213 newbin contrib/fast-import/import-tars.perl import-tars
214
215 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
216 index a1f5e74e5a..0be668f045 100644
217 --- a/dev-vcs/git/git-9999.ebuild
218 +++ b/dev-vcs/git/git-9999.ebuild
219 @@ -43,7 +43,7 @@ fi
220
221 LICENSE="GPL-2"
222 SLOT="0"
223 -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
224 +IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
225
226 # Common to both DEPEND and RDEPEND
227 CDEPEND="
228 @@ -75,12 +75,8 @@ RDEPEND="${CDEPEND}
229 cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
230 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
231 )
232 - python? ( gtk?
233 - (
234 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
235 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
236 - )
237 - ${PYTHON_DEPS} )"
238 + python? ( ${PYTHON_DEPS} )
239 +"
240
241 # This is how info docs are created with Git:
242 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
243 @@ -112,7 +108,6 @@ REQUIRED_USE="
244 mediawiki-experimental? ( mediawiki )
245 subversion? ( perl )
246 webdav? ( curl )
247 - gtk? ( python )
248 python? ( ${PYTHON_REQUIRED_USE} )
249 "
250
251 @@ -423,11 +418,6 @@ src_install() {
252 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
253 fi
254
255 - if use python && use gtk ; then
256 - python_doscript "${S}"/contrib/gitview/gitview
257 - dodoc "${S}"/contrib/gitview/gitview.txt
258 - fi
259 -
260 #dobin contrib/fast-import/git-p4 # Moved upstream
261 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
262 newbin contrib/fast-import/import-tars.perl import-tars