From 1a92e6aafd2dee47fd415e4e1c6f5c9b3be2df30 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Apr 2019 15:20:48 +0000 Subject: [PATCH 1/4] bump(metadata/glsa): sync with upstream --- .../portage-stable/metadata/glsa/Manifest | 30 ++--- .../metadata/glsa/Manifest.files.gz | Bin 438854 -> 440123 bytes .../metadata/glsa/glsa-201904-01.xml | 49 ++++++++ .../metadata/glsa/glsa-201904-02.xml | 50 ++++++++ .../metadata/glsa/glsa-201904-03.xml | 46 ++++++++ .../metadata/glsa/glsa-201904-04.xml | 47 ++++++++ .../metadata/glsa/glsa-201904-05.xml | 51 ++++++++ .../metadata/glsa/glsa-201904-06.xml | 69 +++++++++++ .../metadata/glsa/glsa-201904-07.xml | 109 ++++++++++++++++++ .../metadata/glsa/glsa-201904-08.xml | 52 +++++++++ .../metadata/glsa/timestamp.chk | 2 +- .../metadata/glsa/timestamp.commit | 2 +- 12 files changed, 490 insertions(+), 17 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-01.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-02.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-03.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-04.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-05.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-06.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-07.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-08.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest index 88817494ae..fe1b572b30 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -MANIFEST Manifest.files.gz 438854 BLAKE2B ca65213463786d39d41485af7ea84eff3024cf674a90349e25e12c216efcd63b50848be0dd7fb7c54db79b6279385d7b09488386ffd96909db99671090ea4f08 SHA512 6572d8ad2e9aad4fbe11ff52d8aa91113cb87e207974cdb6aa98101ae4a50b77b173f68eba733267e1a109e70f86139ed901b5a4ee05472f22a8d3024aa9acb5 -TIMESTAMP 2019-03-28T13:38:46Z +MANIFEST Manifest.files.gz 440123 BLAKE2B 47652947d6c26c7bbac6a5c0bd24fb3c439032faa43da521eacb80cffe306ba49152b4848845d3bd677e90481d8a7f19855a790d203085d2cb6d866eca1771b5 SHA512 51daf36dd12ed79db6c4817f04ce4f65259ca3bdd0a5bba3ce51df64b42b9630e4a8a51c1c35db67c1d1be1b6a33e8ba1a2a4597de4a7ffe2b7186f3fd88503a +TIMESTAMP 2019-04-02T14:38:49Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyczmZfFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyjc/lfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klDYWhAAo1sblmnGYIlx9TtDfDwZAhcScB0WxacZHB1VfQlHTv99u5+rtGZHRbrS -OgsjKvrvHGyAdL11mOncCxusWKLMICEbukgv9bAwPDSe4ZJssgCA6dWBlKqs08rD -9T+xcGop/7L9hOOOjRCkjp5oiT11XT1QO3CmxCAudvBGWL3warElsl0NqXlR3pQU -2wFHj1VjlN5TZ3aAKx327N+TO4PzV7OI4IXz1F1I40H3o7df4k1QA01QMKwqngov -fcVUpuCaS6j+szZg/34On/eGqL6P3Zlgi2nA1Bj/L39DoCRzzdsWo50qhD8ckApa -VLVqL7mur7j8h0Q4cStu/7F0H66cEpqEvRfiEv6eMEQ2QWPoGWTI3lo+Rmoz3QC/ -fIrCsAWMxWIZCNbtSdDLKklhPFsDcTFyBpUF1ZBS0oFWkQioK8BWvs0A5w/sLVL1 -sat5Apk1ygCTeeeX8KBQizu3I6uKco17SqihcAwRHooCJuNPAPRxM9lbpWiQ+PPE -C+w0MSbDD77Vq89+BKo8eA/LGvaIn4pfV+39ijhhsEIWmv/RjXMr9noKkID8wTAK -Dfe2HY9P/o6zhziXpiskTN8hk5ootmODbC3jAPOAfLqQeDIHyTXN+bYKpVtZCFh7 -lWdqHx9+3V3xlcBrW8MDxMq0Gpghcc0eCLPx3kSHYzgoXvi3ZPg= -=0j+W +klCw7g/9HNNxIMGlCPXL3nWsUvd5f2mbf97RrRtVB8c45y2+92Him54LDRe7Q85d +yWQiYAxjwHyjkAMRAC5iaR6bF9+IG79Su+ncR+AzRNPJu++Y9AHGiMXynqQis5uy +b6FJuiOhc+VsfMIyNvJZT44NVF9dIKnGtL/SpPIbHDzrvqP9qsDtzpNfHTa5IsNC +7Br8ho0ReC8cM9kEATsqg7kCkLx5WokuIlYwsuoQA6xEnkHTcDMZxpNZazgskhlk +SLhr8XpOoau/SvJQz7Xcx4KN1DGg9tEN0CSJ0olpHbsclo/ej3tZMXNtiLnXJf6y +Hti7G3pGDl0xylA8agE0QzDhB++G32DRpZwk7TB2JYBeElPsM7mzAN0L/DI+KYKi +Nz35MYvNjZbchs84VZGaWM+3UoebdX1ZQcVhIsK6HTQ77AVuOs4B9zJtOiCGeh8j +iyNFD9CVooFfg3IzwRz7DHzu/n/mWbpNKPOTT00j/jMEgew5Kq9TsKXZNB3lqFYe +mdSiL6s3eZI24RwZgDXwvUeqOkzb4r/GptdGnpXDwNaPASV8YhpRqtX+L08LJW4Q +AfVvtxELrzXqqvoH/cr8soDDGHLaq8I4ZaDli4/Xqfr4ikHdgHHFkrn5SZhLMham +vrwFYgk5tiGDJ6JBdgL9TPbGgQrL69Iyw2AYwM4ThhcZiwD1nZE= +=ydvg -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz index a3e404e2fdf5ad94011c5eff55470fef70b0ea41..91c7580233b54231bf0a2f2edffe0e9a8e7fe74a 100644 GIT binary patch delta 3253 zcmV;m3`+CHy;Qr#+|t<*5RE_X_=Q{h9!k8eF% ze})nRTIzHKfDirpHo)knf(uU&z>W^Gqz|k0xW(Y;ybweM9c_+f2g&)#rf>)2k?s_U zu#_iSA6?cYh@$Q_lDL5Q$%epOW=JdnkW1~%LG5BpSg>1Z{GI)Iae$_2ta=T7+IsHG z@DqskauF%gK=^~4b@noKZkYtFqc33=f2sK6&~@|JbpKLbNa={_u!;`Sx=!qFageO@ zozxtC0`^Ylw1_SM5i2!T#tCRGllH7PrY`kl7^}4`G(yDoM+Eg&&X#oiAt*)fGTBMWO(kat30JU9oe~p5h zQe1tUUEWd9@&4K0D!{XtPQ49S+cPQ^s>6$>#rI%Icn`$Ae&^W60{4Hg=+d|0gqf0J^1>jp|- z246iIXhAoUWmnpW-i!RH2SK13PKR<6hct#{e?EY6+(^gC56^qaT2#^yuX$7P{wnip z!`lek&4B6=-%d}cE=FOHmEw4!Q=oj+ERe8xA$VL$tl`}LpY66*>v4-w z-)_iKzwMp}jS??ScoU_+`l7{OqK{o)S0mK9^3T98!-3CbYiCPJO->aflteLfY?@m5 zTnaKIeNgO3`OKt8ausMyLfB;)tPjqs2cdwmW5%q{p}QbQE<3Ldf8h6$BzT*@_b5SD zbELQ^*Ck}bh%%u@R!`_~?5>HIXgHmmt;MoU*Kj zzyl-}a>X!iZhEc8;C0(EvsW%_YUJDn*SZLRHmaj-K_&c6=U0wUU;JFT6nu;A=1+0! z>16s^t!?>EYgET^Iil9}Wliz|OUbzk0;-16mRf04T-QdHedgvU=*O4 zU$O$(yPEyDl^wiP8{3sr)*#72k>q}jc6Y){H<0XZDX1iD02p&Fqay{><%TFnLoH~5 z9k*o@tH3EGH#IWnU8sp1_wYV^XD#Q~+`ft$0PA^37fiB*fqt7K9z%!Jp&+RRE3fL$ ztMy<~a^zoFe_r3mcB#k4(KuzDC-U1~h0#2UIFdLb#q&#xjvPf~k$Yo%K@S-{1<$s3 zmW~5JO+pG)nE}95(&?B8hx=l~fK&MniX|~mv75<9dpR%x-*ZCvE1b$x6K3S!eMr z@K$%dSJh|uP$xc^l=}R=>O_*eAY#$=2nb$IZ{51q(Wa;?A_a*|Mgfei=;l1Gqr#N& z7u%Gw{3dNRhb+cCWiIJwo>JgwC}glp^COcGf0HzNP|kYeSF5&GpXwR>?Y;%7EWV+W z-T~Z-n@UxAI)f?+BIx=s`XG_tmu6UHlFa}N=QGL^K8Boz zg^zdday5&)wuQ0SY{{PrE{TI}mqemgEHt#7B&}0Yf)j$Kte~*WtK_-Jc0r|UsviA` zDHQ=4%~>>EC#zB*L`Xv9^{3uxdilP-e<6qq>>O0f9g_COlFqmV+d~%Vp4s>+$((Gk zt|Xz}msLc(nnbrg2wl+?LOD^I{Y5|kIf7|`4rvCm(@j0*l{X6xTnfu@OtWs@a(eUT zl&!VjGxbwP0Jh~&LDWE)rA&BhRF*+6K|+20%ch1ltXX^7Q8`myV&7_IQ+rU*e}Sa* zsEND8qzRy{HaWb(;wZ&T9Yn5e-qw%tVYR+}U*A-J(rGDv8vnG3CjA}JZLljSAa`ry=oy!2{KE{GU+!y z;PJfksVW63`Qn@%XVL+9wrQ=0e^NsP$XhbFMwcq9$`JuRl{Lai5Lk>2t+KC6?KJ+H zrYgEHL>plWH9FnKdIGMC98vXZm#0!=52V;Wtk$Ed&iT#hA@r~Dfx;)VJh86UI-byD zIeQW?g7ee75vzGnz+Jks4!7Z>=St>tDxRHSKTdBHuMHipR}G}->>YG|f8^KYusph0 zXQg`-DQd6VSGGWwo*gZ#0NayfMoh_|V&2rT+icUASnUoCB0+JES8*KcY88Tl05hBb zXU;b&UW#zBVLgyrz z<)b}fssm|CRJMfm!FdRWe@&)M4f-xIoveAWV>%xaeA&oc=TJ(BNEUOwD+V(J%g%iouE|-kKT@U3gmIxXyN}fPQO+lQm9dYgvbptB&N#sCzb4+_~d$ zUQ<&%#}aLd@=?fqmlCm+6GfmWk~#0DoxpOiJ#Fvu+#go!yQif5=%A_R5r4Q%k>NA8L~pv)sI(g$Je5r<3@&AxrU1OLv#~v3z^H zpy527B<*q6JIQmI6cA%LV~hB&ZLYOMN)kF`QK@=E zpsp<6ndODs$!N|F%=BC>PBB&ckz~@`g?ejuYIW$r>?G)1e<0rJfVP88(%h&hSe5Jzg@f? z3TuU6r^cz?&k3^RTXu(N_nV502(wAob+V|4!&Fw8&PSVkG_`l`{?p#7-@Vhf$(86t zF97FMY;sZjv;D1^NzsJjL&7NWw5p92*#S0@?CQoDe-_0{ahWdvPY#WG8&n}|MlzyJD=fBx&2 nzyAE~AIJFb&;H|&zg_?S&xil~{l|~re*WcuR?wk3AHEC#&0$x5 delta 1974 zcmV;n2TAz5?i$AA8i0fWgaU*Egam{Iv<9`Re`l8?Neu+y_dNwCKz9AO>;oXg3rO6+ zuCm1njX+}WFTT&++ckoo$5GErjmyrANM}aaRxWW{>Sm9uYKtA}G#vpoOwqTElXq8| z2`Hj#;#b`YFp6ZR)SG$UiyqxkvlNq}YfTW>L6;@kn=yL`da{ z)!?$h#a8@&f9Se-1l_-s7g9Q6IINPK)RQ5Rs{|GEP8inY8SBW9m{*Hoo4i*7r`z{mzNbN*@{{bNq&KsW338!l8eG z0EMKcft#%?T`y^iw_X=GNt!i}-hv87JS_l$y;YSoSBrGOEuAuL5vc8=YZP3Rf8wgW zRr`*jj`y$nRsx=_ThrTswQZ|Xp*p;1T6}eug!e$)tJj{1%JA7ToCvk01rA!L$<<+} zF<7&7XJo8D4l)&tQ@)Z39%&2N(G_PZU{<+k1ZgYuyOa1`?=*f=I8aoLR@_~CI)S&K{>;xz{q@6R+I8{R_L zVg^)?_;Pwebuoy+t`x@$odV^vW`TsoW1l*wNsrsCYL2Rsny7?qM|>hS>L1VUCm<$? zqT=ktlnM{xT@RI%vqv@ZjKi!aR z^|E>%HA*}+;oYGA>We0Si9U99UX8$W?LPy*bO%1Ct(_$)H91v`P!h$^5j3^%xfEpB z^g*#A(6LvfK&Dpx~YLMXUiA@Bf+ zg|ppEQkTT}@@=={nNs9x%pk(dO4Zi zs}-j2v_^Ftmt)nsKFvv9U@19QK|s||%2X>|71yrsvYN@ib~`Y4Ub(8W&Uz@E&Q{GuKaOrU^alG; z_5&ibI%f@KEjw>w_3&8)SKqAL7cV>s_ADJh9(hMC)Xwye^?@H+de4ryn5j zcD~_>uTIMC&WWRIio&CIG6ipR@kGJwp=sI4NH6Il?`c&Mec7w3(S{#*S=dfu+_h?p zl#4=1_NqH!!AV;R0Pu11TI@b0-|N_^3et4y@v78e=+|mhtJeUuNV=Cib8^UXq-w8g zG@a(8f32`7Ke0NTJ7pq*U_*i0c-Y*1O`|AK&@n-uGX%DyRMO@?G+9|scUDWj1>WkS z_p15~Z+POflTx3*n|D~%eA^;NLm`93Ha{{6F-fBbf90$Lzgo4m{8G>0Z`TlES$v?9-T~Z- zA6?oa7vW=BY8Hv#GGk<_xM$5K-5MUOS2WIyJ*egKP$1Xs;+w_~`aDOnkg} zm#bOa879VJvu*xVbV(d+J8dK?Nur_UBxxN=2~LQbvVy{PUM0^(wu>rV!+P{5hAILy zinD0CPG+S*h>(QHbA0*b=U;#O{ih$kAbtJl|9q<-fB$&?@#mXw{`K+k_1l+!0cFB5 IA+NLy00n5pV*mgE diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-01.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-01.xml new file mode 100644 index 0000000000..413cf96f36 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-01.xml @@ -0,0 +1,49 @@ + + + + Cairo: Denial of Service + Multiple vulnerabilities were found in Cairo, the worst of which + could cause a Denial of Service condition. + + cairo + 2019-04-02 + 2019-04-02 + 596756 + 625636 + 672908 + remote + + + 1.16.0-r3 + 1.16.0-r3 + + + +

Cairo is a 2D vector graphics library with cross-device output support.

+ + +

Multiple vulnerabilities have been discovered in Cairo. Please review + the CVE identifiers referenced below for details. +

+ + +

Please review the referenced CVE identifiers for details.

+ + +

There is no known workaround at this time.

+ + +

All Cairo users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=x11-libs/cairo-1.16.0-r2" + + + + CVE-2016-9082 + CVE-2017-9814 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-02.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-02.xml new file mode 100644 index 0000000000..dbf891e06d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-02.xml @@ -0,0 +1,50 @@ + + + + Libical: Multiple vulnerabilities + Multiple vulnerabilities have been found in Libical, the worst of + which could result in a Denial of Service condition. + + libical + 2019-04-02 + 2019-04-02 + 587572 + 587574 + remote + + + 3.0.0 + 3.0.0 + + + +

An Open Source implementation of the iCalendar protocols and protocol + data units. +

+ + +

Multiple vulnerabilities have been discovered in Libical. Please review + the referenced CVE identifiers for details. +

+ + +

Please review the referenced CVE identifiers for details.

+ + +

There is no known workaround at this time.

+ + +

All Libical users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-libs/libical-3.0.0" + + + + CVE-2016-5823 + CVE-2016-5824 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-03.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-03.xml new file mode 100644 index 0000000000..8a5ae4cdfa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-03.xml @@ -0,0 +1,46 @@ + + + + Unbound: Multiple vulnerabilities + Multiple vulnerabilities have been found in Unbound, the worst of + which could lead to privilege escalation. + + unbound + 2019-04-02 + 2019-04-02 + 641042 + 677054 + remote + + + 1.8.3 + 1.8.3 + + + +

Unbound is a validating, recursive, and caching DNS resolver.

+ + +

Multiple vulnerabilities have been discovered in Unbound. Please review + the referenced bugs for details. +

+ + +

Please review the referenced bugs for details.

+ + +

There is no known workaround at this time.

+ + +

All Unbound users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-dns/unbound-1.8.3" + + + + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-04.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-04.xml new file mode 100644 index 0000000000..4dbd20dd48 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-04.xml @@ -0,0 +1,47 @@ + + + + Poppler: Multiple vulnerabilities + Multiple vulnerabilities have been found in Poppler, the worst of + which could allow a Denial of Service. + + poppler + 2019-04-02 + 2019-04-02 + 659828 + 670880 + remote + + + 0.70.0 + 0.70.0 + + + +

Poppler is a PDF rendering library based on the xpdf-3.0 code base.

+ + +

Multiple vulnerabilities have been discovered in Poppler. Please review + the CVE identifiers referenced below for details. +

+ + +

Please review the referenced CVE identifiers for details.

+ + +

There is no known workaround at this time.

+ + +

All Poppler users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-text/poppler-0.70.0" + + + + CVE-2018-19149 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-05.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-05.xml new file mode 100644 index 0000000000..32f4490fde --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-05.xml @@ -0,0 +1,51 @@ + + + + BURP: Root privilege escalation + A vulnerability was discovered in Gentoo's ebuild for BURP which + could lead to root privilege escalation. + + burp + 2019-04-02 + 2019-04-02 + 641842 + local + + + 2.1.32-r1 + 2.1.32-r1 + + + +

A network backup and restore program.

+ + +

It was discovered that Gentoo’s BURP ebuild does not properly set + permissions or place the pid file in a safe directory. Additionally, the + first set of patches did not completely address this. As such, a + revision has been made available that addresses all concerns of the + initial report. +

+ + +

A local attacker could escalate privileges.

+ + +

Users should ensure the proper permissions are set as discussed in the + referenced bugs. +

+ + +

All BURP users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-backup/burp-2.1.32-r1" + + + + CVE-2017-18285 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-06.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-06.xml new file mode 100644 index 0000000000..e5338d314d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-06.xml @@ -0,0 +1,69 @@ + + + + GlusterFS: Multiple Vulnerabilities + Multiple vulnerabilities have been found in GlusterFS, the worst of + which could result in the execution of arbitrary code. + + glusterfs + 2019-04-02 + 2019-04-02 + 653070 + 658606 + 664336 + 670088 + remote + + + 4.1.8 + 4.1.8 + + + +

A free and open source software scalable network filesystem.

+ + +

Multiple vulnerabilities have been discovered in GlusterFS. Please + review the referenced CVE identifiers for details. +

+ + +

Please review the referenced CVE identifiers for details.

+ + +

There is no known workaround at this time.

+ + +

All GlusterFS users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=sys-cluster/glusterfs-4.1.8" + + + + CVE-2018-10841 + CVE-2018-1088 + CVE-2018-10904 + CVE-2018-10907 + CVE-2018-10911 + CVE-2018-10913 + CVE-2018-10914 + CVE-2018-10923 + CVE-2018-10924 + CVE-2018-10926 + CVE-2018-10927 + CVE-2018-10928 + CVE-2018-10929 + CVE-2018-10930 + CVE-2018-14651 + CVE-2018-14652 + CVE-2018-14653 + CVE-2018-14654 + CVE-2018-14659 + CVE-2018-14660 + CVE-2018-14661 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-07.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-07.xml new file mode 100644 index 0000000000..0cddfaf2c8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-07.xml @@ -0,0 +1,109 @@ + + + + Mozilla Thunderbird and Firefox: Multiple vulnerabilities + Multiple vulnerabilities have been found in Mozilla Thunderbird and + Firefox, the worst of which could lead to the execution of arbitrary code. + + thunderbird,firefox,mozilla + 2019-04-02 + 2019-04-02 + 676954 + 678072 + 681834 + 681836 + remote + + + 60.6.1 + 60.6.1 + + + 60.6.1 + 60.6.1 + + + 60.6.1 + 60.6.1 + + + 60.6.1 + 60.6.1 + + + +

Mozilla Thunderbird is a popular open-source email client from the + Mozilla project. + Mozilla Firefox is a popular open-source web browser from the Mozilla + Project. +

+ + +

Multiple vulnerabilities have been discovered in Mozilla Thunderbird and + Firefox. Please review the referenced Mozilla Foundation Security + Advisories and CVE identifiers below for details. +

+ + +

Please review the referenced Mozilla Foundation Security Advisories and + CVE identifiers below for details. +

+ + +

There is no known workaround at this time.

+ + +

All Thunderbird users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=mail-client/thunderbird-60.6.1" + + +

All Thunderbird bin users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=mail-client/thunderbird-bin-60.6.1" + + +

All Firefox users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-client/firefox-60.6.1" + + +

All Firefox bin users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-60.6.1" + + + + CVE-2016-5824 + CVE-2018-18335 + CVE-2018-18356 + CVE-2018-18500 + CVE-2018-18501 + CVE-2018-18505 + CVE-2018-18506 + CVE-2018-18509 + CVE-2018-18512 + CVE-2018-18513 + CVE-2019-5785 + CVE-2019-9788 + CVE-2019-9790 + CVE-2019-9791 + CVE-2019-9792 + CVE-2019-9793 + CVE-2019-9795 + CVE-2019-9796 + CVE-2019-9810 + CVE-2019-9813 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-08.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-08.xml new file mode 100644 index 0000000000..9a634deb75 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201904-08.xml @@ -0,0 +1,52 @@ + + + + Subversion: Denial of Service + A vulnerability in Subversion could lead to a Denial of Service + condition. + + subversion + 2019-04-02 + 2019-04-02 + 676094 + remote + + + 1.10.4 + 1.10.4 + + + +

Subversion is a version control system intended to eventually replace + CVS. Like CVS, it has an optional client-server architecture (where the + server can be an Apache server running mod_svn, or an ssh program as in + CVS’s :ext: method). In addition to supporting the features found in + CVS, Subversion also provides support for moving and copying files and + directories. +

+ + +

A vulnerability was discovered in Subversion’s mod_dav_svn, that could + lead to a Denial of Service Condition. +

+ + +

An attacker could cause a possible enial of Service condition.

+ + +

There is no known workaround at this time.

+ + +

All Subversion users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-vcs/subversion-1.10.4" + + + + CVE-2018-11803 + + BlueKnight + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk index 6a887f3f03..26ed3b258b 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 28 Mar 2019 13:38:42 +0000 +Tue, 02 Apr 2019 14:38:45 +0000 diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit index f476da4fbe..c5e0ca87f2 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit @@ -1 +1 @@ -821df578dd1e4239ed7205c587587491907ef45c 1553739754 2019-03-28T02:22:34+00:00 +30de0bf9ee6986a07eef489491b435e55fc9cafe 1554179778 2019-04-02T04:36:18+00:00 From d2f311c75044ed6b876672a26ee8637837d2e8e6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Apr 2019 15:21:10 +0000 Subject: [PATCH 2/4] dev-vcs/mercurial: Drop dead package --- .../portage-stable/dev-vcs/mercurial/Manifest | 5 - .../mercurial/files/70mercurial-gentoo.el | 3 - .../dev-vcs/mercurial/files/cacerts.rc | 2 - .../files/mercurial-3.0.1-po_fixes.patch | 40 ----- .../dev-vcs/mercurial/mercurial-3.8.4.ebuild | 134 --------------- .../dev-vcs/mercurial/mercurial-4.1.3.ebuild | 134 --------------- .../dev-vcs/mercurial/mercurial-4.3.1.ebuild | 134 --------------- .../dev-vcs/mercurial/mercurial-4.3.2.ebuild | 134 --------------- .../dev-vcs/mercurial/mercurial-4.3.ebuild | 134 --------------- .../dev-vcs/mercurial/mercurial-9999.ebuild | 154 ------------------ .../dev-vcs/mercurial/metadata.xml | 13 -- .../md5-cache/dev-vcs/mercurial-3.8.4 | 14 -- .../md5-cache/dev-vcs/mercurial-4.1.3 | 14 -- .../metadata/md5-cache/dev-vcs/mercurial-4.3 | 14 -- .../md5-cache/dev-vcs/mercurial-4.3.1 | 14 -- .../md5-cache/dev-vcs/mercurial-4.3.2 | 14 -- .../metadata/md5-cache/dev-vcs/mercurial-9999 | 12 -- 17 files changed, 969 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/70mercurial-gentoo.el delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/cacerts.rc delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-3.8.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.1.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-3.8.4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.1.3 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-9999 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/Manifest deleted file mode 100644 index f1b1cf726d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST mercurial-3.8.4.tar.gz 4775341 SHA256 4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6 SHA512 2ee785f631f9ae346e10ca77251a9ce6d3dacd598588c39f1a69ce1f4b668866f6109d682428512c37c300b26741b74672195538d66845e85cfff5ead886cf4c WHIRLPOOL 1f0a12cc6d00f3544ab00e011a9ff9308fe1652c0598045ddba2a41ba17b55c291da200bce85d4c600d673b8746e936c441ffa7398ad810d1069bd97fb32f2db -DIST mercurial-4.1.3.tar.gz 5134965 SHA256 103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8 SHA512 794c513b7e061bc56d270ef57adc0fadeffd5bcc988da0934b24db686b76bf573aef2bbaa3baa9220f31463795bc6e6a99fc1284ebcf8d7e49f42b8129347811 WHIRLPOOL a2f5d5e3e89f794415521bf0bc93ff0e8a67aec6c39951437b6b585f9f6d604bd556af10cce50951128c746719db54ea48f86fb7c262a36a29576ba539be1e79 -DIST mercurial-4.3.1.tar.gz 5475042 SHA256 2b12f02e3a452adff4ec9cf007017bab0cadb3f37eaf12f4b25a662df73618a2 SHA512 4c42d06b7f111a3e825dd927704a30f88f0b2225cf87ab8954bf53a7fbc0edf561374dd49b13d9c10140d98ff5853a64acb5a744349727abae81d32da401922b WHIRLPOOL 4360763be405d75ffc0e3e2356fcfe44079bf9818c07211964ba7433932956283feb329379af329e0a7d70acc5c6a163a9c08976abb902197d6a6f0180a3a958 -DIST mercurial-4.3.2.tar.gz 5491214 SHA256 0f5bf688ba2add6f5db98a633edef43411ecf2c7ada5f2e14b9265820a96cd48 SHA512 e69b7cff941d83531d59d91c30e336807f868302dfda565e1421b7d34c2769221220686774af236d86ac0f67dba6e8a0947ed1185b30d89463a8d211e20d1cbc WHIRLPOOL 079d05e75cde63ff907b485a45a6a9cf8b42001525a799939647d05dd60d85c1faa0cbf14b9da95488103ec9f0b177f59ad7d8bde93dca3ffe428d697669bd4e -DIST mercurial-4.3.tar.gz 5469979 SHA256 ebf11176e9b5354ec7a1bde6c5382c914d10c397410531faf89f8b5124a7cb65 SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417 WHIRLPOOL 54583dbc826fdec3e737dc49d1a8ce180d29579d091c86e48a3b7c68bb4a2d399c5aff3b2ff0e30cd911e8955537a621c73c330d70a55f7efcdeafd21257178f diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/70mercurial-gentoo.el b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/70mercurial-gentoo.el deleted file mode 100644 index 5779a612f2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/70mercurial-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -;;; mercurial site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") \ No newline at end of file diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/cacerts.rc b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/cacerts.rc deleted file mode 100644 index 240261c536..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/cacerts.rc +++ /dev/null @@ -1,2 +0,0 @@ -[web] -cacerts = /etc/ssl/certs/ca-certificates.crt diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch deleted file mode 100644 index a48932ee9f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- mercurial-3.0.1/i18n/el.po -+++ mercurial-3.0.1/i18n/el.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2009-12-02 03:23+0200\n" - "Last-Translator: \n" - "Language-Team: Greek\n" -+"Language: el\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- mercurial-3.0.1/i18n/fr.po -+++ mercurial-3.0.1/i18n/fr.po -@@ -90,6 +90,7 @@ - "PO-Revision-Date: 2009-10-25 12:43+0100\n" - "Last-Translator: Cedric Duval \n" - "Language-Team: French\n" -+"Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- mercurial-3.0.1/i18n/ro.po -+++ mercurial-3.0.1/i18n/ro.po -@@ -110,6 +110,7 @@ - "PO-Revision-Date: 2011-06-08 17:00+0200\n" - "Last-Translator: Daniel Dumitriu \n" - "Language-Team: Romanian <>\n" -+"Language: ro\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- mercurial-3.0.1/i18n/zh_CN.po -+++ mercurial-3.0.1/i18n/zh_CN.po -@@ -51,6 +51,7 @@ - "PO-Revision-Date: 2009-03-31 20:38+0200\n" - "Last-Translator: Dongsheng Song \n" - "Language-Team: Chinese translation team \n" -+"Language: zh_CN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-3.8.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-3.8.4.ebuild deleted file mode 100644 index 69641b439a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-3.8.4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.1.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.1.3.ebuild deleted file mode 100644 index a04546c6f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.1.3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.1.ebuild deleted file mode 100644 index a04546c6f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.2.ebuild deleted file mode 100644 index a04546c6f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.ebuild deleted file mode 100644 index 8ad8f85967..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-4.3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-9999.ebuild deleted file mode 100644 index ca65f32e36..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/mercurial-9999.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="http://mercurial.selenic.com/" -EHG_REPO_URI="http://selenic.com/repo/hg" -EHG_REVISION="@" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="bugzilla emacs gpg test tk zsh-completion" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - zsh-completion? ( app-shells/zsh ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] ) - dev-python/docutils[${PYTHON_USEDEP}]" - -SITEFILE="70${PN}-gentoo.el" - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - emake doc - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - fi - - rm -f doc/*.?.txt || die - dodoc CONTRIBUTORS doc/*.txt - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -rf contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - cat > "${T}/80mercurial" <<-EOF -HG="${EPREFIX}/usr/bin/hg" -EOF - doenvd "${T}/80mercurial" - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - cd tests || die - rm -rf *svn* || die # Subversion tests fail with 1.5 - rm -f test-archive* || die # Fails due to verbose tar output changes - rm -f test-convert-baz* || die # GNU Arch baz - rm -f test-convert-cvs* || die # CVS - rm -f test-convert-darcs* || die # Darcs - rm -f test-convert-git* || die # git - rm -f test-convert-mtn* || die # monotone - rm -f test-convert-tla* || die # GNU Arch tla - rm -f test-doctest* || die # doctest always fails with python 2.5.x - rm -f test-largefiles* || die # tends to time out - if [[ ${EUID} -eq 0 ]]; then - einfo "Removing tests which require user privileges to succeed" - rm -f test-command-template* || die # Test is broken when run as root - rm -f test-convert* || die # Test is broken when run as root - rm -f test-lock-badness* || die # Test is broken when run as root - rm -f test-permissions* || die # Test is broken when run as root - rm -f test-pull-permission* || die # Test is broken when run as root - rm -f test-clone-failure* || die - rm -f test-journal-exists* || die - rm -f test-repair-strip* || die - fi - - cd .. || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/metadata.xml deleted file mode 100644 index 6f2bedbfd6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/mercurial/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - polynomial-c@gentoo.org - Lars Wendler - - - Support bugzilla integration. - Support signing with GnuPG. - Install dev-lang/tk for hgk script. - - diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-3.8.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-3.8.4 deleted file mode 100644 index f765994443..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-3.8.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Scalable distributed SCM -EAPI=6 -HOMEPAGE=https://www.mercurial-scm.org/ -IUSE=bugzilla emacs gpg test tk python_targets_python2_7 -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://www.mercurial-scm.org/release/mercurial-3.8.4.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=ce3664309dac49acfe1abc864084f747 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.1.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.1.3 deleted file mode 100644 index 4c58e6e431..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.1.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Scalable distributed SCM -EAPI=6 -HOMEPAGE=https://www.mercurial-scm.org/ -IUSE=bugzilla emacs gpg test tk python_targets_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.1.3.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=2f2b6060206cd72972de9b7bf91cfb5e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3 deleted file mode 100644 index 18ed2dfcab..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Scalable distributed SCM -EAPI=6 -HOMEPAGE=https://www.mercurial-scm.org/ -IUSE=bugzilla emacs gpg test tk python_targets_python2_7 -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.3.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=a65c0680a19380f480b3821294dd61be diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.1 deleted file mode 100644 index c8bb4c69da..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Scalable distributed SCM -EAPI=6 -HOMEPAGE=https://www.mercurial-scm.org/ -IUSE=bugzilla emacs gpg test tk python_targets_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.3.1.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=2f2b6060206cd72972de9b7bf91cfb5e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.2 deleted file mode 100644 index 00a1253363..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-4.3.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Scalable distributed SCM -EAPI=6 -HOMEPAGE=https://www.mercurial-scm.org/ -IUSE=bugzilla emacs gpg test tk python_targets_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.3.2.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=2f2b6060206cd72972de9b7bf91cfb5e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-9999 deleted file mode 100644 index b85a7a50b2..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/mercurial-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial -DESCRIPTION=Scalable distributed SCM -EAPI=5 -HOMEPAGE=http://mercurial.selenic.com/ -IUSE=bugzilla emacs gpg test tk zsh-completion python_targets_python2_7 -LICENSE=GPL-2 -RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e mercurial 9813bb616cb1bd0c943177ab52204409 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=0d75a742b34a94659413584f0b4e9827 From adaf89caa20dfe462c48b3847aa1396a375bf2f1 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Apr 2019 15:37:21 +0000 Subject: [PATCH 3/4] dev-vcs/cvs: Drop dead package --- .../portage-stable/dev-vcs/cvs/Manifest | 4 - .../dev-vcs/cvs/cvs-1.12.12-r11.ebuild | 100 --------- .../dev-vcs/cvs/cvs-1.12.12-r12.ebuild | 96 --------- .../dev-vcs/cvs/files/01-cvs-env.d | 1 - .../cvs/files/cvs-1.12.12-CVE-2012-0804.patch | 30 --- ...2.12-CVE-2017-12836-commandinjection.patch | 22 -- .../files/cvs-1.12.12-block-requests.patch | 140 ------------ .../cvs/files/cvs-1.12.12-cvs-custom.c | 58 ----- .../cvs-1.12.12-cvs-gnulib-vasnprintf.patch | 34 --- .../cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch | 22 -- .../files/cvs-1.12.12-fix-massive-leak.patch | 52 ----- .../files/cvs-1.12.12-format-security.patch | 22 -- .../cvs/files/cvs-1.12.12-getdelim.patch | 21 -- .../files/cvs-1.12.12-hash-nameclash.patch | 42 ---- .../cvs/files/cvs-1.12.12-install-sh.patch | 12 -- .../files/cvs-1.12.12-mktime-configure.patch | 201 ------------------ .../cvs/files/cvs-1.12.12-mktime-x32.patch | 29 --- .../dev-vcs/cvs/files/cvs-1.12.12-musl.patch | 13 -- .../cvs/files/cvs-1.12.12-openat.patch | 21 -- .../files/cvs-1.12.12-rcs2log-coreutils.patch | 14 -- .../dev-vcs/cvs/files/cvs.pam-include-1.12.12 | 4 - .../dev-vcs/cvs/files/cvspserver.xinetd.d | 14 -- .../portage-stable/dev-vcs/cvs/metadata.xml | 8 - .../md5-cache/dev-vcs/cvs-1.12.12-r11 | 14 -- .../md5-cache/dev-vcs/cvs-1.12.12-r12 | 14 -- 25 files changed, 988 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r11.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r12.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/01-cvs-env.d delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-musl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-openat.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs.pam-include-1.12.12 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvspserver.xinetd.d delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/cvs/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/Manifest deleted file mode 100644 index e350aafd24..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9 -DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5 -DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6 -DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r11.ebuild deleted file mode 100644 index 415a2fa36d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r11.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam toolchain-funcs - -DESCRIPTION="Concurrent Versions System - source code revision control tools" -HOMEPAGE="http://cvs.nongnu.org/" - -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="crypt doc kerberos nls pam server" -RESTRICT="test" - -DEPEND=">=sys-libs/zlib-1.1.4 - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.bz2 - use doc && unpack cederqvist-${PV}.html.tar.bz2 -} - -PATCHES=( - "${FILESDIR}"/${P}-cvsbug-tmpfix.patch - "${FILESDIR}"/${P}-openat.patch - "${FILESDIR}"/${P}-block-requests.patch - "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch - "${FILESDIR}"/${P}-install-sh.patch - "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX - "${FILESDIR}"/${P}-getdelim.patch # 314791 - "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114 - "${FILESDIR}"/${P}-mktime-x32.patch # 395641 - "${FILESDIR}"/${P}-fix-massive-leak.patch - "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208 - "${FILESDIR}"/${P}-CVE-2012-0804.patch - "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-musl.patch - ) -DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \ - PROJECTS README TESTS TODO ) - -src_prepare() { - default - - sed -i "/^AR/s/ar/$(tc-getAR)/" diff/Makefile.in lib/Makefile.in || die -} - -src_configure() { - if tc-is-cross-compiler ; then - # Sane defaults when cross-compiling (as these tests want to - # try and execute code). - export cvs_cv_func_printf_ptr="yes" - fi - econf \ - --with-external-zlib \ - --with-tmpdir=${EPREFIX%/}/tmp \ - $(use_enable crypt encryption) \ - $(use_with kerberos gssapi) \ - $(use_enable nls) \ - $(use_enable pam) \ - $(use_enable server) -} - -src_install() { - # Not installed into emacs site-lisp because it clobbers the normal C - # indentations. - DOCS+=( cvs-format.el ) - - if use doc; then - DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} ) - HTML_DOCS=( ../cederqvist-${PV}.html/. ) - fi - - default - - use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html - - if use server; then - newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c - insinto /etc/xinetd.d - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver - newenvd "${FILESDIR}"/01-cvs-env.d 01cvs - fi - - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs -} - -pkg_postinst() { - use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r12.ebuild deleted file mode 100644 index 0bfbf53733..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/cvs-1.12.12-r12.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam toolchain-funcs - -DESCRIPTION="Concurrent Versions System - source code revision control tools" -HOMEPAGE="http://cvs.nongnu.org/" - -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="crypt doc kerberos nls pam server" -RESTRICT="test" - -DEPEND=">=sys-libs/zlib-1.1.4 - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.bz2 - use doc && unpack cederqvist-${PV}.html.tar.bz2 -} - -PATCHES=( - "${FILESDIR}"/${P}-cvsbug-tmpfix.patch - "${FILESDIR}"/${P}-openat.patch - "${FILESDIR}"/${P}-block-requests.patch - "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch - "${FILESDIR}"/${P}-install-sh.patch - "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX - "${FILESDIR}"/${P}-getdelim.patch # 314791 - "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114 - "${FILESDIR}"/${P}-mktime-x32.patch # 395641 - "${FILESDIR}"/${P}-fix-massive-leak.patch - "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208 - "${FILESDIR}"/${P}-CVE-2012-0804.patch - "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch - ) -DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \ - PROJECTS README TESTS TODO ) - -src_prepare() { - default - sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die -} - -src_configure() { - if tc-is-cross-compiler ; then - # Sane defaults when cross-compiling (as these tests want to - # try and execute code). - export cvs_cv_func_printf_ptr="yes" - fi - econf \ - --with-external-zlib \ - --with-tmpdir=${EPREFIX%/}/tmp \ - $(use_enable crypt encryption) \ - $(use_with kerberos gssapi) \ - $(use_enable nls) \ - $(use_enable pam) \ - $(use_enable server) -} - -src_install() { - # Not installed into emacs site-lisp because it clobbers the normal C - # indentations. - DOCS+=( cvs-format.el ) - - if use doc; then - DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} ) - HTML_DOCS=( ../cederqvist-${PV}.html/. ) - fi - - default - - use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html - - if use server; then - newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c - insinto /etc/xinetd.d - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver - newenvd "${FILESDIR}"/01-cvs-env.d 01cvs - fi - - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/01-cvs-env.d b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/01-cvs-env.d deleted file mode 100644 index 5c89358b95..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/01-cvs-env.d +++ /dev/null @@ -1 +0,0 @@ -CVS_RSH="ssh" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch deleted file mode 100644 index 107c3ea122..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch +++ /dev/null @@ -1,30 +0,0 @@ -[CVE-2012-0804] Fix proxy response parser - -If proxy sends overlong HTTP vesion string, the string will be copied -to unallocatd space (write_buf) causing heap overflow. - -This patch fixes it by ignoring the HTTP version string and checking -the response line has been parsed correctly. - -See for more -details. - -Index: src/client.c -=================================================================== -RCS file: /sources/cvs/ccvs/src/client.c,v -retrieving revision 1.483 -diff -u -r1.483 client.c ---- a/src/client.c 18 Nov 2008 22:59:02 -0000 1.483 -+++ b/src/client.c 26 Jan 2012 16:32:25 -0000 -@@ -4339,9 +4339,9 @@ - * code. - */ - read_line_via (from_server, to_server, &read_buf); -- sscanf (read_buf, "%s %d", write_buf, &codenum); -+ count = sscanf (read_buf, "%*s %d", &codenum); - -- if ((codenum / 100) != 2) -+ if (count != 1 || (codenum / 100) != 2) - error (1, 0, "proxy server %s:%d does not support http tunnelling", - root->proxy_hostname, proxy_port_number); - free (read_buf); diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch deleted file mode 100644 index 87b1fdc958..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-CVE-2017-12836-commandinjection.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naurp a/src/rsh-client.c b/src/rsh-client.c ---- a/src/rsh-client.c 2005-03-15 18:45:10.000000000 +0100 -+++ b/src/rsh-client.c 2017-08-26 17:43:23.228060155 +0200 -@@ -97,6 +97,9 @@ start_rsh_server (cvsroot_t *root, struc - rsh_argv[i++] = root->username; - } - -+ /* Only non-option arguments from here. (CVE-2017-12836) */ -+ rsh_argv[i++] = "--"; -+ - rsh_argv[i++] = root->hostname; - rsh_argv[i++] = cvs_server; - rsh_argv[i++] = "server"; -@@ -171,6 +174,8 @@ start_rsh_server (cvsroot_t *root, struc - *p++ = root->username; - } - -+ *p++ = "--"; -+ - *p++ = root->hostname; - *p++ = command; - *p++ = NULL; diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch deleted file mode 100644 index 9c9b49db8f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch +++ /dev/null @@ -1,140 +0,0 @@ -Author: Robin H. Johnson -Date: 2006-08-09 - -This patch allows a CVS server to deny usage of specific commands, based on -input in the environment. - -Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want, -seperated by spaces. Eg: -CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents" -would block ALL usage of compression. - -Please see the array 'struct request requests[]' in src/server.c for a full -list of commands. - -Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients -may fail! (This includes 'ci'!). - -See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups. - -Signed-off-by: Robin H. Johnson - -diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c ---- cvs-1.12.12.orig/src/server.c 2005-04-14 14:13:29.000000000 +0000 -+++ cvs-1.12.12/src/server.c 2006-08-09 01:40:44.000000000 +0000 -@@ -5836,43 +5836,90 @@ - #undef REQ_LINE - }; - #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */ - - - - #ifdef SERVER_SUPPORT - /* - * This server request is not ignored by the secondary. - */ -+ -+/* Hack by Robin H. Johnson . -+ * Allow the server ENV to specify what request types are to be ignored. -+ */ -+ -+static char blocked_requests[BUFSIZ] = " "; -+ -+static void build_blocked_requests() { -+ char *tmp = getenv("CVS_BLOCK_REQUESTS"); -+ -+ if (tmp != NULL && strlen(tmp) > 0) { -+ // move to our custom buffer -+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests)); -+ //add a space on the end as well for searching -+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests)); -+ } -+ -+ // now blocked_requests contains the list of every request that we do not -+ // want to serve -+} -+ -+// returns 0 if we should serve this request -+// use as if(checker(FOO)) continue; -+static int serve_valid_requests_checker(char *reqname) { -+ char needle[BUFSIZ] = " "; -+ char *tmp; -+ -+ if(!blocked_requests || strlen(blocked_requests) < 2) -+ return 0; -+ -+ // we want to look for ' 'reqname' ' -+ snprintf(needle, sizeof(needle), " %s ", reqname); -+ -+ // now do the search -+ tmp = strstr(blocked_requests, needle); -+ -+ if (tmp != NULL) -+ return 1; -+ -+ return 0; -+ -+} -+ - static void - serve_valid_requests (char *arg) - { - struct request *rq; - - /* Since this is processed in the first pass, don't reprocess it in the - * second. - * - * We still print errors since new errors could have been generated in the - * second pass. - */ - if (print_pending_error () - #ifdef PROXY_SUPPORT - || reprocessing - #endif /* PROXY_SUPPORT */ - ) - return; -+ -+ build_blocked_requests(); - - buf_output0 (buf_to_net, "Valid-requests"); - for (rq = requests; rq->name != NULL; rq++) - { - if (rq->func != NULL) - { -+ if(serve_valid_requests_checker(rq->name)) -+ continue; - buf_append_char (buf_to_net, ' '); - buf_output0 (buf_to_net, rq->name); - } - } - buf_output0 (buf_to_net, "\nok\n"); - - /* The client is waiting for the list of valid requests, so we - must send the output now. */ - buf_flush (buf_to_net, 1); - } -@@ -6353,20 +6400,24 @@ - cmd += len; - else if (cmd[len] == ' ') - cmd += len + 1; - else - /* - * The first len characters match, but it's a different - * command. e.g. the command is "cooperate" but we matched - * "co". - */ - continue; -+ // Ignore commands that we are supposed to ignore. -+ if(serve_valid_requests_checker(rq->name)) -+ continue; -+ - - if (!(rq->flags & RQ_ROOTLESS) - && current_parsed_root == NULL) - { - /* For commands which change the way in which data - is sent and received, for example Gzip-stream, - this does the wrong thing. Since the client - assumes that everything is being compressed, - unconditionally, there is no way to give this - error to the client without turning on diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c deleted file mode 100644 index 597f6de8db..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvs-custom.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -Author: Robin H. Johnson -Date: 2006-08-09 - -This patch allows a CVS server to deny usage of specific commands, based on -input in the environment. - -Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want, -seperated by spaces. Eg: -CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents" -would block ALL usage of compression. - -Please see the array 'struct request requests[]' in src/server.c for a full -list of commands. - -Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients -may fail! (This includes 'ci'!). - -See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups. - -Signed-off-by: Robin H. Johnson -*/ - -#include -#include -#include -#include - - -#define REAL_CVS "/bin/cvs" -#define CVS_TMPDIR "/tmp" -#define CMDS_BLOCKED " Gzip-stream gzip-file-contents Kerberos-encrypt Gssapi-encrypt Gssapi-authenticate add remove admin import init history watch-on watch-off watch-add watch-remove watchers editors edit version tag rtag " - -int main(int argc, char* argv[]) { - char** newargv; - int newargc, offset; - int i; - // 0 for argv[0] we must copy - offset = 0+0; - // +1 for trailing NULL - newargc = argc+offset+1; - newargv = (char**) malloc(newargc*sizeof(char*)); - newargv[0] = "cvs"; - //newargv[1] = "-T"; - //newargv[2] = CVS_TMPDIR; - //newargv[3] = "-R"; - for(i=1;i -Date: Fri Oct 19 01:50:42 2007 +0200 - - Don't use %n on glibc >= 2.3 systems. - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index f563823..5d818aa 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - #endif - *p = dp->conversion; - #if USE_SNPRINTF -+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) - p[1] = '%'; - p[2] = 'n'; - p[3] = '\0'; -+# else -+ /* On glibc2 systems from glibc >= 2.3 - probably also older -+ ones - we know that snprintf's returns value conforms to -+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. -+ Therefore we can avoid using %n in this situation. -+ On glibc2 systems from 2004-10-18 or newer, the use of %n -+ in format strings in writable memory may crash the program -+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it -+ in this situation. */ -+ p[1] = '\0'; -+# endif - #else - p[1] = '\0'; - #endif diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch deleted file mode 100644 index fcd4431e87..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: cvs-1.12.12/src/cvsbug.in -=================================================================== ---- cvs-1.12.12.orig/src/cvsbug.in -+++ cvs-1.12.12/src/cvsbug.in -@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then - /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" | - cut -f5 -d':' | sed -e 's/,.*//' > $TEMP - ORIGINATOR="`cat $TEMP`" -- rm -f $TEMP -+ > $TEMP - fi - fi - - if [ "$ORIGINATOR" = "" ]; then - grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP - ORIGINATOR="`cat $TEMP`" -- rm -f $TEMP -+ > $TEMP - fi - - if [ -n "$ORGANIZATION" ]; then - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch deleted file mode 100644 index 5366f50855..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-fix-massive-leak.patch +++ /dev/null @@ -1,52 +0,0 @@ -buf_free_data must free data independently -of send or reseived bytes over network. - -Moreover, when buffer is usually freed -buffer _is_ empty, but has one clean mapped page. - -I've observed massive 'cvs server' leaks -when importing large gentoo-x86 repo with 'cvsps'. -Leak ate all my 32GBs of RAM and killed process. -(Leaked around 3 pages per client request). - -valgrind found the leak easily: - -$ valgrind \ - cvsps \ - --root :local:$HOME/portage/gentoo-x86.rsync \ - --fast-export \ - gentoo-x86/dev-vcs/git-annex 2>l | - git fast-import - - ==13504== 1,248 bytes in 52 blocks are still reachable in loss record 41 of 47 - ==13504== at 0x4C2C19B: malloc (vg_replace_malloc.c:270) - ==13504== by 0x48A556: xnmalloc_inline (xmalloc.c:40) - ==13504== by 0x48A5B5: xmalloc (xmalloc.c:56) - ==13504== by 0x4855F5: new_memnode (pagealign_alloc.c:91) - ==13504== by 0x48571B: pagealign_alloc (pagealign_alloc.c:151) - ==13504== by 0x485739: pagealign_xalloc (pagealign_alloc.c:182) - ==13504== by 0x408DD7: get_buffer_data (buffer.c:98) - ==13504== by 0x409C0C: buf_input_data (buffer.c:738) - ==13504== by 0x45BB63: do_cvs_command (server.c:3847) - ==13504== by 0x45D39E: serve_co (server.c:4809) - ==13504== by 0x45F845: server (server.c:6438) - ==13504== by 0x438784: main (main.c:1066) - -And now it takes constant space (less, than 18MB) -for 'cvs server' process to convert all gentoo-x86 -by serving more, than 5 000 000 client requests. - -Signed-off-by: Sergei Trofimovich -diff --git a/src/buffer.c b/src/buffer.c -index 3f12513..9a7a559 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -526,7 +526,7 @@ buf_copy_data (struct buffer *buf, struct buffer_data *data, - void - buf_free_data (struct buffer *buffer) - { -- if (buf_empty_p (buffer)) return; -+ if (! buffer->data) return; - buf_free_datas (buffer->data, buffer->last); - buffer->data = buffer->last = NULL; - } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch deleted file mode 100644 index d710a90207..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/diff/diff3.c -+++ b/diff/diff3.c -@@ -1503,7 +1503,7 @@ - line = 0; - do - { -- printf_output (line_prefix); -+ printf_output ("%s", line_prefix); - cp = D_RELNUM (ptr, realfile, line); - length = D_RELLEN (ptr, realfile, line); - write_output (cp, length); ---- a/src/main.c -+++ b/src/main.c -@@ -1375,7 +1375,7 @@ - { - (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name); - for (; *cpp; cpp++) -- (void) fprintf (stderr, *cpp); -+ (void) fprintf (stderr, "%s", *cpp); - exit (EXIT_FAILURE); - } - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch deleted file mode 100644 index 837d4408ab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch +++ /dev/null @@ -1,21 +0,0 @@ -The function getdelim() behaves slightly different on FreeBSD, -only appending to the *line buffer if line_size is 0. - -See: -https://savannah.nongnu.org/bugs/?29466 -http://bugs.gentoo.org/314791 - -Already comitted upstream: -http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39 - ---- a/src/myndbm.c.orig -+++ b/src/myndbm.c -@@ -213,7 +213,7 @@ - mydbm_load_file (FILE *fp, List *list, char *filename) - { - char *line = NULL; -- size_t line_size; -+ size_t line_size = 0; - char *value; - size_t value_allocated; - char *cp, *vp; diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch deleted file mode 100644 index 95fd61e0a5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch +++ /dev/null @@ -1,42 +0,0 @@ -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch -fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a - ---- a/src/hash.h.orig 2005-02-01 22:56:48 +0100 -+++ b/src/hash.h 2010-03-10 19:00:11 +0100 -@@ -27,26 +27,26 @@ - }; - typedef enum ntype Ntype; - --struct node -+struct hashnode - { - Ntype type; -- struct node *next; -- struct node *prev; -- struct node *hashnext; -- struct node *hashprev; -+ struct hashnode *next; -+ struct hashnode *prev; -+ struct hashnode *hashnext; -+ struct hashnode *hashprev; - char *key; - void *data; -- void (*delproc) (struct node *); -+ void (*delproc) (struct hashnode *); - }; --typedef struct node Node; -+typedef struct hashnode Node; - --struct list -+struct hashlist - { - Node *list; - Node *hasharray[HASHSIZE]; -- struct list *next; -+ struct hashlist *next; - }; --typedef struct list List; -+typedef struct hashlist List; - - List *getlist (void); - Node *findnode (List * list, const char *key); diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch deleted file mode 100644 index 825c0ee6f1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/build-aux/install-sh b/build-aux/install-sh ---- a/build-aux/install-sh 2006-03-25 20:04:46 +0000 -+++ b/build-aux/install-sh 2007-09-14 10:53:29 +0100 -@@ -246,7 +246,7 @@ - fi - - if test -n "$dir_arg"; then -- $doit $mkdircmd "$dst" \ -+ { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch deleted file mode 100644 index 03d7f35601..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch +++ /dev/null @@ -1,201 +0,0 @@ -https://bugs.gentoo.org/220040 -https://bugs.gentoo.org/570208 - -update mktime check to latest autoconf version which is less buggy - ---- a/configure -+++ b/configure -@@ -5299,26 +6059,25 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include - # include - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - --#if HAVE_STDLIB_H --# include --#endif -+#include -+#include - --#if HAVE_UNISTD_H -+#ifdef HAVE_UNISTD_H - # include - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -5335,9 +6094,9 @@ - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -5356,29 +6115,27 @@ - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void -+static int - mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int - mktime_test (now) - time_t now; - { -- mktime_test1 (now); -- mktime_test1 ((time_t) (time_t_max - now)); -- mktime_test1 ((time_t) (time_t_min + now)); -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); - } - --static void -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -5391,11 +6148,10 @@ - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -5417,8 +6173,39 @@ - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -5432,12 +6219,15 @@ - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -- if ((time_t) -1 < 0) -- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) -- continue; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -5445,18 +6235,22 @@ - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 1); -- mktime_test ((time_t) (60 * 60)); -- mktime_test ((time_t) (60 * 60 * 24)); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch deleted file mode 100644 index 948fa4d714..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch +++ /dev/null @@ -1,29 +0,0 @@ -back port changes from upstream gnulib to make this work on x32 - -https://bugs.gentoo.org/395641 - ---- cvs-1.12.12/lib/mktime.c -+++ cvs-1.12.12/lib/mktime.c -@@ -115,6 +115,13 @@ - #define TM_YEAR_BASE 1900 - verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); - -+#if INT_MAX <= LONG_MAX / 2 -+typedef long int long_int; -+#else -+typedef long long int long_int; -+#endif -+verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); -+ - /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ - static inline int - leapyear (long int year) -@@ -167,8 +174,6 @@ - int year0, int yday0, int hour0, int min0, int sec0) - { - verify (C99_integer_division, -1 / 2 == 0); -- verify (long_int_year_and_yday_are_wide_enough, -- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); - - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid integer overflow here. */ diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-musl.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-musl.patch deleted file mode 100644 index e426cf55fc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://gcc.gnu.org/ml/gcc/2003-04/msg00518.html - ---- a/lib/regex.c -+++ b/lib/regex.c -@@ -8184,7 +8184,7 @@ - if (msg_size > errbuf_size) - { - #if defined HAVE_MEMPCPY || defined _LIBC -- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; -+ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; - #else - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-openat.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-openat.patch deleted file mode 100644 index fdb406a45e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-openat.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cvs-1.12.12/lib/openat.c -=================================================================== ---- cvs-1.12.12.orig/lib/openat.c -+++ cvs-1.12.12/lib/openat.c -@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename - va_list arg; - va_start (arg, flags); - -- /* Assume that mode_t is passed compatibly with mode_t's type -- after argument promotion. */ -- mode = va_arg (arg, mode_t); -+ /* If mode_t is narrower than int, use the promoted type (int), -+ not mode_t. Use sizeof to guess whether mode_t is nerrower; -+ we don't know of any practical counterexamples. */ -+ if (sizeof (mode_t) < sizeof (int)) -+ mode = va_arg (arg, int); -+ else -+ mode = va_arg (arg, mode_t); - - va_end (arg); - } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch deleted file mode 100644 index 7dda3f0f17..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch +++ /dev/null @@ -1,14 +0,0 @@ -X-Gentoo-bug: 144114 - -diff -Nuar cvs-1.12.12.orig/contrib/rcs2log.sh cvs-1.12.12/contrib/rcs2log.sh ---- cvs-1.12.12.orig/contrib/rcs2log.sh 2003-02-25 21:32:51.000000000 +0000 -+++ cvs-1.12.12/contrib/rcs2log.sh 2010-12-06 21:14:33.831532212 +0000 -@@ -620,7 +620,7 @@ - # Sort the log entries, first by date+time (in reverse order), - # then by author, then by log entry, and finally by file name and revision - # (just in case). --sort -t"$SOH" +2 -4r +4 +0 | -+sort -t"$SOH" -k 3,4r -k 5 -k 1,2 | - - # Finally, reformat the sorted log entries. - $AWK -F"$SOH" ' diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs.pam-include-1.12.12 b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs.pam-include-1.12.12 deleted file mode 100644 index f401ec082a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvs.pam-include-1.12.12 +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -session include system-auth diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvspserver.xinetd.d b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvspserver.xinetd.d deleted file mode 100644 index 0f2edb09cb..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/files/cvspserver.xinetd.d +++ /dev/null @@ -1,14 +0,0 @@ -service cvspserver -{ - disable = yes - socket_type = stream - wait = no - user = root - log_type = FILE /var/log/cvspserver - protocol = tcp - env = HOME=/var/cvsroot - log_on_failure += USERID - port = 2401 - server = /usr/bin/cvs - server_args = -f --allow-root=/var/cvsroot pserver -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/metadata.xml deleted file mode 100644 index e74b19c857..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/cvs/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Enable server support - - diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 deleted file mode 100644 index 6ac778415a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare unpack -DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) -DESCRIPTION=Concurrent Versions System - source code revision control tools -EAPI=6 -HOMEPAGE=http://cvs.nongnu.org/ -IUSE=crypt doc kerberos nls pam server -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 LGPL-2 -RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps ) -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=ffe26d576740390b6d21c2d672958703 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 deleted file mode 100644 index 5d3a8c4cb7..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install prepare unpack -DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) -DESCRIPTION=Concurrent Versions System - source code revision control tools -EAPI=6 -HOMEPAGE=http://cvs.nongnu.org/ -IUSE=crypt doc kerberos nls pam server -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 LGPL-2 -RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps ) -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=68022da287f504b569d22661fe607407 From 3893391947c14afa25f42b8d4bcfab5e1df4ca7a Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 2 Apr 2019 15:45:33 +0000 Subject: [PATCH 4/4] bump(dev-vcs/git): sync with upstream --- .../portage-stable/dev-vcs/git/Manifest | 27 +- .../git/files/git-1.8.5-mw-vendor.patch | 39 - .../git/files/git-2.12.0-optional-cvs.patch | 456 ------------ .../files/git-2.17.0_rc1-optional-cvs.patch | 451 ----------- .../git-2.5.1-freebsd-10.x-no-iconv.patch | 14 - .../dev-vcs/git/git-2.16.4.ebuild | 699 ------------------ .../dev-vcs/git/git-2.16.5.ebuild | 699 ------------------ .../{git-2.19.1.ebuild => git-2.19.2.ebuild} | 7 +- .../{git-2.19.0.ebuild => git-2.20.1.ebuild} | 9 +- ...git-2.18.0.ebuild => git-2.21.0-r1.ebuild} | 52 +- .../{git-2.18.1.ebuild => git-2.21.0.ebuild} | 48 +- .../dev-vcs/git/git-9999-r1.ebuild | 39 +- .../dev-vcs/git/git-9999-r2.ebuild | 39 +- .../dev-vcs/git/git-9999-r3.ebuild | 39 +- .../dev-vcs/git/git-9999.ebuild | 42 +- .../metadata/md5-cache/dev-vcs/git-2.16.4 | 14 - .../metadata/md5-cache/dev-vcs/git-2.16.5 | 14 - .../dev-vcs/{git-2.18.1 => git-2.19.2} | 6 +- .../dev-vcs/{git-2.18.0 => git-2.20.1} | 6 +- .../dev-vcs/{git-2.19.1 => git-2.21.0} | 8 +- .../dev-vcs/{git-2.19.0 => git-2.21.0-r1} | 12 +- .../metadata/md5-cache/dev-vcs/git-9999 | 10 +- .../metadata/md5-cache/dev-vcs/git-9999-r1 | 10 +- .../metadata/md5-cache/dev-vcs/git-9999-r2 | 10 +- .../metadata/md5-cache/dev-vcs/git-9999-r3 | 10 +- 25 files changed, 188 insertions(+), 2572 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.5-mw-vendor.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.5.ebuild rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.19.1.ebuild => git-2.19.2.ebuild} (98%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.19.0.ebuild => git-2.20.1.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.18.0.ebuild => git-2.21.0-r1.ebuild} (92%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.18.1.ebuild => git-2.21.0.ebuild} (92%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.5 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/{git-2.18.1 => git-2.19.2} (87%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/{git-2.18.0 => git-2.20.1} (86%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/{git-2.19.1 => git-2.21.0} (64%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/{git-2.19.0 => git-2.21.0-r1} (50%) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index e1ed51f871..d07847a65b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -1,18 +1,9 @@ -DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac -DIST git-2.16.5.tar.xz 4968780 BLAKE2B 9987e15152cce334fdfe2f56705fb2d9d246652010e58879fefc79cb20c05f177f2ed0c4ef8955889684466d2d3fbf9a246351751d6c6d6c3c8b4adeb48fbf06 SHA512 96770035f370808b7b7f3752c938394522fcb699355ed821591a1ef5756903ad0e8830441d230cbead7718b42066ad4e33fedf8b8c948fbacc89c18f3d486e26 -DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 -DIST git-2.18.1.tar.xz 5102812 BLAKE2B 43ec86d9aebc73a582f2117ef1c26a6dc820f81ff389a6239ed6e3ea5fd2be0bac54766c3ab8ad1cc9730978e5b73997bb20b24b9f3f43d6eef06bea8a9174c3 SHA512 06bdc54c4ff78b77667b917f2aa46a803bd6561236f4177f41b8730785b5f90f8ca705f028131f9365fb0aae2e51cd92c97380141e97c026c96a020e00b992e1 -DIST git-2.19.0.tar.xz 5227124 BLAKE2B f917b9ca8325ffbdec7d8614fec3874a09b5d3c421a0179f6c77def7e11f5853d821933b13687087b05791531e194178e1e63f51739ece91e32dddb07a127a0b SHA512 305e51f8e22d96847fcdf4169340795aacaf5f4c5b8052cda860a668059d9ef35bb2840c278b7207f3b9f0e1c32915719649edc20bd3cd33b53e97a06159ceac -DIST git-2.19.1.tar.xz 5227908 BLAKE2B 1702662d7eea2ea5fa9d697eece19bee8a451abb1e85b1c7b111b4126e97340ee0c5691faf37c2d9fbe13bdf4ea894d8a3e0e2f7208e7bce111e53d1da81ef5f SHA512 a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 -DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049 -DIST git-htmldocs-2.16.5.tar.xz 1164600 BLAKE2B 303f5543a420a78b7731aee7b9977361130edfdcffbf67e3ad652ac1243a22aa13d883337466e95a186977e34a2989f5639af7acd7c0187219b200cf966a83ef SHA512 00ed040e665e817a0543768bb290c47dd553581a18b136a59ca37e656c538f49716e79a533c5063c2a00f16f7ad021a5836f71b805200df07bb8a3923aacddfb -DIST git-htmldocs-2.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324 -DIST git-htmldocs-2.18.1.tar.xz 1201604 BLAKE2B ae33ac1ec8d2c95f95dbc5965d191f093628633c047c7d52371b7a3142807a4b878be5abcd13a934a453a5b35abb4a7e0ea49823e98c4a682040afc8d7c0817d SHA512 5310a846091bfa66609ce896bdce163bd84f40c14400a53eab662f0c28037b98fef4a8766a716694a5bf9549793a85b57cb665194dff5612277c6603452ea512 -DIST git-htmldocs-2.19.0.tar.xz 1221804 BLAKE2B c3c1e91b05bb5fc777f97973941c97b8c093a94d4dc308527bc6bea7b6cc787bb939d4a5a978a69f1476da8e334f17393bf56a8de64b7e5bd88544d32f858f40 SHA512 61c6c1d64affa2f910c0c01a14f19f49ef496e1a09c223f7fb454031a6388dcd96c69c362e0da167a2e4bf1347d4c30e55d9c476076f1ab8e278f9af07053745 -DIST git-htmldocs-2.19.1.tar.xz 1222052 BLAKE2B 6d63364e0c5c700011ab0b7bc9c207560bc89e6d58e5f8025f30a188b7c90fa1ca58822e0ee129ff531c0702fc0a64e1612b8ff7b41102e5db21eadd0fd01ab9 SHA512 40417e80b291a935be78f143f070c68a9a865b6825f85cddd57cf926c25649630dd6612e7e52edb3ab4d1433aca31d38e3b9c95ff5d52827452d03c96e50e344 -DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d -DIST git-manpages-2.16.5.tar.xz 417140 BLAKE2B f7b3255fe0ac7ea82273e0718d96e045854b7d3c7ad100befac47cd005139415e56b8e0dd85293bca26f2e1ff12f729c46bfd27ede5ecdda08a1533ed43a8b2f SHA512 38ec66e43055f7121bace4655350e9b617b5586271c4ae73d15966e52e56ac38bec2f5f7f128410d004a2a0db3db9954fcfec1d78eb49579a74a46b404b67396 -DIST git-manpages-2.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15 -DIST git-manpages-2.18.1.tar.xz 425568 BLAKE2B fc0f8aee3d80cba0f84c4ff4cfa342ea3c1ae155f3434b6d1771e03bb14956d5ffd78a5cadfee378534f6cf85265c37eeb1be27eb7801ae798cede249640c478 SHA512 6e6e663d985ef267d556539a43c192138b31dbbc80ffaa4331b8494f6e3e74b5cd4d958c2ae963143946eaa99bfce485ee3726b510b10eaab3599b5284b5fbc1 -DIST git-manpages-2.19.0.tar.xz 431832 BLAKE2B b1493e88b3836cfdbd4f709058f7b287764df52237f2dee054668ce5cd9a547553fb36f2f474debd9bc2a511e73a9967307d8a3d174651d261ddd4176a8ec766 SHA512 463cacfc58dc16d69dc9e374fb840cd2859d69e2a74575437be72159e05cc85ad6c9e89dfe2c20963fce962b9add4ad9694e84ab5792b2c30034f68d52648117 -DIST git-manpages-2.19.1.tar.xz 431852 BLAKE2B e15be2e1680a28c3c57e7b6e022173ef4b006cf21b5464a32f7f7668ea2b8af2ac7ff7466d98ab627320895b92583840159e2fca613be95817656def2654edaa SHA512 1b42c39e39653906b44fbca65991da04493f08479e2162da5f593bee68dbfd3f3b8180f5a2721f1971e3218b0dc842a8a34918fc7724c032597f4fe4b2f506dc +DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 +DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c +DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 +DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634 +DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63 +DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4 +DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 +DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7 +DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.5-mw-vendor.patch deleted file mode 100644 index 54302ef26c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.5-mw-vendor.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile -index a4b6f7a..d83df2c 100644 ---- a/contrib/mw-to-git/Makefile -+++ b/contrib/mw-to-git/Makefile -@@ -22,7 +22,7 @@ INSTALL = install - - SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) - INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ -- -s --no-print-directory instlibdir) -+ -s --no-print-directory instvendorlibdir) - DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) - INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) - -diff --git a/perl/Makefile b/perl/Makefile -index 15d96fc..91348c6 100644 ---- a/perl/Makefile -+++ b/perl/Makefile -@@ -12,7 +12,7 @@ ifndef V - QUIET = @ - endif - --all install instlibdir: $(makfile) -+all install instlibdir instvendorlibdir: $(makfile) - $(QUIET)$(MAKE) -f $(makfile) $@ - - clean: -diff --git a/perl/Makefile.PL b/perl/Makefile.PL -index 3f29ba9..c0b3508 100644 ---- a/perl/Makefile.PL -+++ b/perl/Makefile.PL -@@ -17,6 +17,8 @@ sub MY::postamble { - return <<'MAKE_FRAG'; - instlibdir: - @echo '$(INSTALLSITELIB)' -+instvendorlibdir: -+ @echo '$(INSTALLVENDORLIB)' - - ifneq (,$(DESTDIR)) - ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10)) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch deleted file mode 100644 index d158b65d30..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch +++ /dev/null @@ -1,456 +0,0 @@ -From 1e1bacf32568cc24dbd24444ed4025fc80a96ff3 Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Sat, 25 Feb 2017 20:48:14 +0100 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 -Forward-ported from v1.8.5.3 to v1.9.0_rc3 -Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 -Forward-ported from v2.0.0_rc0 to v2.0.0 -Forward-ported from v2.0.0 to v2.2.2 -Forward-ported from v2.2.2 to v2.8.4 -Forward-ported from v2.8.4 to v2.10.0 -Forward-ported from v2.10.0 to v2.12.0 - -Signed-off-by: Lars Wendler ---- - Makefile | 51 ++++++++++++++++++++++++++++---------- - t/t9200-git-cvsexportcommit.sh | 5 ++++ - t/t9400-git-cvsserver-server.sh | 8 +++++- - t/t9401-git-cvsserver-crlf.sh | 15 +++++++---- - t/t9600-cvsimport.sh | 41 +++++++++++++++++++----------- - t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++ - t/t9602-cvsimport-branches-tags.sh | 11 ++++++++ - t/t9603-cvsimport-patchsets.sh | 11 ++++++++ - t/test-lib.sh | 1 + - 9 files changed, 120 insertions(+), 34 deletions(-) - -diff --git a/Makefile b/Makefile -index 8e4081e06..f14a4ad37 100644 ---- a/Makefile -+++ b/Makefile -@@ -273,6 +273,8 @@ all:: - # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep - # and egrep that are pickier when their input contains non-ASCII data. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -496,6 +498,7 @@ LIB_OBJS = - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -532,12 +535,13 @@ SCRIPT_LIB += git-sh-i18n - - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit -@@ -545,24 +549,26 @@ NO_INSTALL += git-remote-testgit - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) - SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) - SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) -+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) - SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) - - # Individual rules to allow e.g. - # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" - # from subdirectories like contrib/*/ - .PHONY: build-perl-script build-sh-script build-python-script --build-perl-script: $(SCRIPT_PERL_GEN) -+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - build-sh-script: $(SCRIPT_SH_GEN) - build-python-script: $(SCRIPT_PYTHON_GEN) - - .PHONY: install-perl-script install-sh-script install-python-script - install-sh-script: $(SCRIPT_SH_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' --install-perl-script: $(SCRIPT_PERL_INS) -+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - install-python-script: $(SCRIPT_PYTHON_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' -@@ -571,12 +577,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) - clean-sh-script: - $(RM) $(SCRIPT_SH_GEN) - clean-perl-script: -- $(RM) $(SCRIPT_PERL_GEN) -+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - clean-python-script: - $(RM) $(SCRIPT_PYTHON_GEN) - - SCRIPTS = $(SCRIPT_SH_INS) \ - $(SCRIPT_PERL_INS) \ -+ $(SCRIPT_PERL_CVS_INS) \ - $(SCRIPT_PYTHON_INS) \ - git-instaweb - -@@ -1832,10 +1839,24 @@ git.res: git.rc GIT-VERSION-FILE - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ - - # This makes sure we depend on the NO_PERL setting itself. --$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS -+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS -+ -+_SCRIPT_PERL_GEN = -+_SCRIPT_PERL_NOGEN = - - ifndef NO_PERL --$(SCRIPT_PERL_GEN): perl/perl.mak -+ -+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) -+else -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) -+_REASON = NO_CVS -+_REASON_CONTENT = $(NO_CVS) -+endif # NO_CVS -+ -+$(_SCRIPT_PERL_GEN): perl/perl.mak - - perl/perl.mak: perl/PM.stamp - -@@ -1848,7 +1869,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) - - PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ) --$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE -+$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ - INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ -@@ -1882,14 +1903,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb -+_REASON = NO_PERL -+_REASON_CONTENT = $(NO_PERL) -+endif # NO_PERL -+ -+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - # This makes sure we depend on the NO_PYTHON setting itself. - $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS -@@ -2125,7 +2150,7 @@ LOCALIZED_SH = $(SCRIPT_SH) - LOCALIZED_SH += git-parse-remote.sh - LOCALIZED_SH += git-rebase--interactive.sh - LOCALIZED_SH += git-sh-setup.sh --LOCALIZED_PERL = $(SCRIPT_PERL) -+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) - - ifdef XGETTEXT_INCLUDE_TESTS - LOCALIZED_C += t/t0200/test.c -diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh -index bb879a527..17be19729 100755 ---- a/t/t9200-git-cvsexportcommit.sh -+++ b/t/t9200-git-cvsexportcommit.sh -@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh -index 432c61d24..6907b3f52 100755 ---- a/t/t9400-git-cvsserver-server.sh -+++ b/t/t9400-git-cvsserver-server.sh -@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh -index 84787eee9..eecba8852 100755 ---- a/t/t9401-git-cvsserver-crlf.sh -+++ b/t/t9401-git-cvsserver-crlf.sh -@@ -57,15 +57,20 @@ check_status_options() { - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { -diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh -index 4c384ff02..d601f32c5 100755 ---- a/t/t9600-cvsimport.sh -+++ b/t/t9600-cvsimport.sh -@@ -3,14 +3,25 @@ - test_description='git cvsimport basic tests' - . ./lib-cvs.sh - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -42,23 +53,23 @@ EOF - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -86,7 +97,7 @@ EOF - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' ' - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' ' - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' ' - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' ' - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done -diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh -index 827d39f5b..d730a41f6 100755 ---- a/t/t9601-cvsimport-vendor-branch.sh -+++ b/t/t9601-cvsimport-vendor-branch.sh -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' -diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh -index e1db323f5..68f097401 100755 ---- a/t/t9602-cvsimport-branches-tags.sh -+++ b/t/t9602-cvsimport-branches-tags.sh -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' -diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh -index c4c3c4954..9b2957d4f 100755 ---- a/t/t9603-cvsimport-patchsets.sh -+++ b/t/t9603-cvsimport-patchsets.sh -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure PERL 'import with criss cross times on revisions' ' -diff --git a/t/test-lib.sh b/t/test-lib.sh -index 86d77c16d..1fb51f149 100644 ---- a/t/test-lib.sh -+++ b/t/test-lib.sh -@@ -1007,6 +1007,7 @@ case $uname_s in - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PYTHON" && test_set_prereq PYTHON - test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE --- -2.11.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch deleted file mode 100644 index 60cebcbb4d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.17.0_rc1-optional-cvs.patch +++ /dev/null @@ -1,451 +0,0 @@ -From 3baea661143aaddb285f1ac7c50f6e4af76c8aed Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Fri, 23 Mar 2018 10:05:05 +0100 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 -Forward-ported from v1.8.5.3 to v1.9.0_rc3 -Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 -Forward-ported from v2.0.0_rc0 to v2.0.0 -Forward-ported from v2.0.0 to v2.2.2 -Forward-ported from v2.2.2 to v2.8.4 -Forward-ported from v2.8.4 to v2.10.0 -Forward-ported from v2.10.0 to v2.12.0 -Forward-ported from v2.12.0 to v2.17.0-rc1 - -Signed-off-by: Lars Wendler ---- - Makefile | 50 ++++++++++++++++++++++++++++---------- - t/t9200-git-cvsexportcommit.sh | 5 ++++ - t/t9400-git-cvsserver-server.sh | 8 +++++- - t/t9401-git-cvsserver-crlf.sh | 15 ++++++++---- - t/t9600-cvsimport.sh | 41 +++++++++++++++++++------------ - t/t9601-cvsimport-vendor-branch.sh | 11 +++++++++ - t/t9602-cvsimport-branches-tags.sh | 11 +++++++++ - t/t9603-cvsimport-patchsets.sh | 11 +++++++++ - t/test-lib.sh | 1 + - 9 files changed, 119 insertions(+), 34 deletions(-) - -diff --git a/Makefile b/Makefile -index a1d8775adb..4264475ad1 100644 ---- a/Makefile -+++ b/Makefile -@@ -312,6 +312,8 @@ all:: - # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep - # and egrep that are pickier when their input contains non-ASCII data. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -543,6 +545,7 @@ LIB_OBJS = - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -579,12 +582,13 @@ SCRIPT_LIB += git-sh-i18n - - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit -@@ -592,24 +596,26 @@ NO_INSTALL += git-remote-testgit - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) - SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) - SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) -+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) - SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) - - # Individual rules to allow e.g. - # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" - # from subdirectories like contrib/*/ - .PHONY: build-perl-script build-sh-script build-python-script --build-perl-script: $(SCRIPT_PERL_GEN) -+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - build-sh-script: $(SCRIPT_SH_GEN) - build-python-script: $(SCRIPT_PYTHON_GEN) - - .PHONY: install-perl-script install-sh-script install-python-script - install-sh-script: $(SCRIPT_SH_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' --install-perl-script: $(SCRIPT_PERL_INS) -+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - install-python-script: $(SCRIPT_PYTHON_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' -@@ -618,12 +624,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) - clean-sh-script: - $(RM) $(SCRIPT_SH_GEN) - clean-perl-script: -- $(RM) $(SCRIPT_PERL_GEN) -+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - clean-python-script: - $(RM) $(SCRIPT_PYTHON_GEN) - - SCRIPTS = $(SCRIPT_SH_INS) \ - $(SCRIPT_PERL_INS) \ -+ $(SCRIPT_PERL_CVS_INS) \ - $(SCRIPT_PYTHON_INS) \ - git-instaweb - -@@ -1972,13 +1979,26 @@ git.res: git.rc GIT-VERSION-FILE - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ - - # This makes sure we depend on the NO_PERL setting itself. --$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS -+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS -+ -+_SCRIPT_PERL_GEN = -+_SCRIPT_PERL_NOGEN = - - ifndef NO_PERL --$(SCRIPT_PERL_GEN): -+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) -+else -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) -+_REASON = NO_CVS -+_REASON_CONTENT = $(NO_CVS) -+endif # NO_CVS -+ -+$(_SCRIPT_PERL_GEN): - - PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ) --$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE -+$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR='$(perllibdir_SQ)' && \ - INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ -@@ -2012,14 +2032,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb -+_REASON = NO_PERL -+_REASON_CONTENT = $(NO_PERL) -+endif # NO_PERL -+ -+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - # This makes sure we depend on the NO_PYTHON setting itself. - $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS -@@ -2258,7 +2282,7 @@ LOCALIZED_SH = $(SCRIPT_SH) - LOCALIZED_SH += git-parse-remote.sh - LOCALIZED_SH += git-rebase--interactive.sh - LOCALIZED_SH += git-sh-setup.sh --LOCALIZED_PERL = $(SCRIPT_PERL) -+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) - - ifdef XGETTEXT_INCLUDE_TESTS - LOCALIZED_C += t/t0200/test.c -diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh -index 1319415ba8..34ac8e28e2 100755 ---- a/t/t9200-git-cvsexportcommit.sh -+++ b/t/t9200-git-cvsexportcommit.sh -@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh -index 06742748e9..51d474d94b 100755 ---- a/t/t9400-git-cvsserver-server.sh -+++ b/t/t9400-git-cvsserver-server.sh -@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh -index 84787eee9a..eecba88527 100755 ---- a/t/t9401-git-cvsserver-crlf.sh -+++ b/t/t9401-git-cvsserver-crlf.sh -@@ -57,15 +57,20 @@ check_status_options() { - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { -diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh -index 804ce3850f..c53c50e432 100755 ---- a/t/t9600-cvsimport.sh -+++ b/t/t9600-cvsimport.sh -@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then - test_done - fi - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -47,23 +58,23 @@ EOF - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -91,7 +102,7 @@ EOF - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' ' - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' ' - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' ' - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' ' - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done -diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh -index 827d39f5bf..d730a41f67 100755 ---- a/t/t9601-cvsimport-vendor-branch.sh -+++ b/t/t9601-cvsimport-vendor-branch.sh -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' -diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh -index e1db323f54..68f097401f 100755 ---- a/t/t9602-cvsimport-branches-tags.sh -+++ b/t/t9602-cvsimport-branches-tags.sh -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' -diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh -index c4c3c49546..9b2957d4f0 100755 ---- a/t/t9603-cvsimport-patchsets.sh -+++ b/t/t9603-cvsimport-patchsets.sh -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure PERL 'import with criss cross times on revisions' ' -diff --git a/t/test-lib.sh b/t/test-lib.sh -index 7740d511d2..9b26b78359 100644 ---- a/t/test-lib.sh -+++ b/t/test-lib.sh -@@ -1062,6 +1062,7 @@ case $uname_s in - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PTHREADS" && test_set_prereq PTHREADS - test -z "$NO_PYTHON" && test_set_prereq PYTHON --- -2.16.3 - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch deleted file mode 100644 index a874236dc6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname ---- git-2.5.1.orig/config.mak.uname 2015-08-28 15:37:13.000000000 -0400 -+++ git-2.5.1/config.mak.uname 2015-09-06 18:54:28.538437000 -0400 -@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin) - SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield - endif - ifeq ($(uname_S),FreeBSD) -- NEEDS_LIBICONV = YesPlease -+ ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2) -+ NEEDS_LIBICONV = YesPlease -+ endif - OLD_ICONV = YesPlease - NO_MEMMEM = YesPlease - BASIC_CFLAGS += -I/usr/local/include diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.4.ebuild deleted file mode 100644 index 87acf90bc2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.4.ebuild +++ /dev/null @@ -1,699 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - SCM="git-r3" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: pu - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; - esac -fi - -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) -" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.12.0-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of static build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - if use pcre; then - if use pcre-jit; then - myopts+=" USE_LIBPCRE2=YesPlease" - extlibs+=" -lpcre2-8" - else - myopts+=" USE_LIBPCRE1=YesPlease" - myopts+=" NO_LIBPCRE1_JIT=YesPlease" - extlibs+=" -lpcre" - fi - fi - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" - use elibc_musl \ - && myopts+=" NO_REGEX=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - myopts+=" HAVE_CLOCK_MONOTONIC=1" - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ - myopts+=" HAVE_GETDELIM=1" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-r3_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/libsecret - git_emake || die "emake git-credential-libsecret failed" - fi - - cd "${S}"/contrib/subtree || die - git_emake - use doc && git_emake doc - - cd "${S}"/contrib/diff-highlight || die - git_emake - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/libsecret - dobin git-credential-libsecret - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{64,}/perl5/ ; do - if test -d "$d" ; then find "$d" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=" t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=" ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled+=" ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=" ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=" ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=" ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.5.ebuild deleted file mode 100644 index b51710380b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.16.5.ebuild +++ /dev/null @@ -1,699 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - SCM="git-r3" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: pu - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; - esac -fi - -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) -" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.12.0-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of static build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - if use pcre; then - if use pcre-jit; then - myopts+=" USE_LIBPCRE2=YesPlease" - extlibs+=" -lpcre2-8" - else - myopts+=" USE_LIBPCRE1=YesPlease" - myopts+=" NO_LIBPCRE1_JIT=YesPlease" - extlibs+=" -lpcre" - fi - fi - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" - use elibc_musl \ - && myopts+=" NO_REGEX=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - myopts+=" HAVE_CLOCK_MONOTONIC=1" - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ - myopts+=" HAVE_GETDELIM=1" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-r3_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/libsecret - git_emake || die "emake git-credential-libsecret failed" - fi - - cd "${S}"/contrib/subtree || die - git_emake - use doc && git_emake doc - - cd "${S}"/contrib/diff-highlight || die - git_emake - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/libsecret - dobin git-credential-libsecret - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{64,}/perl5/ ; do - if test -d "$d" ; then find "$d" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=" t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=" ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled+=" ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=" ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=" ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=" ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild index f26b6776b9..1041b17df4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -689,7 +689,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild index f26b6776b9..fef3452352 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -300,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -689,7 +689,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild index 2ed7063c51..dfeadcd411 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -26,12 +26,12 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -140,9 +140,6 @@ PATCHES=( "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch ) pkg_setup() { @@ -197,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -205,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -236,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -249,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -294,12 +291,6 @@ src_prepare() { # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ Documentation/Makefile || die - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile || die } git_emake() { @@ -309,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -368,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -416,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -441,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -524,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -544,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -698,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild index 41553b31f1..2adcea3de8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.18.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -140,9 +140,6 @@ PATCHES=( "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch ) pkg_setup() { @@ -197,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -205,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -236,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -249,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -294,12 +291,6 @@ src_prepare() { # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ Documentation/Makefile || die - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile || die } git_emake() { @@ -309,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -368,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -416,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -441,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -524,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -544,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -698,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index f26b6776b9..882ac65dea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -194,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -202,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -246,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -300,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -359,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -407,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -432,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -515,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -535,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -689,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index f26b6776b9..882ac65dea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -194,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -202,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -246,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -300,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -359,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -407,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -432,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -515,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -535,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -689,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index ce1a4c2f06..882ac65dea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -194,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -202,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -246,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -300,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -359,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -407,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -432,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -515,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -535,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "${d}" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -689,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index 958f1ad6aa..882ac65dea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -140,9 +140,6 @@ PATCHES=( "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch ) pkg_setup() { @@ -197,7 +194,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -205,13 +202,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -236,7 +233,7 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ myopts+=( HAVE_GETDELIM=1 ) fi @@ -249,7 +246,7 @@ exportmakeopts() { myopts+=( NO_NSEC=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -303,7 +300,7 @@ git_emake() { emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -362,12 +359,14 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # by defining EXTLIBS we override the detection for libintl and # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" fi popd &>/dev/null || die fi @@ -410,6 +409,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -435,7 +435,7 @@ src_install() { #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} # don't add automatically to the load-path, so the sitefile # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -518,6 +518,7 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ @@ -538,7 +539,7 @@ src_install() { newdoc "${S}"/gitweb/README README.gitweb for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi @@ -692,7 +693,8 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/git for Git bash command completion" + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" elog "Note that the prompt bash code is now in that separate script" elog "These additional scripts need some dependencies:" diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.4 deleted file mode 100644 index a8cd8966f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.16.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.4.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=121ca2e4d3593d87f8a0c36b61b5c1c4 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.5 deleted file mode 100644 index 18ff85684e..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.16.5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.16.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.5.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=3b9b69eec7cf63eea3c03d26cf577ff5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 similarity index 87% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 index 656726ca17..c7bec9f463 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 @@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic EAPI=6 HOMEPAGE=https://www.git-scm.com/ IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.18.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.1.tar.xz ) +SRC_URI=mirror://kernel/software/scm/git/git-2.19.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.19.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.19.2.tar.xz ) _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=eb46a8ea0fd84eb8cc442e48a7a109e0 +_md5_=52b22d2c10f2ef4fdb7d9f54081c7c51 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 similarity index 86% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.0 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 index da726197f3..998619f095 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.18.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 @@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic EAPI=6 HOMEPAGE=https://www.git-scm.com/ IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.18.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.0.tar.xz ) +SRC_URI=mirror://kernel/software/scm/git/git-2.20.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.20.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.20.1.tar.xz ) _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=dcf10b1bd697fb11a5cf37721930f7e7 +_md5_=9de57ea87209bbfe8818f30efb8fd084 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 similarity index 64% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 index 4d902de31e..58b7f360db 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 @@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic EAPI=6 HOMEPAGE=https://www.git-scm.com/ IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.19.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.19.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.19.1.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=79025af3be68140c8af8d3ab90d2bc16 +SRC_URI=mirror://kernel/software/scm/git/git-2.21.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.21.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.21.0.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=b8cd834327e9f3fb2d421632f956ab4a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 similarity index 50% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.0 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 index 45fa33a246..62a996243e 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 @@ -3,12 +3,12 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency EAPI=6 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.19.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.19.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.19.0.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=79025af3be68140c8af8d3ab90d2bc16 +SRC_URI=mirror://kernel/software/scm/git/git-2.21.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.21.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.21.0.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=abdabcb326751232efe4d24cc67c7466 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 index 3938693468..974e8365d8 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 @@ -3,10 +3,10 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency EAPI=6 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f6f194391f1de4aab705ade521c0e67a +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=52d5304f2bb6135f280712cf20b2c204 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 index 3875b74102..974e8365d8 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 @@ -3,10 +3,10 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency EAPI=6 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=79025af3be68140c8af8d3ab90d2bc16 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=52d5304f2bb6135f280712cf20b2c204 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 index 3875b74102..974e8365d8 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 @@ -3,10 +3,10 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency EAPI=6 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=79025af3be68140c8af8d3ab90d2bc16 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=52d5304f2bb6135f280712cf20b2c204 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 index 1b7ac35745..974e8365d8 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 @@ -3,10 +3,10 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency EAPI=6 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c9110e4bbdd850f8cf1a5ba93c38ba97 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=52d5304f2bb6135f280712cf20b2c204