| 1 |
commit: a0a11d2292e8c4e813b7215c8303fec57a6d1da2 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 25 20:56:21 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 25 20:57:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a11d22 |
| 7 |
|
| 8 |
dev-vcs/git: resync livevcs builds. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-vcs/git/git-9999-r1.ebuild | 44 +++++++++++++++++++++++++----------------- |
| 13 |
dev-vcs/git/git-9999-r2.ebuild | 44 +++++++++++++++++++++++++----------------- |
| 14 |
dev-vcs/git/git-9999-r3.ebuild | 44 +++++++++++++++++++++++++----------------- |
| 15 |
dev-vcs/git/git-9999.ebuild | 44 +++++++++++++++++++++++++----------------- |
| 16 |
4 files changed, 104 insertions(+), 72 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 19 |
index c4878cd6d4..996fd1fa4b 100644 |
| 20 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 21 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 22 |
@@ -38,17 +38,18 @@ if [[ ${PV} != *9999 ]]; then |
| 23 |
doc? ( |
| 24 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 25 |
)" |
| 26 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 27 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 28 |
fi |
| 29 |
|
| 30 |
LICENSE="GPL-2" |
| 31 |
SLOT="0" |
| 32 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 33 |
+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" |
| 34 |
|
| 35 |
# Common to both DEPEND and RDEPEND |
| 36 |
CDEPEND=" |
| 37 |
!libressl? ( dev-libs/openssl:0= ) |
| 38 |
libressl? ( dev-libs/libressl:= ) |
| 39 |
+ libsecret? ( app-crypt/libsecret ) |
| 40 |
sys-libs/zlib |
| 41 |
pcre? ( dev-libs/libpcre ) |
| 42 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 43 |
@@ -58,7 +59,7 @@ CDEPEND=" |
| 44 |
webdav? ( dev-libs/expat ) |
| 45 |
) |
| 46 |
emacs? ( virtual/emacs ) |
| 47 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 48 |
+" |
| 49 |
|
| 50 |
RDEPEND="${CDEPEND} |
| 51 |
gpg? ( app-crypt/gnupg ) |
| 52 |
@@ -117,7 +118,7 @@ REQUIRED_USE=" |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 56 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 57 |
+ "${FILESDIR}"/git-2.12.0-optional-cvs.patch |
| 58 |
|
| 59 |
# install mediawiki perl modules also in vendor_dir |
| 60 |
# hack, needs better upstream solution |
| 61 |
@@ -192,6 +193,8 @@ exportmakeopts() { |
| 62 |
|| myopts+=" NO_PTHREADS=YesPlease" |
| 63 |
use cvs \ |
| 64 |
|| myopts+=" NO_CVS=YesPlease" |
| 65 |
+ use elibc_musl \ |
| 66 |
+ && myopts+=" NO_REGEX=YesPlease" |
| 67 |
# Disabled until ~m68k-mint can be keyworded again |
| 68 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 69 |
# myopts+=" NO_MMAP=YesPlease" |
| 70 |
@@ -361,12 +364,12 @@ src_compile() { |
| 71 |
cd "${S}" |
| 72 |
fi |
| 73 |
|
| 74 |
- if use gnome-keyring ; then |
| 75 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 76 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 77 |
+ if use libsecret ; then |
| 78 |
+ cd "${S}"/contrib/credential/libsecret |
| 79 |
+ git_emake || die "emake git-credential-libsecret failed" |
| 80 |
fi |
| 81 |
|
| 82 |
- cd "${S}"/contrib/subtree |
| 83 |
+ cd "${S}"/contrib/subtree || die |
| 84 |
git_emake |
| 85 |
use doc && git_emake doc |
| 86 |
|
| 87 |
@@ -461,9 +464,9 @@ src_install() { |
| 88 |
doexe contrib/contacts/git-contacts |
| 89 |
dodoc contrib/contacts/git-contacts.txt |
| 90 |
|
| 91 |
- if use gnome-keyring ; then |
| 92 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 93 |
- dobin git-credential-gnome-keyring |
| 94 |
+ if use libsecret ; then |
| 95 |
+ cd "${S}"/contrib/credential/libsecret |
| 96 |
+ dobin git-credential-libsecret |
| 97 |
fi |
| 98 |
|
| 99 |
if use subversion ; then |
| 100 |
@@ -481,7 +484,6 @@ src_install() { |
| 101 |
dodir /usr/share/${PN}/contrib |
| 102 |
# The following are excluded: |
| 103 |
# completion - installed above |
| 104 |
- # credential/gnome-keyring TODO |
| 105 |
# diff-highlight - done above |
| 106 |
# emacs - installed above |
| 107 |
# examples - these are stuff that is not used in Git anymore actually |
| 108 |
@@ -494,11 +496,17 @@ src_install() { |
| 109 |
# subtree - build seperately |
| 110 |
# svnimport - use git-svn |
| 111 |
# thunderbird-patch-inline - fixes thunderbird |
| 112 |
- for i in \ |
| 113 |
- buildsystems convert-objects fast-import \ |
| 114 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 115 |
- stats workdir \ |
| 116 |
- ; do |
| 117 |
+ local contrib_objects=( |
| 118 |
+ buildsystems |
| 119 |
+ fast-import |
| 120 |
+ hg-to-git |
| 121 |
+ hooks |
| 122 |
+ remotes2config.sh |
| 123 |
+ rerere-train.sh |
| 124 |
+ stats |
| 125 |
+ workdir |
| 126 |
+ ) |
| 127 |
+ for i in "${contrib_objects[@]}" ; do |
| 128 |
cp -rf \ |
| 129 |
"${S}"/contrib/${i} \ |
| 130 |
"${ED}"/usr/share/${PN}/contrib \ |
| 131 |
@@ -555,7 +563,7 @@ src_install() { |
| 132 |
} |
| 133 |
|
| 134 |
src_test() { |
| 135 |
- local disabled="" |
| 136 |
+ local disabled="t9128-git-svn-cmd-branch.sh" |
| 137 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 138 |
t9400-git-cvsserver-server.sh \ |
| 139 |
t9401-git-cvsserver-crlf.sh \ |
| 140 |
|
| 141 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 142 |
index 840ce77c96..1924612f28 100644 |
| 143 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 144 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 145 |
@@ -38,17 +38,18 @@ if [[ ${PV} != *9999 ]]; then |
| 146 |
doc? ( |
| 147 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 148 |
)" |
| 149 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 150 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 151 |
fi |
| 152 |
|
| 153 |
LICENSE="GPL-2" |
| 154 |
SLOT="0" |
| 155 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 156 |
+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" |
| 157 |
|
| 158 |
# Common to both DEPEND and RDEPEND |
| 159 |
CDEPEND=" |
| 160 |
!libressl? ( dev-libs/openssl:0= ) |
| 161 |
libressl? ( dev-libs/libressl:= ) |
| 162 |
+ libsecret? ( app-crypt/libsecret ) |
| 163 |
sys-libs/zlib |
| 164 |
pcre? ( dev-libs/libpcre ) |
| 165 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 166 |
@@ -58,7 +59,7 @@ CDEPEND=" |
| 167 |
webdav? ( dev-libs/expat ) |
| 168 |
) |
| 169 |
emacs? ( virtual/emacs ) |
| 170 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 171 |
+" |
| 172 |
|
| 173 |
RDEPEND="${CDEPEND} |
| 174 |
gpg? ( app-crypt/gnupg ) |
| 175 |
@@ -117,7 +118,7 @@ REQUIRED_USE=" |
| 176 |
|
| 177 |
PATCHES=( |
| 178 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 179 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 180 |
+ "${FILESDIR}"/git-2.12.0-optional-cvs.patch |
| 181 |
|
| 182 |
# install mediawiki perl modules also in vendor_dir |
| 183 |
# hack, needs better upstream solution |
| 184 |
@@ -192,6 +193,8 @@ exportmakeopts() { |
| 185 |
|| myopts+=" NO_PTHREADS=YesPlease" |
| 186 |
use cvs \ |
| 187 |
|| myopts+=" NO_CVS=YesPlease" |
| 188 |
+ use elibc_musl \ |
| 189 |
+ && myopts+=" NO_REGEX=YesPlease" |
| 190 |
# Disabled until ~m68k-mint can be keyworded again |
| 191 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 192 |
# myopts+=" NO_MMAP=YesPlease" |
| 193 |
@@ -361,12 +364,12 @@ src_compile() { |
| 194 |
cd "${S}" |
| 195 |
fi |
| 196 |
|
| 197 |
- if use gnome-keyring ; then |
| 198 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 199 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 200 |
+ if use libsecret ; then |
| 201 |
+ cd "${S}"/contrib/credential/libsecret |
| 202 |
+ git_emake || die "emake git-credential-libsecret failed" |
| 203 |
fi |
| 204 |
|
| 205 |
- cd "${S}"/contrib/subtree |
| 206 |
+ cd "${S}"/contrib/subtree || die |
| 207 |
git_emake |
| 208 |
use doc && git_emake doc |
| 209 |
|
| 210 |
@@ -461,9 +464,9 @@ src_install() { |
| 211 |
doexe contrib/contacts/git-contacts |
| 212 |
dodoc contrib/contacts/git-contacts.txt |
| 213 |
|
| 214 |
- if use gnome-keyring ; then |
| 215 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 216 |
- dobin git-credential-gnome-keyring |
| 217 |
+ if use libsecret ; then |
| 218 |
+ cd "${S}"/contrib/credential/libsecret |
| 219 |
+ dobin git-credential-libsecret |
| 220 |
fi |
| 221 |
|
| 222 |
if use subversion ; then |
| 223 |
@@ -481,7 +484,6 @@ src_install() { |
| 224 |
dodir /usr/share/${PN}/contrib |
| 225 |
# The following are excluded: |
| 226 |
# completion - installed above |
| 227 |
- # credential/gnome-keyring TODO |
| 228 |
# diff-highlight - done above |
| 229 |
# emacs - installed above |
| 230 |
# examples - these are stuff that is not used in Git anymore actually |
| 231 |
@@ -494,11 +496,17 @@ src_install() { |
| 232 |
# subtree - build seperately |
| 233 |
# svnimport - use git-svn |
| 234 |
# thunderbird-patch-inline - fixes thunderbird |
| 235 |
- for i in \ |
| 236 |
- buildsystems convert-objects fast-import \ |
| 237 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 238 |
- stats workdir \ |
| 239 |
- ; do |
| 240 |
+ local contrib_objects=( |
| 241 |
+ buildsystems |
| 242 |
+ fast-import |
| 243 |
+ hg-to-git |
| 244 |
+ hooks |
| 245 |
+ remotes2config.sh |
| 246 |
+ rerere-train.sh |
| 247 |
+ stats |
| 248 |
+ workdir |
| 249 |
+ ) |
| 250 |
+ for i in "${contrib_objects[@]}" ; do |
| 251 |
cp -rf \ |
| 252 |
"${S}"/contrib/${i} \ |
| 253 |
"${ED}"/usr/share/${PN}/contrib \ |
| 254 |
@@ -555,7 +563,7 @@ src_install() { |
| 255 |
} |
| 256 |
|
| 257 |
src_test() { |
| 258 |
- local disabled="" |
| 259 |
+ local disabled="t9128-git-svn-cmd-branch.sh" |
| 260 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 261 |
t9400-git-cvsserver-server.sh \ |
| 262 |
t9401-git-cvsserver-crlf.sh \ |
| 263 |
|
| 264 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 265 |
index b445725572..faa18537ad 100644 |
| 266 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 267 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 268 |
@@ -38,17 +38,18 @@ if [[ ${PV} != *9999 ]]; then |
| 269 |
doc? ( |
| 270 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 271 |
)" |
| 272 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 273 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 274 |
fi |
| 275 |
|
| 276 |
LICENSE="GPL-2" |
| 277 |
SLOT="0" |
| 278 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 279 |
+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" |
| 280 |
|
| 281 |
# Common to both DEPEND and RDEPEND |
| 282 |
CDEPEND=" |
| 283 |
!libressl? ( dev-libs/openssl:0= ) |
| 284 |
libressl? ( dev-libs/libressl:= ) |
| 285 |
+ libsecret? ( app-crypt/libsecret ) |
| 286 |
sys-libs/zlib |
| 287 |
pcre? ( dev-libs/libpcre ) |
| 288 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 289 |
@@ -58,7 +59,7 @@ CDEPEND=" |
| 290 |
webdav? ( dev-libs/expat ) |
| 291 |
) |
| 292 |
emacs? ( virtual/emacs ) |
| 293 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 294 |
+" |
| 295 |
|
| 296 |
RDEPEND="${CDEPEND} |
| 297 |
gpg? ( app-crypt/gnupg ) |
| 298 |
@@ -117,7 +118,7 @@ REQUIRED_USE=" |
| 299 |
|
| 300 |
PATCHES=( |
| 301 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 302 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 303 |
+ "${FILESDIR}"/git-2.12.0-optional-cvs.patch |
| 304 |
|
| 305 |
# install mediawiki perl modules also in vendor_dir |
| 306 |
# hack, needs better upstream solution |
| 307 |
@@ -192,6 +193,8 @@ exportmakeopts() { |
| 308 |
|| myopts+=" NO_PTHREADS=YesPlease" |
| 309 |
use cvs \ |
| 310 |
|| myopts+=" NO_CVS=YesPlease" |
| 311 |
+ use elibc_musl \ |
| 312 |
+ && myopts+=" NO_REGEX=YesPlease" |
| 313 |
# Disabled until ~m68k-mint can be keyworded again |
| 314 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 315 |
# myopts+=" NO_MMAP=YesPlease" |
| 316 |
@@ -361,12 +364,12 @@ src_compile() { |
| 317 |
cd "${S}" |
| 318 |
fi |
| 319 |
|
| 320 |
- if use gnome-keyring ; then |
| 321 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 322 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 323 |
+ if use libsecret ; then |
| 324 |
+ cd "${S}"/contrib/credential/libsecret |
| 325 |
+ git_emake || die "emake git-credential-libsecret failed" |
| 326 |
fi |
| 327 |
|
| 328 |
- cd "${S}"/contrib/subtree |
| 329 |
+ cd "${S}"/contrib/subtree || die |
| 330 |
git_emake |
| 331 |
use doc && git_emake doc |
| 332 |
|
| 333 |
@@ -461,9 +464,9 @@ src_install() { |
| 334 |
doexe contrib/contacts/git-contacts |
| 335 |
dodoc contrib/contacts/git-contacts.txt |
| 336 |
|
| 337 |
- if use gnome-keyring ; then |
| 338 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 339 |
- dobin git-credential-gnome-keyring |
| 340 |
+ if use libsecret ; then |
| 341 |
+ cd "${S}"/contrib/credential/libsecret |
| 342 |
+ dobin git-credential-libsecret |
| 343 |
fi |
| 344 |
|
| 345 |
if use subversion ; then |
| 346 |
@@ -481,7 +484,6 @@ src_install() { |
| 347 |
dodir /usr/share/${PN}/contrib |
| 348 |
# The following are excluded: |
| 349 |
# completion - installed above |
| 350 |
- # credential/gnome-keyring TODO |
| 351 |
# diff-highlight - done above |
| 352 |
# emacs - installed above |
| 353 |
# examples - these are stuff that is not used in Git anymore actually |
| 354 |
@@ -494,11 +496,17 @@ src_install() { |
| 355 |
# subtree - build seperately |
| 356 |
# svnimport - use git-svn |
| 357 |
# thunderbird-patch-inline - fixes thunderbird |
| 358 |
- for i in \ |
| 359 |
- buildsystems convert-objects fast-import \ |
| 360 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 361 |
- stats workdir \ |
| 362 |
- ; do |
| 363 |
+ local contrib_objects=( |
| 364 |
+ buildsystems |
| 365 |
+ fast-import |
| 366 |
+ hg-to-git |
| 367 |
+ hooks |
| 368 |
+ remotes2config.sh |
| 369 |
+ rerere-train.sh |
| 370 |
+ stats |
| 371 |
+ workdir |
| 372 |
+ ) |
| 373 |
+ for i in "${contrib_objects[@]}" ; do |
| 374 |
cp -rf \ |
| 375 |
"${S}"/contrib/${i} \ |
| 376 |
"${ED}"/usr/share/${PN}/contrib \ |
| 377 |
@@ -555,7 +563,7 @@ src_install() { |
| 378 |
} |
| 379 |
|
| 380 |
src_test() { |
| 381 |
- local disabled="" |
| 382 |
+ local disabled="t9128-git-svn-cmd-branch.sh" |
| 383 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 384 |
t9400-git-cvsserver-server.sh \ |
| 385 |
t9401-git-cvsserver-crlf.sh \ |
| 386 |
|
| 387 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 388 |
index 5e3e6d6543..a1f5e74e5a 100644 |
| 389 |
--- a/dev-vcs/git/git-9999.ebuild |
| 390 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 391 |
@@ -38,17 +38,18 @@ if [[ ${PV} != *9999 ]]; then |
| 392 |
doc? ( |
| 393 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 394 |
)" |
| 395 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 396 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 397 |
fi |
| 398 |
|
| 399 |
LICENSE="GPL-2" |
| 400 |
SLOT="0" |
| 401 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 402 |
+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" |
| 403 |
|
| 404 |
# Common to both DEPEND and RDEPEND |
| 405 |
CDEPEND=" |
| 406 |
!libressl? ( dev-libs/openssl:0= ) |
| 407 |
libressl? ( dev-libs/libressl:= ) |
| 408 |
+ libsecret? ( app-crypt/libsecret ) |
| 409 |
sys-libs/zlib |
| 410 |
pcre? ( dev-libs/libpcre ) |
| 411 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 412 |
@@ -58,7 +59,7 @@ CDEPEND=" |
| 413 |
webdav? ( dev-libs/expat ) |
| 414 |
) |
| 415 |
emacs? ( virtual/emacs ) |
| 416 |
- gnome-keyring? ( gnome-base/libgnome-keyring )" |
| 417 |
+" |
| 418 |
|
| 419 |
RDEPEND="${CDEPEND} |
| 420 |
gpg? ( app-crypt/gnupg ) |
| 421 |
@@ -117,7 +118,7 @@ REQUIRED_USE=" |
| 422 |
|
| 423 |
PATCHES=( |
| 424 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 425 |
- "${FILESDIR}"/git-2.10.0-optional-cvs.patch |
| 426 |
+ "${FILESDIR}"/git-2.12.0-optional-cvs.patch |
| 427 |
|
| 428 |
# install mediawiki perl modules also in vendor_dir |
| 429 |
# hack, needs better upstream solution |
| 430 |
@@ -192,6 +193,8 @@ exportmakeopts() { |
| 431 |
|| myopts+=" NO_PTHREADS=YesPlease" |
| 432 |
use cvs \ |
| 433 |
|| myopts+=" NO_CVS=YesPlease" |
| 434 |
+ use elibc_musl \ |
| 435 |
+ && myopts+=" NO_REGEX=YesPlease" |
| 436 |
# Disabled until ~m68k-mint can be keyworded again |
| 437 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 438 |
# myopts+=" NO_MMAP=YesPlease" |
| 439 |
@@ -361,12 +364,12 @@ src_compile() { |
| 440 |
cd "${S}" |
| 441 |
fi |
| 442 |
|
| 443 |
- if use gnome-keyring ; then |
| 444 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 445 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
| 446 |
+ if use libsecret ; then |
| 447 |
+ cd "${S}"/contrib/credential/libsecret |
| 448 |
+ git_emake || die "emake git-credential-libsecret failed" |
| 449 |
fi |
| 450 |
|
| 451 |
- cd "${S}"/contrib/subtree |
| 452 |
+ cd "${S}"/contrib/subtree || die |
| 453 |
git_emake |
| 454 |
use doc && git_emake doc |
| 455 |
|
| 456 |
@@ -461,9 +464,9 @@ src_install() { |
| 457 |
doexe contrib/contacts/git-contacts |
| 458 |
dodoc contrib/contacts/git-contacts.txt |
| 459 |
|
| 460 |
- if use gnome-keyring ; then |
| 461 |
- cd "${S}"/contrib/credential/gnome-keyring |
| 462 |
- dobin git-credential-gnome-keyring |
| 463 |
+ if use libsecret ; then |
| 464 |
+ cd "${S}"/contrib/credential/libsecret |
| 465 |
+ dobin git-credential-libsecret |
| 466 |
fi |
| 467 |
|
| 468 |
if use subversion ; then |
| 469 |
@@ -481,7 +484,6 @@ src_install() { |
| 470 |
dodir /usr/share/${PN}/contrib |
| 471 |
# The following are excluded: |
| 472 |
# completion - installed above |
| 473 |
- # credential/gnome-keyring TODO |
| 474 |
# diff-highlight - done above |
| 475 |
# emacs - installed above |
| 476 |
# examples - these are stuff that is not used in Git anymore actually |
| 477 |
@@ -494,11 +496,17 @@ src_install() { |
| 478 |
# subtree - build seperately |
| 479 |
# svnimport - use git-svn |
| 480 |
# thunderbird-patch-inline - fixes thunderbird |
| 481 |
- for i in \ |
| 482 |
- buildsystems convert-objects fast-import \ |
| 483 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
| 484 |
- stats workdir \ |
| 485 |
- ; do |
| 486 |
+ local contrib_objects=( |
| 487 |
+ buildsystems |
| 488 |
+ fast-import |
| 489 |
+ hg-to-git |
| 490 |
+ hooks |
| 491 |
+ remotes2config.sh |
| 492 |
+ rerere-train.sh |
| 493 |
+ stats |
| 494 |
+ workdir |
| 495 |
+ ) |
| 496 |
+ for i in "${contrib_objects[@]}" ; do |
| 497 |
cp -rf \ |
| 498 |
"${S}"/contrib/${i} \ |
| 499 |
"${ED}"/usr/share/${PN}/contrib \ |
| 500 |
@@ -555,7 +563,7 @@ src_install() { |
| 501 |
} |
| 502 |
|
| 503 |
src_test() { |
| 504 |
- local disabled="" |
| 505 |
+ local disabled="t9128-git-svn-cmd-branch.sh" |
| 506 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
| 507 |
t9400-git-cvsserver-server.sh \ |
| 508 |
t9401-git-cvsserver-crlf.sh \ |
Archives