| 1 |
commit: dccdb05ac31e273edc433c9c9213c928e7c5dfb4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 26 17:07:41 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 17:08:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccdb05a |
| 7 |
|
| 8 |
dev-vcs/git: Re-added "subversion" USE flag. |
| 9 |
|
| 10 |
Upstream only killed svn-fe, not the svn perl module. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/751079 |
| 13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{git-2.29.1.ebuild => git-2.29.1-r1.ebuild} | 22 ++++++++++++++++++++-- |
| 17 |
dev-vcs/git/git-9999-r1.ebuild | 22 ++++++++++++++++++++-- |
| 18 |
dev-vcs/git/git-9999-r2.ebuild | 22 ++++++++++++++++++++-- |
| 19 |
dev-vcs/git/git-9999-r3.ebuild | 22 ++++++++++++++++++++-- |
| 20 |
dev-vcs/git/git-9999.ebuild | 22 ++++++++++++++++++++-- |
| 21 |
5 files changed, 100 insertions(+), 10 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-vcs/git/git-2.29.1.ebuild b/dev-vcs/git/git-2.29.1-r1.ebuild |
| 24 |
similarity index 96% |
| 25 |
rename from dev-vcs/git/git-2.29.1.ebuild |
| 26 |
rename to dev-vcs/git/git-2.29.1-r1.ebuild |
| 27 |
index 7808906c93a..6e5c5a74a12 100644 |
| 28 |
--- a/dev-vcs/git/git-2.29.1.ebuild |
| 29 |
+++ b/dev-vcs/git/git-2.29.1-r1.ebuild |
| 30 |
@@ -51,7 +51,7 @@ fi |
| 31 |
|
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" |
| 35 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
| 36 |
|
| 37 |
# Common to both DEPEND and RDEPEND |
| 38 |
DEPEND=" |
| 39 |
@@ -93,6 +93,11 @@ RDEPEND="${DEPEND} |
| 40 |
dev-perl/HTML-Tree |
| 41 |
dev-perl/MediaWiki-API |
| 42 |
) |
| 43 |
+ subversion? ( |
| 44 |
+ dev-vcs/subversion[-dso(-),perl] |
| 45 |
+ dev-perl/libwww-perl |
| 46 |
+ dev-perl/TermReadKey |
| 47 |
+ ) |
| 48 |
) |
| 49 |
perforce? ( ${PYTHON_DEPS} ) |
| 50 |
" |
| 51 |
@@ -126,9 +131,10 @@ REQUIRED_USE=" |
| 52 |
cvs? ( perl ) |
| 53 |
mediawiki? ( perl ) |
| 54 |
mediawiki-experimental? ( mediawiki ) |
| 55 |
- webdav? ( curl ) |
| 56 |
pcre-jit? ( pcre ) |
| 57 |
perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 58 |
+ subversion? ( perl ) |
| 59 |
+ webdav? ( curl ) |
| 60 |
" |
| 61 |
|
| 62 |
RESTRICT="!test? ( test )" |
| 63 |
@@ -142,6 +148,12 @@ PATCHES=( |
| 64 |
) |
| 65 |
|
| 66 |
pkg_setup() { |
| 67 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
| 68 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 69 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 70 |
+ ewarn "have been warned." |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
if use perforce ; then |
| 74 |
python-single-r1_pkg_setup |
| 75 |
fi |
| 76 |
@@ -160,6 +172,7 @@ exportmakeopts() { |
| 77 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 78 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 79 |
$(usex perforce '' NO_PYTHON=YesPlease) |
| 80 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 81 |
$(usex threads '' NO_PTHREADS=YesPlease) |
| 82 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 83 |
) |
| 84 |
@@ -516,6 +529,11 @@ src_install() { |
| 85 |
rm -rf "${ED}"/usr/share/gitweb |
| 86 |
fi |
| 87 |
|
| 88 |
+ if ! use subversion ; then |
| 89 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 90 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
| 91 |
+ fi |
| 92 |
+ |
| 93 |
if use xinetd ; then |
| 94 |
insinto /etc/xinetd.d |
| 95 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 96 |
|
| 97 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 98 |
index 7808906c93a..6e5c5a74a12 100644 |
| 99 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 100 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 101 |
@@ -51,7 +51,7 @@ fi |
| 102 |
|
| 103 |
LICENSE="GPL-2" |
| 104 |
SLOT="0" |
| 105 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" |
| 106 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
| 107 |
|
| 108 |
# Common to both DEPEND and RDEPEND |
| 109 |
DEPEND=" |
| 110 |
@@ -93,6 +93,11 @@ RDEPEND="${DEPEND} |
| 111 |
dev-perl/HTML-Tree |
| 112 |
dev-perl/MediaWiki-API |
| 113 |
) |
| 114 |
+ subversion? ( |
| 115 |
+ dev-vcs/subversion[-dso(-),perl] |
| 116 |
+ dev-perl/libwww-perl |
| 117 |
+ dev-perl/TermReadKey |
| 118 |
+ ) |
| 119 |
) |
| 120 |
perforce? ( ${PYTHON_DEPS} ) |
| 121 |
" |
| 122 |
@@ -126,9 +131,10 @@ REQUIRED_USE=" |
| 123 |
cvs? ( perl ) |
| 124 |
mediawiki? ( perl ) |
| 125 |
mediawiki-experimental? ( mediawiki ) |
| 126 |
- webdav? ( curl ) |
| 127 |
pcre-jit? ( pcre ) |
| 128 |
perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 129 |
+ subversion? ( perl ) |
| 130 |
+ webdav? ( curl ) |
| 131 |
" |
| 132 |
|
| 133 |
RESTRICT="!test? ( test )" |
| 134 |
@@ -142,6 +148,12 @@ PATCHES=( |
| 135 |
) |
| 136 |
|
| 137 |
pkg_setup() { |
| 138 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
| 139 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 140 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 141 |
+ ewarn "have been warned." |
| 142 |
+ fi |
| 143 |
+ |
| 144 |
if use perforce ; then |
| 145 |
python-single-r1_pkg_setup |
| 146 |
fi |
| 147 |
@@ -160,6 +172,7 @@ exportmakeopts() { |
| 148 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 149 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 150 |
$(usex perforce '' NO_PYTHON=YesPlease) |
| 151 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 152 |
$(usex threads '' NO_PTHREADS=YesPlease) |
| 153 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 154 |
) |
| 155 |
@@ -516,6 +529,11 @@ src_install() { |
| 156 |
rm -rf "${ED}"/usr/share/gitweb |
| 157 |
fi |
| 158 |
|
| 159 |
+ if ! use subversion ; then |
| 160 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 161 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
| 162 |
+ fi |
| 163 |
+ |
| 164 |
if use xinetd ; then |
| 165 |
insinto /etc/xinetd.d |
| 166 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 167 |
|
| 168 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 169 |
index 7808906c93a..6e5c5a74a12 100644 |
| 170 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 171 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 172 |
@@ -51,7 +51,7 @@ fi |
| 173 |
|
| 174 |
LICENSE="GPL-2" |
| 175 |
SLOT="0" |
| 176 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" |
| 177 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
| 178 |
|
| 179 |
# Common to both DEPEND and RDEPEND |
| 180 |
DEPEND=" |
| 181 |
@@ -93,6 +93,11 @@ RDEPEND="${DEPEND} |
| 182 |
dev-perl/HTML-Tree |
| 183 |
dev-perl/MediaWiki-API |
| 184 |
) |
| 185 |
+ subversion? ( |
| 186 |
+ dev-vcs/subversion[-dso(-),perl] |
| 187 |
+ dev-perl/libwww-perl |
| 188 |
+ dev-perl/TermReadKey |
| 189 |
+ ) |
| 190 |
) |
| 191 |
perforce? ( ${PYTHON_DEPS} ) |
| 192 |
" |
| 193 |
@@ -126,9 +131,10 @@ REQUIRED_USE=" |
| 194 |
cvs? ( perl ) |
| 195 |
mediawiki? ( perl ) |
| 196 |
mediawiki-experimental? ( mediawiki ) |
| 197 |
- webdav? ( curl ) |
| 198 |
pcre-jit? ( pcre ) |
| 199 |
perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 200 |
+ subversion? ( perl ) |
| 201 |
+ webdav? ( curl ) |
| 202 |
" |
| 203 |
|
| 204 |
RESTRICT="!test? ( test )" |
| 205 |
@@ -142,6 +148,12 @@ PATCHES=( |
| 206 |
) |
| 207 |
|
| 208 |
pkg_setup() { |
| 209 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
| 210 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 211 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 212 |
+ ewarn "have been warned." |
| 213 |
+ fi |
| 214 |
+ |
| 215 |
if use perforce ; then |
| 216 |
python-single-r1_pkg_setup |
| 217 |
fi |
| 218 |
@@ -160,6 +172,7 @@ exportmakeopts() { |
| 219 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 220 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 221 |
$(usex perforce '' NO_PYTHON=YesPlease) |
| 222 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 223 |
$(usex threads '' NO_PTHREADS=YesPlease) |
| 224 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 225 |
) |
| 226 |
@@ -516,6 +529,11 @@ src_install() { |
| 227 |
rm -rf "${ED}"/usr/share/gitweb |
| 228 |
fi |
| 229 |
|
| 230 |
+ if ! use subversion ; then |
| 231 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 232 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
| 233 |
+ fi |
| 234 |
+ |
| 235 |
if use xinetd ; then |
| 236 |
insinto /etc/xinetd.d |
| 237 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 238 |
|
| 239 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 240 |
index 7808906c93a..6e5c5a74a12 100644 |
| 241 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 242 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 243 |
@@ -51,7 +51,7 @@ fi |
| 244 |
|
| 245 |
LICENSE="GPL-2" |
| 246 |
SLOT="0" |
| 247 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" |
| 248 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
| 249 |
|
| 250 |
# Common to both DEPEND and RDEPEND |
| 251 |
DEPEND=" |
| 252 |
@@ -93,6 +93,11 @@ RDEPEND="${DEPEND} |
| 253 |
dev-perl/HTML-Tree |
| 254 |
dev-perl/MediaWiki-API |
| 255 |
) |
| 256 |
+ subversion? ( |
| 257 |
+ dev-vcs/subversion[-dso(-),perl] |
| 258 |
+ dev-perl/libwww-perl |
| 259 |
+ dev-perl/TermReadKey |
| 260 |
+ ) |
| 261 |
) |
| 262 |
perforce? ( ${PYTHON_DEPS} ) |
| 263 |
" |
| 264 |
@@ -126,9 +131,10 @@ REQUIRED_USE=" |
| 265 |
cvs? ( perl ) |
| 266 |
mediawiki? ( perl ) |
| 267 |
mediawiki-experimental? ( mediawiki ) |
| 268 |
- webdav? ( curl ) |
| 269 |
pcre-jit? ( pcre ) |
| 270 |
perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 271 |
+ subversion? ( perl ) |
| 272 |
+ webdav? ( curl ) |
| 273 |
" |
| 274 |
|
| 275 |
RESTRICT="!test? ( test )" |
| 276 |
@@ -142,6 +148,12 @@ PATCHES=( |
| 277 |
) |
| 278 |
|
| 279 |
pkg_setup() { |
| 280 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
| 281 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 282 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 283 |
+ ewarn "have been warned." |
| 284 |
+ fi |
| 285 |
+ |
| 286 |
if use perforce ; then |
| 287 |
python-single-r1_pkg_setup |
| 288 |
fi |
| 289 |
@@ -160,6 +172,7 @@ exportmakeopts() { |
| 290 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 291 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 292 |
$(usex perforce '' NO_PYTHON=YesPlease) |
| 293 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 294 |
$(usex threads '' NO_PTHREADS=YesPlease) |
| 295 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 296 |
) |
| 297 |
@@ -516,6 +529,11 @@ src_install() { |
| 298 |
rm -rf "${ED}"/usr/share/gitweb |
| 299 |
fi |
| 300 |
|
| 301 |
+ if ! use subversion ; then |
| 302 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 303 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
| 304 |
+ fi |
| 305 |
+ |
| 306 |
if use xinetd ; then |
| 307 |
insinto /etc/xinetd.d |
| 308 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
| 309 |
|
| 310 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 311 |
index 7808906c93a..6e5c5a74a12 100644 |
| 312 |
--- a/dev-vcs/git/git-9999.ebuild |
| 313 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 314 |
@@ -51,7 +51,7 @@ fi |
| 315 |
|
| 316 |
LICENSE="GPL-2" |
| 317 |
SLOT="0" |
| 318 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" |
| 319 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
| 320 |
|
| 321 |
# Common to both DEPEND and RDEPEND |
| 322 |
DEPEND=" |
| 323 |
@@ -93,6 +93,11 @@ RDEPEND="${DEPEND} |
| 324 |
dev-perl/HTML-Tree |
| 325 |
dev-perl/MediaWiki-API |
| 326 |
) |
| 327 |
+ subversion? ( |
| 328 |
+ dev-vcs/subversion[-dso(-),perl] |
| 329 |
+ dev-perl/libwww-perl |
| 330 |
+ dev-perl/TermReadKey |
| 331 |
+ ) |
| 332 |
) |
| 333 |
perforce? ( ${PYTHON_DEPS} ) |
| 334 |
" |
| 335 |
@@ -126,9 +131,10 @@ REQUIRED_USE=" |
| 336 |
cvs? ( perl ) |
| 337 |
mediawiki? ( perl ) |
| 338 |
mediawiki-experimental? ( mediawiki ) |
| 339 |
- webdav? ( curl ) |
| 340 |
pcre-jit? ( pcre ) |
| 341 |
perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 342 |
+ subversion? ( perl ) |
| 343 |
+ webdav? ( curl ) |
| 344 |
" |
| 345 |
|
| 346 |
RESTRICT="!test? ( test )" |
| 347 |
@@ -142,6 +148,12 @@ PATCHES=( |
| 348 |
) |
| 349 |
|
| 350 |
pkg_setup() { |
| 351 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
| 352 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 353 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 354 |
+ ewarn "have been warned." |
| 355 |
+ fi |
| 356 |
+ |
| 357 |
if use perforce ; then |
| 358 |
python-single-r1_pkg_setup |
| 359 |
fi |
| 360 |
@@ -160,6 +172,7 @@ exportmakeopts() { |
| 361 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 362 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 363 |
$(usex perforce '' NO_PYTHON=YesPlease) |
| 364 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 365 |
$(usex threads '' NO_PTHREADS=YesPlease) |
| 366 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 367 |
) |
| 368 |
@@ -516,6 +529,11 @@ src_install() { |
| 369 |
rm -rf "${ED}"/usr/share/gitweb |
| 370 |
fi |
| 371 |
|
| 372 |
+ if ! use subversion ; then |
| 373 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
| 374 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
| 375 |
+ fi |
| 376 |
+ |
| 377 |
if use xinetd ; then |
| 378 |
insinto /etc/xinetd.d |
| 379 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
Archives