Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-9999.ebuild git-1.8.5.2.ebuild metadata.xml
Date: Sat, 04 Jan 2014 22:36:00
Message-Id: 20140104223555.AB6132004E@flycatcher.gentoo.org
1 dilfridge 14/01/04 22:35:55
2
3 Modified: ChangeLog git-9999.ebuild git-1.8.5.2.ebuild
4 metadata.xml
5 Log:
6 Add (masked until dependencies are keyworded) support for mediawiki, use subslot dependency on perl
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
9
10 Revision Changes Path
11 1.237 dev-vcs/git/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.237&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.237&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.236&r2=1.237
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
20 retrieving revision 1.236
21 retrieving revision 1.237
22 diff -u -r1.236 -r1.237
23 --- ChangeLog 18 Dec 2013 12:19:15 -0000 1.236
24 +++ ChangeLog 4 Jan 2014 22:35:55 -0000 1.237
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-vcs/git
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.236 2013/12/18 12:19:15 polynomial-c Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.237 2014/01/04 22:35:55 dilfridge Exp $
31 +
32 + 04 Jan 2014; Andreas K. Huettel <dilfridge@g.o> git-1.8.5.2.ebuild,
33 + +files/git-1.8.5-mw-destdir.patch, +files/git-1.8.5-mw-vendor.patch,
34 + git-9999.ebuild, metadata.xml:
35 + Add (masked until dependencies are keyworded) support for mediawiki, use
36 + subslot dependency on perl
37
38 *git-1.8.5.2 (18 Dec 2013)
39
40
41
42
43 1.51 dev-vcs/git/git-9999.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.51&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.51&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.50&r2=1.51
48
49 Index: git-9999.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v
52 retrieving revision 1.50
53 retrieving revision 1.51
54 diff -u -r1.50 -r1.51
55 --- git-9999.ebuild 11 Dec 2013 10:27:22 -0000 1.50
56 +++ git-9999.ebuild 4 Jan 2014 22:35:55 -0000 1.51
57 @@ -1,6 +1,6 @@
58 -# Copyright 1999-2013 Gentoo Foundation
59 +# Copyright 1999-2014 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.50 2013/12/11 10:27:22 polynomial-c Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.51 2014/01/04 22:35:55 dilfridge Exp $
63
64 EAPI=5
65
66 @@ -40,14 +40,14 @@
67
68 LICENSE="GPL-2"
69 SLOT="0"
70 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
71 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
72
73 # Common to both DEPEND and RDEPEND
74 CDEPEND="
75 dev-libs/openssl
76 sys-libs/zlib
77 pcre? ( dev-libs/libpcre )
78 - perl? ( dev-lang/perl[-build(-)] )
79 + perl? ( dev-lang/perl:=[-build(-)] )
80 tk? ( dev-lang/tk )
81 curl? (
82 net-misc/curl
83 @@ -58,6 +58,7 @@
84
85 RDEPEND="${CDEPEND}
86 gpg? ( app-crypt/gnupg )
87 + mediawiki? ( dev-perl/MediaWiki-API )
88 perl? ( dev-perl/Error
89 dev-perl/Net-SMTP-SSL
90 dev-perl/Authen-SASL
91 @@ -100,6 +101,7 @@
92 REQUIRED_USE="
93 cgi? ( perl )
94 cvs? ( perl )
95 + mediawiki? ( perl )
96 subversion? ( perl )
97 webdav? ( curl )
98 gtk? ( python )
99 @@ -222,6 +224,10 @@
100 # bug #350330 - automagic CVS when we don't want it is bad.
101 epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
102
103 + # install mediawiki perl modules also in vendor_dir
104 + # hack, needs better upstream solution
105 + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
106 +
107 sed -i \
108 -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
109 -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
110 @@ -329,6 +335,11 @@
111 cd "${S}"/contrib/subtree
112 git_emake
113 use doc && git_emake doc
114 +
115 + if use mediawiki ; then
116 + cd "${S}"/contrib/mw-to-git
117 + git_emake
118 + fi
119 }
120
121 src_install() {
122 @@ -390,6 +401,12 @@
123 dodoc git-subtree.txt
124 cd "${S}"
125
126 + if use mediawiki ; then
127 + cd "${S}"/contrib/mw-to-git
128 + git_emake install
129 + cd "${S}"
130 + fi
131 +
132 # git-diffall
133 dobin contrib/diffall/git-diffall
134 newdoc contrib/diffall/README git-diffall.txt
135
136
137
138 1.2 dev-vcs/git/git-1.8.5.2.ebuild
139
140 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild?rev=1.2&view=markup
141 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild?rev=1.2&content-type=text/plain
142 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild?r1=1.1&r2=1.2
143
144 Index: git-1.8.5.2.ebuild
145 ===================================================================
146 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v
147 retrieving revision 1.1
148 retrieving revision 1.2
149 diff -u -r1.1 -r1.2
150 --- git-1.8.5.2.ebuild 18 Dec 2013 12:19:16 -0000 1.1
151 +++ git-1.8.5.2.ebuild 4 Jan 2014 22:35:55 -0000 1.2
152 @@ -1,6 +1,6 @@
153 -# Copyright 1999-2013 Gentoo Foundation
154 +# Copyright 1999-2014 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.1 2013/12/18 12:19:16 polynomial-c Exp $
157 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.2 2014/01/04 22:35:55 dilfridge Exp $
158
159 EAPI=5
160
161 @@ -40,14 +40,14 @@
162
163 LICENSE="GPL-2"
164 SLOT="0"
165 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
166 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
167
168 # Common to both DEPEND and RDEPEND
169 CDEPEND="
170 dev-libs/openssl
171 sys-libs/zlib
172 pcre? ( dev-libs/libpcre )
173 - perl? ( dev-lang/perl[-build(-)] )
174 + perl? ( dev-lang/perl:=[-build(-)] )
175 tk? ( dev-lang/tk )
176 curl? (
177 net-misc/curl
178 @@ -58,6 +58,7 @@
179
180 RDEPEND="${CDEPEND}
181 gpg? ( app-crypt/gnupg )
182 + mediawiki? ( dev-perl/MediaWiki-API )
183 perl? ( dev-perl/Error
184 dev-perl/Net-SMTP-SSL
185 dev-perl/Authen-SASL
186 @@ -100,6 +101,7 @@
187 REQUIRED_USE="
188 cgi? ( perl )
189 cvs? ( perl )
190 + mediawiki? ( perl )
191 subversion? ( perl )
192 webdav? ( curl )
193 gtk? ( python )
194 @@ -222,6 +224,13 @@
195 # bug #350330 - automagic CVS when we don't want it is bad.
196 epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
197
198 + # honor and correctly quote DISTDIR (from upstream git master)
199 + epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
200 +
201 + # install mediawiki perl modules also in vendor_dir
202 + # hack, needs better upstream solution
203 + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
204 +
205 sed -i \
206 -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
207 -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
208 @@ -329,6 +338,11 @@
209 cd "${S}"/contrib/subtree
210 git_emake
211 use doc && git_emake doc
212 +
213 + if use mediawiki ; then
214 + cd "${S}"/contrib/mw-to-git
215 + git_emake
216 + fi
217 }
218
219 src_install() {
220 @@ -390,6 +404,12 @@
221 dodoc git-subtree.txt
222 cd "${S}"
223
224 + if use mediawiki ; then
225 + cd "${S}"/contrib/mw-to-git
226 + git_emake install
227 + cd "${S}"
228 + fi
229 +
230 # git-diffall
231 dobin contrib/diffall/git-diffall
232 newdoc contrib/diffall/README git-diffall.txt
233
234
235
236 1.11 dev-vcs/git/metadata.xml
237
238 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/metadata.xml?rev=1.11&view=markup
239 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/metadata.xml?rev=1.11&content-type=text/plain
240 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/metadata.xml?r1=1.10&r2=1.11
241
242 Index: metadata.xml
243 ===================================================================
244 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/metadata.xml,v
245 retrieving revision 1.10
246 retrieving revision 1.11
247 diff -u -r1.10 -r1.11
248 --- metadata.xml 5 Dec 2013 08:13:52 -0000 1.10
249 +++ metadata.xml 4 Jan 2014 22:35:55 -0000 1.11
250 @@ -33,6 +33,7 @@
251 <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
252 <flag name="gtk">Include the gitview contrib tool</flag>
253 <flag name="highlight">GitWeb support for app-text/highlight</flag>
254 + <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
255 <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
256 <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
257 <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
Report Message
Find on MARC Find on Google Groups