diff options
Diffstat (limited to 'dev-vcs')
33 files changed, 1093 insertions, 98 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex 459a96b5806e..75d07795ecc6 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest index 71d06f2dec4e..a1f98138201b 100644 --- a/dev-vcs/cvs-fast-export/Manifest +++ b/dev-vcs/cvs-fast-export/Manifest @@ -1,5 +1,7 @@ DIST cvs-fast-export-1.45.tar.gz 517917 BLAKE2B 47d0debe2ea4d5674630065ee320c5db71f7ab6e4b17b7850d28c1951359ea98c639639574a7c3a25b9ec4e09ff53f1c5db566bff070e6381061fd828e875061 SHA512 f3acadabdd74f2099003a0cda29b021ea2173127af1a358bcb855397be95edaff2b1f30d3cf31dd6c08e79a8bad07b80b826c374d9b5e43555ec60d08dd577e4 DIST cvs-fast-export-1.46.tar.gz 519521 BLAKE2B 7ecf0a87bef922a0fa69c1f63ab07e943e2a501c8565a610df3cb07e3af04b9abea02e78ae1d764c715e8e8b402cdc32f41e9109cee030d8339ebb8bdb97e561 SHA512 bd2e2a426bdfd76af06346c4a20469d134dd33ee98457afd8db3f1599e6f186451eb181057c97dd7383d35e66c4915f2cb42d51b818127cb3464c8cafc2f34f3 +DIST cvs-fast-export-1.47.tar.gz 522489 BLAKE2B 5f83524137b38f863287feef9f95074dd40bc2189420abcf4d04cd02d686e21cc7fb26bf1e5fc3736efb04fe2e97202f1b4112483f420c7609fb208984c21095 SHA512 0da4b6d27e93c3bcf8ee0669acb0f15973f6eb3c566fd843755ac1176315220a23813d8ed72eba6f7429fa8ce5c00ed99d22fd9dd14e438473ff0a63c2d20cac EBUILD cvs-fast-export-1.45.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a EBUILD cvs-fast-export-1.46.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a +EBUILD cvs-fast-export-1.47.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955 diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild new file mode 100644 index 000000000000..50babdf251fa --- /dev/null +++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="fast-export history from a CVS repository or RCS collection" +HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/" +SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + app-text/asciidoc" + +RESTRICT=test # upstream does not ship some tests in tarball + +src_prepare() { + default + + tc-export CC + export prefix=/usr + + # respect CC, CFLAGS and LDFLAGS + sed \ + -e 's/cc /$(CC) $(LDFLAGS) /' \ + -e 's/^CFLAGS += -O/#&/' \ + -e 's/CFLAGS=/CFLAGS+=/' \ + -i Makefile || die +} + +src_compile() { + # '.adoc.html' rules can't be executed in parallel + # as they reuse the same 'docbook-xsl.css' file name. + emake -j1 html + # Allow full parallelism for the rest + emake +} + +src_install() { + default + dodoc README.adoc +} diff --git a/dev-vcs/cvs2svn/Manifest b/dev-vcs/cvs2svn/Manifest index 8ff71e44630d..d947b7a407bb 100644 --- a/dev-vcs/cvs2svn/Manifest +++ b/dev-vcs/cvs2svn/Manifest @@ -1,3 +1,5 @@ DIST cvs2svn-2.4.0.tar.gz 514891 BLAKE2B 0dd0d15ab28f96e56854295a789284a00ad8d172dbd849068fb05811a728f854d83b52856b6254ee0ac947425d972fb810b627aab95116040d4370bb98de6e0c SHA512 726fb8a3b3261eeb6d8097973f2741aa7a433f847bcef6701a6c0b7dc3d8fb5da1726e40f008d1dffac71791b953ddb9ade5db5809c98731d78e94da6465506a -EBUILD cvs2svn-2.4.0-r1.ebuild 1237 BLAKE2B 30cb1d0e16bd9387d7ef37a6cbc99d49f9baad810c9a974fd493dfbb7b4f17a31fe8b612342a977764aec37bd2dca1307ffff1be820e0e810ba0b13bb81f7e38 SHA512 a8878f95cd16ed0d28f52dd5f6c2709e5cf6f4f1d5a1c14b002f8dee0d6c6800328c53860a1e60fa05af60a6c2a18dc1da6866a217bba874eec417ac446b9fc6 +DIST cvs2svn-2.5.0.tar.gz 539332 BLAKE2B 54d70750c601c1d5c701f853686d958e9b8b92c4109d9294ec139d3cc8d4c9e102abed976fe9f845d0d0a1ccb65f504a08ef27f48bdf001254cf6e26087e50e2 SHA512 226972553c9d9cbae81c6e85079f4201944cf77ce68ebd6020ef2cd88bf457241739cef401c4bd3bf656b1992fbf84639b8df72d1921eee9d043fde94fba1c6a +EBUILD cvs2svn-2.4.0-r1.ebuild 1198 BLAKE2B 084a2e07881aaf63cf31db9de21c61839d3d910ddc5cf01ad809a28f2b69310335e3332a893df3294dd5882ae58f132963fae8ed8c091025afb749e34730be50 SHA512 19dbd585956313efc291d68211473f51d684ee4d4e30cf60c28c7a6998b41ef5ec84111e76c6e4fcb09180e6f2ca32a1fe2a67bd0a0f908e07d1fb36724bd07d +EBUILD cvs2svn-2.5.0.ebuild 1203 BLAKE2B 3add6ef5c4ee6b99eee887a06ea95bb723ea26140883a3a741abad0dab6e71b8bfc111d6aef6b59dc188ab886afb2a473aa41efb303adeffb652e6eb0f2350ba SHA512 00e1132732266fec24554822ceab04880e6606dfd3a7f9ad1692e36d161b5e1a6e063bd10c05a8fc5d0d5bb67c825ca91dcc7bb64c9a5cc31d8152d9e7c4312e MISC metadata.xml 282 BLAKE2B 19bc0e385352904411b33830410bfc0a9a9c2b67c37b253f7c336dd455d413d34fd89569430a4016e4bef1660b9b710e6c08fb192584915fcf911b15593cf694 SHA512 165091ed860bbc62f00932c46e6d4944fe7444ac8bdfd1014a9781b8769d1a9d234578937b63ac7b90bdd8f57b21de50f74e759a44fa2b2d1e8edd854aa17ae3 diff --git a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild index bfdeb720bee4..8f54c70877ef 100644 --- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild +++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,8 +21,8 @@ IUSE="bazaar git test" DEPEND=">=dev-vcs/subversion-1.0.9" RDEPEND="${DEPEND} - bazaar? ( >=dev-vcs/bzr-1.13[${PYTHON_USEDEP}] ) - git? ( >=dev-vcs/git-1.5.4.4[${PYTHON_USEDEP}] ) + bazaar? ( >=dev-vcs/bzr-1.13 ) + git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs" pkg_setup() { diff --git a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild new file mode 100644 index 000000000000..8d1c4ed57dcb --- /dev/null +++ b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +FILEVER="49543" + +DESCRIPTION="Convert a CVS repository to a Subversion repository" +HOMEPAGE="http://cvs2svn.tigris.org/" +SRC_URI="http://cvs2svn.tigris.org/files/documents/1462/${FILEVER}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="bazaar git test" + +DEPEND=">=dev-vcs/subversion-1.0.9" +RDEPEND="${DEPEND} + bazaar? ( >=dev-vcs/bzr-1.13 ) + git? ( >=dev-vcs/git-1.5.4.4 ) + dev-vcs/rcs" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + distutils-r1_src_prepare + python_fix_shebang . +} + +src_compile() { + distutils-r1_src_compile + emake man +} + +src_install() { + distutils-r1_src_install + insinto "/usr/share/${PN}" + doins -r contrib cvs2{svn,git,bzr}-example.options + doman *.1 +} + +python_test() { + # Need this because subversion is localized, but the tests aren't + export LC_ALL=C + "${PYTHON}" -W ignore run-tests.py +} + +pkg_postinst() { + elog "Additional scripts and examples have been installed to:" + elog " /usr/share/${PN}/" +} diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest index a8f8b9d008d9..00857e97b675 100644 --- a/dev-vcs/git-crypt/Manifest +++ b/dev-vcs/git-crypt/Manifest @@ -1,9 +1,3 @@ -DIST git-crypt-0.3.tar.gz 20660 BLAKE2B 7bc71c247faa773ec4866492ae5917a6b5c7a7a2f676cfcbb4ab3642d8433c15476049165c37bf8d1aaf5fdbb1db9ce7e5137865f126086a4b575da4b21b38d8 SHA512 526630e58a2e74bffe954bc2f489311fb2261337092a1c4462788d9412b7fa7b1aa744402558bba39fe776cfa6333700c4e0ad651d262a7ca14d920485192adc -DIST git-crypt-0.4.tar.gz 44146 BLAKE2B 69e8c9a99f763c0b20c0d467ea8212a4688cb7e8f6d9b8241a20ae65680f7faea76a14794f2b01992b570a7adae518a79945b0e477cc539b7eb515c3729a853c SHA512 aa146d922258c4a68ad1a211b58e3b1e1b1135661ebecf3ede1b344fc93401eb9d0aa51cfa068f76fab3ab7c936ad6cf46e61e0e9505aaf4f338e54826ae88f6 -DIST git-crypt-0.5.0.tar.gz 56694 BLAKE2B c82af3313523615a3839ee68210134cca898c78009e9b6edcfbdf14146dff81eafc909f135992367181278c584733affad307bdd1e1f2d32f9b8298c6d862c54 SHA512 0ed75e6962d8e8260811e048c22d724bdd63d461615e8f99c1d65a07f931f9630c1b853112f202b612dc69746a9ad03995f2947ad6fa39af56a878d993d65d77 DIST git-crypt-0.6.0.tar.gz 57584 BLAKE2B 6557121ef4a3f49b2294f7c6268a55323b7ec192b851fac548e76a9301c65655be72f67eecc248205cefcb0184d52a55f8a462ccec0082552fce3115a18b7267 SHA512 06fd9f6dbdc5c9fa9196f3e81a87cd3688089623b2658daf9c98809d5ca14df0b7ca69fdfe8279abf575957c366f2f93bd5a6885092eb533bd0d1ed9fe9dfac5 -EBUILD git-crypt-0.3.ebuild 463 BLAKE2B 26996a0471337b69a736c44ef8cc2c248c4eef5b36c732d6180799f44d9f403ae295071739a1a267cc2df21538cf7c7182f0f17f4a761a87e4d46ccfee443a3c SHA512 aa947fe288664f9d01ade481b0fe11d4553a6c0c9d9f3a296441a40e6a1e67f352c3c9785ec8d0bfca7773607c20acac56526dc2b3de9f8289e416deb30a6f7e -EBUILD git-crypt-0.4.ebuild 463 BLAKE2B 26996a0471337b69a736c44ef8cc2c248c4eef5b36c732d6180799f44d9f403ae295071739a1a267cc2df21538cf7c7182f0f17f4a761a87e4d46ccfee443a3c SHA512 aa947fe288664f9d01ade481b0fe11d4553a6c0c9d9f3a296441a40e6a1e67f352c3c9785ec8d0bfca7773607c20acac56526dc2b3de9f8289e416deb30a6f7e -EBUILD git-crypt-0.5.0.ebuild 463 BLAKE2B b21d074df802608dc67b866ed27c923009df38e42dbcb932a6bb66e0368c8e3191a6dfd805f9041a2f1984e47f9c5c2b4d36ae37c854014862c489a607d106d3 SHA512 3fb5f22814a1b8dfa6350cb476ce895723c245ed502952239ee001cfb368093d19234a4a5126c28423f1766e67d382ba41f775132eb1a374d3f58c0694b1f9b0 EBUILD git-crypt-0.6.0.ebuild 463 BLAKE2B 3ba00302628888e104e0f05bbfc80481be9691a7b6a3f96abfd2ada758035387c84ad4c2398e434ecbb3faf453d983a2b73b25d88d482f45dca225c0d089b54d SHA512 0abbd6dda1fe03dfb67f9e481da37f1f4c5c97543dab66c8eb5c7abefa523935a96704ed7f7e7bbc1281bfdef18f7fbea6406a7303308164b04c6695f2cdc08f MISC metadata.xml 326 BLAKE2B 200218b3accdd8e5485e442fd23fb2eb914b4e33a5bb545573a65526740f3c48c9514cff5b34a75c39d364f94c8f19cc11522fbc168b9fed766925c65ca5e388 SHA512 b75574fb4627e4e52be50ab98bb207b8bc8f50fd67da8fa88dc00a5dbaedc36d1e955573e2abb7e27a94fa87d2a239b3e4f48900ccb7d27fc92d5009f20b6e29 diff --git a/dev-vcs/git-crypt/git-crypt-0.3.ebuild b/dev-vcs/git-crypt/git-crypt-0.3.ebuild deleted file mode 100644 index f660d477da55..000000000000 --- a/dev-vcs/git-crypt/git-crypt-0.3.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="transparent file encryption in git" -HOMEPAGE="https://www.agwa.name/projects/git-crypt/" -SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-vcs/git" -DEPEND="${RDEPEND}" - -src_install() { - mkdir -p "${D}"/usr/bin - emake PREFIX="${D}"/usr install -} diff --git a/dev-vcs/git-crypt/git-crypt-0.4.ebuild b/dev-vcs/git-crypt/git-crypt-0.4.ebuild deleted file mode 100644 index f660d477da55..000000000000 --- a/dev-vcs/git-crypt/git-crypt-0.4.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="transparent file encryption in git" -HOMEPAGE="https://www.agwa.name/projects/git-crypt/" -SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-vcs/git" -DEPEND="${RDEPEND}" - -src_install() { - mkdir -p "${D}"/usr/bin - emake PREFIX="${D}"/usr install -} diff --git a/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild b/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild deleted file mode 100644 index 4dfc91650e2f..000000000000 --- a/dev-vcs/git-crypt/git-crypt-0.5.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="transparent file encryption in git" -HOMEPAGE="https://www.agwa.name/projects/git-crypt/" -SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-vcs/git" -DEPEND="${RDEPEND}" - -src_install() { - mkdir -p "${D}"/usr/bin - emake PREFIX="${D}"/usr install -} diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index e1f6ab5cc36c..b6f42dfff573 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -18,11 +18,12 @@ DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380db 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 -EBUILD git-2.19.2.ebuild 18976 BLAKE2B 0c5480271e7a580808a2e5f3497101f2a8ab748a33cfa75e02fc8d862cf08e6bf5897d1d852144bb29e5be15445cf95c0532de684112ecc4a321b1e81ffc6d18 SHA512 ea46175f6cf2d20814e93d16c70b4f39c4fff5cb7ec822ba2739d71821d72543cd8b6a55acdfef7f91d45b2475142c28c28bbce38581287c601e808ad9f7d3d0 -EBUILD git-2.20.1.ebuild 19000 BLAKE2B 3f4c18f240f0e92eabc738bb643981bb7bcd43ed6446187b22c27898673c47ed15608d98d8e1ebe5a1b4c731c75fd05b5a6b302bd29a767e55948fe84a52ecfb SHA512 60a800f4bf509576249a31884d438de7d9abf905fcc448dd8d4d7ea8a2e31182ee635bce24f74c71604918581c7e2a7d03f53c69ab79a6c839ccc992659db7b2 -EBUILD git-2.21.0.ebuild 19044 BLAKE2B d1bc074f974939b1af89a1c716f947123ffa017d8efba340b5940c629ba13be2d16f315d923d23656dbe056d343deff37937bb66da79cb9fe6045325533cfee6 SHA512 dc164b05a6492c82c3a0d55a1164dd49f5e60a4d7c844dbaba687a69981ec1162c78b5ed96629f4f58912f42d28ea952a6131b827577fda09fd6f668b4040eff -EBUILD git-9999-r1.ebuild 19058 BLAKE2B dda70c594d4537d13db95fca7e5aea7e5197771b1e6cb98933b0957822f3459847afaa00937175d41bd64cc2073b0262839001ca523860424be3b3bbbdab0448 SHA512 70111b41fda523e3ada183c95990af4070515c1d234c35aa4e4c53ff8c66203f58f378bf8797b3eebbb82f3d7473e27f0f868934e5c9dfc8960da09cbc5121e1 -EBUILD git-9999-r2.ebuild 19058 BLAKE2B dda70c594d4537d13db95fca7e5aea7e5197771b1e6cb98933b0957822f3459847afaa00937175d41bd64cc2073b0262839001ca523860424be3b3bbbdab0448 SHA512 70111b41fda523e3ada183c95990af4070515c1d234c35aa4e4c53ff8c66203f58f378bf8797b3eebbb82f3d7473e27f0f868934e5c9dfc8960da09cbc5121e1 -EBUILD git-9999-r3.ebuild 19058 BLAKE2B dda70c594d4537d13db95fca7e5aea7e5197771b1e6cb98933b0957822f3459847afaa00937175d41bd64cc2073b0262839001ca523860424be3b3bbbdab0448 SHA512 70111b41fda523e3ada183c95990af4070515c1d234c35aa4e4c53ff8c66203f58f378bf8797b3eebbb82f3d7473e27f0f868934e5c9dfc8960da09cbc5121e1 -EBUILD git-9999.ebuild 19058 BLAKE2B dda70c594d4537d13db95fca7e5aea7e5197771b1e6cb98933b0957822f3459847afaa00937175d41bd64cc2073b0262839001ca523860424be3b3bbbdab0448 SHA512 70111b41fda523e3ada183c95990af4070515c1d234c35aa4e4c53ff8c66203f58f378bf8797b3eebbb82f3d7473e27f0f868934e5c9dfc8960da09cbc5121e1 +EBUILD git-2.19.2.ebuild 18952 BLAKE2B 93390621e13738ff6adcb1a2881c492a678230ac341a4063c35f8b4f159c1114baca992c553cdefea636d5f46c77d8fffc4ae4465682454aca5d62f78c2c9b74 SHA512 ec51656907ab90c63adb74afb57127e8358784a9584fca41c17299d345a3a080cf99c1d039f3779a5263a87c6f0c3cbb05f5c4861ef5931b90381aaebb5fd568 +EBUILD git-2.20.1.ebuild 18972 BLAKE2B 0188e866182b482014a4ba3349d716d9c753c4477fa8c7a5318ac1b4eabf4946088fe198111df456ab59e763078d4284cb07f7144a41ac2cfbf56b86a1a4ff1b SHA512 f3747ff71774e5264b37b79d018553f991a9cfe28b6e5c6b6886cb37261c6cedced077e9f5bf1b144c74ccc63c9ef79ab46881593132405fd23026028b8054a1 +EBUILD git-2.21.0-r1.ebuild 19034 BLAKE2B f129fa83dd893fa0f5c0280d46a6d6529443d02fb8a8ba0d44c43725b6e99dd9fa8d14259c91f98a0032af04f7d22170e12d31f4fa51228d3f870087b19cc366 SHA512 c23c68b9237962328b5f74c8572e50d460549bbf383d3f43b9868c6c41d7d8e54cca90b7a8d4ed6b210a74a433ff29d4b268d550dbdf0c5df56b24ca73b5bea8 +EBUILD git-2.21.0.ebuild 19017 BLAKE2B 68a828e434064dac45182e7965bb7eaefd02e74477d65c1bde406f969d21f135114b9072bd989b2359c134f30017fa4c8f820632042b9c734dc8be4093b108ae SHA512 f03a335b84800e504aa7702158a55f1da20d42ba04540a4b78b712021399491e74bf328b610fe982b847579cd68df4430973c674475dfbfc32df6bf9d39bbb02 +EBUILD git-9999-r1.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 +EBUILD git-9999-r2.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 +EBUILD git-9999-r3.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 +EBUILD git-9999.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild index 1041b17df454..7a8f583cf00b 100644 --- a/dev-vcs/git/git-2.19.2.ebuild +++ b/dev-vcs/git/git-2.19.2.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 @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-2.20.1.ebuild b/dev-vcs/git/git-2.20.1.ebuild index c26c4f8ee32e..1b32a8338352 100644 --- a/dev-vcs/git/git-2.20.1.ebuild +++ b/dev-vcs/git/git-2.20.1.ebuild @@ -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" @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-2.21.0-r1.ebuild b/dev-vcs/git/git-2.21.0-r1.ebuild new file mode 100644 index 000000000000..da10d81239ce --- /dev/null +++ b/dev-vcs/git/git-2.21.0-r1.ebuild @@ -0,0 +1,710 @@ +# Copyright 1999-2019 Gentoo Authors +# 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=( 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" + 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 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 ~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 ) + perl? ( + dev-perl/Error + dev-perl/MailTools + 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_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.18.0_rc1-optional-cvs.patch + + "${FILESDIR}"/git-2.2.0-svn-fe-linking.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=( + ASCIIDOC_NO_ROFF=YesPlease + $(usex cvs '' NO_CVS=YesPlease) + $(usex elibc_musl NO_REGEX=YesPlease '') + $(usex iconv '' NO_ICONV=YesPlease) + $(usex nls '' NO_GETTEXT=YesPlease) + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) + $(usex python '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) + $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex tk '' NO_TCLTK=YesPlease) + ) + + 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 + INSTALL=install + TAR=tar + SHELL_PATH="${EPREFIX}/bin/sh" + SANE_TOOL_PATH= + OLD_ICONV= + 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 || die + + if use pcre; then + if use pcre-jit; then + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) + else + myopts+=( + USE_LIBPCRE1=YesPlease + NO_LIBPCRE1_JIT=YesPlease + ) + extlibs+=( -lpcre ) + fi + fi +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=( +# NO_MMAP=YesPlease +# NO_IPV6=YesPlease +# NO_STRLCPY=YesPlease +# NO_MEMMEM=YesPlease +# NO_MKDTEMP=YesPlease +# 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 + 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 ) + + # 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}" || die + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + if use doc ; then + pushd "${S}"/Documentation &>/dev/null || die + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + popd &>/dev/null || die + fi + else + git-r3_src_unpack + #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 + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die +} + +git_emake() { + # bug #320647: PYTHON_PATH + local PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ + sysconfdir="${EPREFIX}"/etc \ + DESTDIR="${D}" \ + GIT_TEST_OPTS="--no-color" \ + OPTAR="$(tc-getAR)" \ + OPTCC="$(tc-getCC)" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + PERL_PATH="${EPREFIX}/usr/bin/perl" \ + PERL_MM_OPT="" \ + PYTHON_PATH="${PYTHON_PATH}" \ + V=1 \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + 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 + pushd contrib/credential/osxkeychain &>/dev/null || die + git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ + || die "emake credential-osxkeychain" + popd &>/dev/null || die + fi + + pushd Documentation &>/dev/null || die + 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 + popd &>/dev/null || die + + if use subversion ; then + 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" + if use doc ; then + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" + fi + popd &>/dev/null || die + fi + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + git_emake || die "emake git-credential-libsecret failed" + popd &>/dev/null || die + fi + + pushd contrib/subtree &>/dev/null || die + git_emake + use doc && git_emake doc + popd &>/dev/null || die + + pushd contrib/diff-highlight &>/dev/null || die + git_emake + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake + popd &>/dev/null || die + + 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 + local d + 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 + pushd contrib/subtree &>/dev/null || die + 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 + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake install + popd &>/dev/null || die + 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 + pushd contrib/credential/libsecret &>/dev/null || die + dobin git-credential-libsecret + popd &>/dev/null || die + fi + + if use subversion ; then + pushd contrib/svn-fe &>/dev/null || die + dobin svn-fe + dodoc svn-fe.txt + if use doc ; then + doman svn-fe.1 + docinto html + dodoc svn-fe.html + fi + popd &>/dev/null || die + 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 + ) + local i + 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 + + local 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 + pushd t &>/dev/null || die + local i + 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 Makefile || die + + # Clean old results first, must always run + nonfatal git_emake clean + popd &>/dev/null || die + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + local rc + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + pushd t &>/dev/null || die + 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/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:" + 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/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild index ad2cb1dae850..7f9badb1427e 100644 --- a/dev-vcs/git/git-2.21.0.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -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" @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 882ac65deaeb..202ebcd97b24 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 882ac65deaeb..202ebcd97b24 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 882ac65deaeb..202ebcd97b24 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 882ac65deaeb..202ebcd97b24 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -76,7 +76,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest index 14d26a4cec4d..a29facfba8ff 100644 --- a/dev-vcs/guilt/Manifest +++ b/dev-vcs/guilt/Manifest @@ -1,4 +1,4 @@ AUX guilt-0.36-fix-help.patch 1192 BLAKE2B 1e2802baf7aad902f180a8b477cf163c383cd59033dbe6863f3d8dc83a34effdeb46f6e800fd377605bb4d6f295dcf63dac765eee0ec8315b5a7b8e497b5f447 SHA512 2dcb6db0ee356b1cf4366a25f82abf6c9170b424fe3884d7b3259b6363afb9966c0e33b6b8bf5707feb229dc75f0555b02506ff7b26a8ec3ead206e6fdc8bd6c DIST guilt-0.36.tar.gz 64624 BLAKE2B 8514f0fa6c7dd96e3a8c90939046b45b2e3115f2361a428ad58e1c67db0cc73cab1304a1493a45b1fda2928cc8a03b03e2986c845c826bcd7b491d264d3d1333 SHA512 882438d5b9ed4d16e3dfc95ddbef6ec1d76860d82aa6abc78010351577fb65578f919c6fe55f9d7593c82b0eae2d0dd80d577eee906fff84a426391936242652 -EBUILD guilt-0.36-r1.ebuild 1265 BLAKE2B 8b400cf8e4080e47d95a47f534695d3fa7962bfdb3adaf5c5711e0df4e74422e4011e2691057b49a3df2550a47be8859409b495177882615580da4ee67ccf19f SHA512 f14bddde5fa2d3bf8d3ed040d6497d97fa216266973d485a8ed3937d14a03723c6310059edce4e3982e32ea5ba463370d34884aa7d721f0991d17d76ed0800b0 +EBUILD guilt-0.36-r1.ebuild 1266 BLAKE2B 9d92612b1dd25f6f6e1b79e38459c9a84643266873ec06342cbf6c22d782c05456c6a183e01f0469ea36ef595fb7da86379ffb85d5eddf7089ad5d03caa556c0 SHA512 d31e5afc89ef5c4213055235697a671d7548c8e7adfa4bc27a8c72df47dc8aa13239d259f070fcffc9b49366b013a4490820e1abaf7bed58773dd8d5e47924b1 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-vcs/guilt/guilt-0.36-r1.ebuild b/dev-vcs/guilt/guilt-0.36-r1.ebuild index 5a46d0b15497..52a9c49c0e4b 100644 --- a/dev-vcs/guilt/guilt-0.36-r1.ebuild +++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DESCRIPTION="A series of bash scripts which add a quilt-like interface to git" -HOMEPAGE="http://repo.or.cz/w/guilt.git" +HOMEPAGE="https://repo.or.cz/w/guilt.git" SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest index a87e7a4140aa..c1c8d9c0e8a0 100644 --- a/dev-vcs/hg-evolve/Manifest +++ b/dev-vcs/hg-evolve/Manifest @@ -1,3 +1,5 @@ DIST hg-evolve-8.3.3.tar.gz 733641 BLAKE2B a2dff8061df3fbb31389be06bcba68d69b56bbb0037ce0dcb98c9d2852f060811fb72155a004161ebe7e4be0fc232fc356938629e24943c87649bd11a9f12e60 SHA512 bdd301c44156a38e6f4a216d4813acc9a85de3358172b42ed74107117811c40333d1676f1380667ca060815d5004e81629588691d969b31f75a8a93e16745973 +DIST hg-evolve-8.4.0.tar.gz 738359 BLAKE2B f7334bfa55e303c1e557f0e7aef4b9f23998d3f99f6ca74892cad9d77fb443a4a5cde69a4479e8a2eac866c49220640756f428001c1257d7f8527418fea27361 SHA512 fa3769ff6d884c5733024d5e8f4474c41b72ad811f4176216f60834cec65d831e78b78ebf15568113953da691c4075b1cf136e0f3531aab90b1afdf5e638b5e1 EBUILD hg-evolve-8.3.3.ebuild 749 BLAKE2B 169226b35c8bd4a7c061b51b85b309b8fbf67fcf7977d1a9d22f7c66d28c448a4388d753f9c7876cd49acecd5b626a2d1918573917b90d9e386e3f537d93f171 SHA512 76922991a5290ab3bc524ffbc28e57cadcb76d709b0a55d6b0d83ce9606609e4d1447afa5b997903b261336f10dad7def6a7bd5a133effd590773250a44fdc79 +EBUILD hg-evolve-8.4.0.ebuild 749 BLAKE2B 3d42920b21837708f764dbe4e012e11938c722802a22724bac8931c3e671b07ff389a9f8c920b555c27daa830b47bcab20e0aac3b037e83d9006775d21434b42 SHA512 f3b40e73c9ba525e53707ed0df74c9a3566b6ce5dcf986b16d67350a69664773019c27955343e261ad4bb28335a8ecaf6b00ca310a5d2bce590e3c7d34bcf127 MISC metadata.xml 323 BLAKE2B 960bd09bae7474d94c2d986fe304708d0bf4f4bbd6deed930a539d521f20bdd6664934ac2999dab925fabd9ab4e298a343405d976a8bb6865e6be8aed7eb11d2 SHA512 92404b3c82702ad0876850c003dddf1dcb01cb03e4b573cd0e04dc276db0a89adbc5f83f8fcab0ff5e7bfaf767080d8b41a2916aeeed6e7f70afab477a67c63a diff --git a/dev-vcs/hg-evolve/hg-evolve-8.4.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-8.4.0.ebuild new file mode 100644 index 000000000000..a89ef7e4eea3 --- /dev/null +++ b/dev-vcs/hg-evolve/hg-evolve-8.4.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="enables the changeset evolution feature of Mercurial" +HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=" + >=dev-vcs/mercurial-4.4[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx )" + +python_prepare_all() { + rm hgext3rd/__init__.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs all +} + +python_install_all() { + distutils-r1_python_install_all + + if use doc; then + dodoc -r html/ + fi +} diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 43627fe05168..3fe1541bf1a0 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,6 +1,10 @@ +AUX kdesvn-2.0.0-askpass-porting-fix.patch 1643 BLAKE2B c7f249589e5cd32741dbe59de7aaf2c41372a59be2b646099f570c7060378a1c83a2980cacb56a08cb391e3f6c0c7cf6124a5d0fb0e059cd34d1ba1fd7b01df0 SHA512 fe6abc4fd09ef69a655a791cf9ccd60084e32a029414bf9a0279a4823cac798078ce8232da33bb0329c30d1f42625a1dd98076c59dacf3fb742b81875a1f5fda +AUX kdesvn-2.0.0-cmake.patch 810 BLAKE2B 0a6096bc9c0d7d315bcbd0d30ac2cff02111857a9496c725fcfd98efc591a15b98d93ae75e7112ca5d1e9630599a30d0d37054b927c71345d3f2fcce5640e8e0 SHA512 a35faaf75c5e8051dc6b5ba8d7220a123086b09800e18f0a3f5f2330d8f35765ff1153a3e57f8dc7ac47f096a3b621e9183012479691a0e855e013c57ecc1589 AUX kdesvn-2.0.0-deps.patch 1436 BLAKE2B edce1dd6ed89dd991b790aae05da128e585bafc20be94dd220176ec264b9db38c15973ea0b2ec7e4ba566849897bf82d25593a598c31c27e3c128defd725354b SHA512 8a4dffee12f8974d60662b4035baa564f02e69e6f24d81c8e63f03c102302c3b617c5b02a5734616fa614ac6984db600da8765aa1fddf78b2d07ed38436d9c36 AUX kdesvn-2.0.0-desktop.patch 654 BLAKE2B 8f28395849e732c499ac205970da753af9ba7532cc078321fdb4c214927da38a7f566d7e5c3e30faa46e494599a5ee3c5a49604ccd58969f7fc0d10769b3fac8 SHA512 f12b78a2f5640639a9dc781b8754b7dbdc31fa8198c0f3157771ef199e0d17acb86cd592cb903022ee46fca035c55d6cb80108b76891454ceb630086d88be6eb +AUX kdesvn-2.0.0-fix-outofbounds.patch 3678 BLAKE2B 2ee02647d7cb936056a08006c2a9e0484df1f45673cb9b14376c28dda3eeed6230b739b62f7ccb3560924fc3a877950d5a8b450cfa042881e512a1e98066739a SHA512 2e740ca5cb0211b26c4631df464d71f97d896f5c44049040acad830eb0b642f6d65eb09add1b5dcf1c9f0a40e3d60811a192bbcbb908413fbfc05ab0aa006306 +AUX kdesvn-2.0.0-fix-runtime-warning.patch 1084 BLAKE2B d0dd97c332e378473b17e8512dbcdbd1b09dcf447f844cdf532541694e16d0e3cc2436ab9164b19517b9ad86bcc534da280bb7670185916a8e3afeae9c8a596c SHA512 ad5158c65498ab15e1a98c51ddfad959fe3b502eca7c5047189d8d9068dcc94c8406a209c684966cdb70579a409aac2122b709a4f0c190b7ae47e77af6c6f651 AUX kdesvn-2.0.0-qt-5.11.patch 706 BLAKE2B 8c8aae9d62aae648b6c72239c3ebaf13202953b583c8b6b471e9cd142f04701a5bd1c479eb1388a90732ce379f06ff88855ae5a706a0fae249769709c5da2724 SHA512 f706636642d26f9c97f4c917ac388c9903bce9349dc0607cf35e88d72c70e60a969c0ad94cae0896ed5dddea0ff22341ef720a150d1f20224b285c40c3dcc9c4 DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2 -EBUILD kdesvn-2.0.0.ebuild 1575 BLAKE2B 66adeca1e53695dd3d268c0f877c88b0d50782c6f68e3d71602621dd4cc6b9313a40dfebd733e9446bd51d541650387132b570ee72e3c29e18f6b202cc1bd775 SHA512 9f14f4b5802c74c3019ddff981cc0676ca678a3c391169337238305ddf9deeb8044780986acb24923b95554269c19deb39d402cf203b435ad1f6f9d0d6657004 +EBUILD kdesvn-2.0.0-r1.ebuild 1719 BLAKE2B ad1eef7c6fec29a74f9b0c5dfd715a7e1f5c4d30b976e85483d0cd526dc112fd882f07f448fd9b06cc3af17c7b538ed2d1260ce3833fc079006e9a9eecdd6f4e SHA512 1d6e5e8fc22973dbf8dede4946eba02db342843c6a85bb022f3e621a2faa3bb2b368e4032ee36398a00f23523552f9a3b344f1d9b223825b8cd50668dec883c0 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch new file mode 100644 index 000000000000..8e95270f4294 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-askpass-porting-fix.patch @@ -0,0 +1,42 @@ +From 8be5c9f4f27d3312715c0d60ea6c088ae32283b7 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano <luigi.toscano@tiscali.it> +Date: Tue, 31 Jan 2017 01:29:58 +0100 +Subject: Fix porting issues with kdesvn-askpass + +- properly setup and run the command line parser, fixing the order + of the operations; +- set the translation catalog; +- remove a porting-related comment. +--- + src/askpass/kdesvn-askpass.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/askpass/kdesvn-askpass.cpp b/src/askpass/kdesvn-askpass.cpp +index aea5986..030fa9c 100644 +--- a/src/askpass/kdesvn-askpass.cpp ++++ b/src/askpass/kdesvn-askpass.cpp +@@ -30,7 +30,8 @@ + + int main(int argc, char **argv) + { +- QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization ++ QApplication app(argc, argv); ++ KLocalizedString::setApplicationDomain("kdesvn"); + KAboutData aboutData(QStringLiteral("kdesvnaskpass"), i18n("kdesvnaskpass"), QStringLiteral("0.2"), + i18n("ssh-askpass for kdesvn"), + KAboutLicense::LicenseKey::LGPL, +@@ -39,10 +40,10 @@ int main(int argc, char **argv) + KAboutData::setApplicationData(aboutData); + parser.addVersionOption(); + parser.addHelpOption(); +- aboutData.setupCommandLine(&parser); +- aboutData.processCommandLine(&parser); + parser.addPositionalArgument(QStringLiteral("[prompt]"), i18n("Prompt")); ++ aboutData.setupCommandLine(&parser); + parser.process(app); ++ aboutData.processCommandLine(&parser); + // no need for session management + //app.disableSessionManagement(); + +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch new file mode 100644 index 000000000000..f331cdb49da2 --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-cmake.patch @@ -0,0 +1,26 @@ +From 18039eb7a3a6c5a24cd58b3e9c924ba63d60ca61 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sat, 3 Feb 2018 11:32:44 +0100 +Subject: Fix cmake syntax, this was adding -I settingsdlgs -I PUBLIC to the + command line + +(detected by -Wmissing-include-dirs) +--- + src/settings/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt +index a983484..259a256 100644 +--- a/src/settings/CMakeLists.txt ++++ b/src/settings/CMakeLists.txt +@@ -56,7 +56,7 @@ target_link_libraries(settingsdlgs + KF5::Completion + KF5::I18n + ) +-include_directories(settingsdlgs ++target_include_directories(settingsdlgs + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_BINARY_DIR}/../ +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch new file mode 100644 index 000000000000..fa12c2db868d --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-outofbounds.patch @@ -0,0 +1,99 @@ +From f87f3c9cfc5924742236bee606cc2107475968ce Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Fri, 15 Feb 2019 16:22:50 +0100 +Subject: Fix ASSERTs when calling beginRemoveRows with out of bounds + parameters. + +The last param must be the last row, not the row count. +--- + src/ksvnwidgets/models/commitmodel.cpp | 49 +++++++++++++++++++-------------- + src/svnfrontend/models/svnitemmodel.cpp | 6 ++-- + 2 files changed, 33 insertions(+), 22 deletions(-) + +diff --git a/src/ksvnwidgets/models/commitmodel.cpp b/src/ksvnwidgets/models/commitmodel.cpp +index 4b5be8a..ac9d1ff 100644 +--- a/src/ksvnwidgets/models/commitmodel.cpp ++++ b/src/ksvnwidgets/models/commitmodel.cpp +@@ -46,33 +46,42 @@ CommitModel::~CommitModel() + + void CommitModel::setCommitData(const svn::CommitItemList &aList) + { +- beginRemoveRows(QModelIndex(), 0, m_List.count()); +- m_List.clear(); +- endRemoveRows(); +- +- m_List.reserve(aList.size()); +- beginInsertRows(QModelIndex(), 0, aList.size() - 1); +- for (int j = 0; j < aList.size(); ++j) { +- m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j]))); ++ if (!m_List.isEmpty()) { ++ beginRemoveRows(QModelIndex(), 0, m_List.count() - 1); ++ m_List.clear(); ++ endRemoveRows(); ++ } ++ ++ if (!aList.isEmpty()) { ++ m_List.reserve(aList.size()); ++ beginInsertRows(QModelIndex(), 0, aList.size() - 1); ++ for (int j = 0; j < aList.size(); ++j) { ++ m_List.append(CommitModelNodePtr(new CommitModelNode(aList[j]))); ++ } ++ endInsertRows(); + } +- endInsertRows(); + } + + void CommitModel::setCommitData(const CommitActionEntries &checked, const CommitActionEntries ¬checked) + { +- beginRemoveRows(QModelIndex(), 0, m_List.count()); +- m_List.clear(); +- endRemoveRows(); +- +- m_List.reserve(checked.size() + notchecked.size()); +- beginInsertRows(QModelIndex(), 0, checked.size() + notchecked.size() - 1); +- for (int j = 0; j < checked.size(); ++j) { +- m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true))); ++ if (!m_List.isEmpty()) { ++ beginRemoveRows(QModelIndex(), 0, m_List.count() - 1); ++ m_List.clear(); ++ endRemoveRows(); + } +- for (int j = 0; j < notchecked.size(); ++j) { +- m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false))); ++ ++ const int totalSize = checked.size() + notchecked.size(); ++ if (totalSize > 0) { ++ m_List.reserve(totalSize); ++ beginInsertRows(QModelIndex(), 0, totalSize - 1); ++ for (int j = 0; j < checked.size(); ++j) { ++ m_List.append(CommitModelNodePtr(new CommitModelNode(checked[j], true))); ++ } ++ for (int j = 0; j < notchecked.size(); ++j) { ++ m_List.append(CommitModelNodePtr(new CommitModelNode(notchecked[j], false))); ++ } ++ endInsertRows(); + } +- endInsertRows(); + } + + int CommitModel::ActionColumn()const +diff --git a/src/svnfrontend/models/svnitemmodel.cpp b/src/svnfrontend/models/svnitemmodel.cpp +index 0c76e50..8e99e64 100644 +--- a/src/svnfrontend/models/svnitemmodel.cpp ++++ b/src/svnfrontend/models/svnitemmodel.cpp +@@ -173,9 +173,11 @@ void SvnItemModel::setRootNodeStat(const svn::StatusPtr &stat) + void SvnItemModel::clear() + { + int numRows = m_Data->m_rootNode->childList().count(); +- beginRemoveRows(QModelIndex(), 0, numRows); ++ if (numRows > 0) ++ beginRemoveRows(QModelIndex(), 0, numRows - 1); + m_Data->clear(); +- endRemoveRows(); ++ if (numRows > 0) ++ endRemoveRows(); + } + + void SvnItemModel::beginRemoveRows(const QModelIndex &parent, int first, int last) +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch new file mode 100644 index 000000000000..6b9dda46c81c --- /dev/null +++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-fix-runtime-warning.patch @@ -0,0 +1,28 @@ +From f81a246839b459c57ed89e2d267ae7e07c8c73c1 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Fri, 15 Feb 2019 16:24:07 +0100 +Subject: Fix copy/paste typo on variable name + +Detected by this Qt warning showing up: +QObject::connect: Cannot connect (null)::checkModifiedFinished() to SvnActions::checkUpdateThread() + +CCMAIL: Ch.Ehrlicher@gmx.de +--- + src/svnfrontend/svnactions.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp +index 0f27fed..9a5b4e3 100644 +--- a/src/svnfrontend/svnactions.cpp ++++ b/src/svnfrontend/svnactions.cpp +@@ -2675,7 +2675,7 @@ bool SvnActions::createUpdateCache(const QString &what) + return false; + } + m_UThread = new CheckModifiedThread(this, what, true); +- connect(m_CThread, SIGNAL(checkModifiedFinished()), ++ connect(m_UThread, SIGNAL(checkModifiedFinished()), + this, SLOT(checkUpdateThread())); + m_UThread->start(); + emit sigExtraStatusMessage(i18n("Checking for updates started in background")); +-- +cgit v1.1 diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild index b89d778a3a1f..3bbcbf96af47 100644 --- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.0.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -46,7 +46,6 @@ DEPEND=" dev-vcs/subversion " RDEPEND="${DEPEND} - !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] " @@ -54,6 +53,10 @@ PATCHES=( "${FILESDIR}/${P}-desktop.patch" "${FILESDIR}/${P}-deps.patch" "${FILESDIR}/${P}-qt-5.11.patch" + "${FILESDIR}/${P}-askpass-porting-fix.patch" + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-fix-outofbounds.patch" + "${FILESDIR}/${P}-fix-runtime-warning.patch" ) src_prepare(){ diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index cbddc946fec1..def28a6c07cf 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -11,6 +11,6 @@ EBUILD mercurial-4.5.2.ebuild 3580 BLAKE2B 38b2b4d0255288f9f9179a1ccdbc7f5274d79 EBUILD mercurial-4.6.2.ebuild 3581 BLAKE2B 9a619b0d2508dca3f8d883ba6845669307d56f262ddb3fd5154a1305c28a4bc63542691f64d9eef731673ec8a6ba11d9bfb9f9c52b76c1a7b796d23396b5ec48 SHA512 96ca6367f5cb5a1bf28a59fdbe408f79719674fc1604b6f3021c1403b22d4afe5427fcd8611a0bbc07f363a4c0140d668153fc8cbd9c2f19d109c1e799699896 EBUILD mercurial-4.7.1.ebuild 3537 BLAKE2B 97176fa1ddffb88942dc6079e6d36a6edf822069079dbf29a4aeebd3ea0054b6ecf4dd4f8fd3ae49256380fe6961d45289c8ce25e61c4ae759d5316e0c1d48d1 SHA512 f37c8bf4060f48acdafb51ae189efefd60e7ad46dca136c419b74e187058b985b69d24eedb2be2d017ef6c948a0bb9216c263fcc7166dbe942b9a1eb56f6453d EBUILD mercurial-4.8.2.ebuild 3812 BLAKE2B 9c0e45cfd188d64aa450011bfca668ddd279b1586a9cce2dd71b62673caa8ee8f50418a23724ee0d456606b33ef474480816bc9d210cbd3731c4337033a5ce82 SHA512 db503fe36beeba90ecb3134832b9ed86c89c246ce459054e5a694be9263d3c2e98aa0ada02e571e16e416741b3327e59c9d99f60474c4ceca75d58eaacbf9664 -EBUILD mercurial-4.9.ebuild 3810 BLAKE2B dad14c962cc89721e33ce3ef009bb481e24fcd50818e3c3731f5618cabd1691d61f905cb63ec5a3ebc600e1ad1e9c0c3133ed3aa6f0a782684e70d856f48eb28 SHA512 c4bf27044e82e1ce5b2b98a055c3e159afb1e88bf0425fe56f011d0c8a1caa1b6c7bf1765a6c28345c42a8362af45053ced5f194307a681253c8e474a0fd2e8c +EBUILD mercurial-4.9-r1.ebuild 3883 BLAKE2B 9bdab668469e0e0037625cf597a192eb817dcc732091bb0a24e13aade8cddf12a2a8d7875a0beb422d8345ccb88f57fdf34472b88362027fa835f92a8e21b9be SHA512 2ccc5e2a47e787a1d4d1f1bdd99534baae8c3196afc39376cbafdfb1084c1d629a36a042eaa006ebb1dcd7b50444fb414f3768409ee9fce1c6c66a609322a234 EBUILD mercurial-9999.ebuild 4175 BLAKE2B 22d6cba47692486bd37371d324a514886dcc378c10868edb67229e6657912ebb846e70573eec1ecbf3cfabeb6211a31bdef4ec154e56aaac6afff410493cc5eb SHA512 457878af1028d7887651b1dae1518f81bdf8825a701ffcfa6e7f60045bf885d1b1703e69cef66b63ccdab082f5b56096ff5ebbcd7d6ae8b4c7a7c5428ed7df0b MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 diff --git a/dev-vcs/mercurial/mercurial-4.9.ebuild b/dev-vcs/mercurial/mercurial-4.9-r1.ebuild index b30776c59274..d8cadd73e519 100644 --- a/dev-vcs/mercurial/mercurial-4.9.ebuild +++ b/dev-vcs/mercurial/mercurial-4.9-r1.ebuild @@ -14,7 +14,7 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bugzilla emacs gpg test tk" RDEPEND="app-misc/ca-certificates @@ -58,6 +58,7 @@ python_configure_all() { python_compile_all() { rm -r contrib/win32 || die + emake -C contrib/chg if use emacs; then cd contrib || die elisp-compile mercurial.el || die "elisp-compile failed!" @@ -85,7 +86,10 @@ python_install_all() { elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi - local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion wix plan9 *.el ) + dobin contrib/chg/chg + doman contrib/chg/chg.1 + + local RM_CONTRIB=( chg hgk hg-ssh bash_completion zsh_completion wix plan9 *.el ) for f in ${RM_CONTRIB[@]}; do rm -r contrib/${f} || die done diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index dd80cc332d30..518a010504ca 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -10,7 +10,7 @@ DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01 DIST subversion-1.12.0-rc1.tar.bz2 8503704 BLAKE2B e9f2779155aa45ee0f60359d292c085c1a4bbb2237964d6c045278d7dff71e665662c3af8bfcd81139eb7c501f8f0923377c80348202d1dfb1c9087fafe5a1ed SHA512 b82205d6530ba36d29194382897dbf0b79bd81326eebdaf71f21d061d3759c4f77fecfc2f9f5e761bef9e2534eb4567d62b96618813be644059d5c20219ff546 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b -EBUILD subversion-1.10.4.ebuild 15400 BLAKE2B 450e001b75f9f245ed293c9f7cd3dfe9b918327eddbb9fd69e7b1bd8b160609dd7ff74b1b8830ca7c03282cd413e6f2c9e0bfb51ea9f2d407c1f8aca919e6066 SHA512 76e75361972459fdab4b4fdedb4978ab41bf67755718cf3da157dd340c683ca81fceda25aac2f6ee4803586250c10e7dc32e837107688f1a71d1ffb0d1bf6fa0 +EBUILD subversion-1.10.4.ebuild 15398 BLAKE2B 7ca9109ba409c487c2fea0e4a22c2e02f5c7c299b47c4e6830877d50f97017934ec5e9e2adec365964669d812ee3147ec6746c5cf8249132f092028583c8000c SHA512 08a7a1e5da62c958eff5ab33810e0df22d03547ea0674048e5f0e85f2d5b212410f9529755d2eac55a38e57cf2e9614242dbb73b691f00e939a75a4118f7aa8a EBUILD subversion-1.11.1.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921 EBUILD subversion-1.12.0_rc1.ebuild 15360 BLAKE2B 7bc949661024a9b90b8b10f1821f98bc7609fef73480a2f738ab9ca6795fc18312069a19588c3a32af9f11c6b8f2568e600f3e6d274e0f14fef0d298e87630eb SHA512 349fa720c6bf02ed176b6a4d54413a519fb5bfcf262885cbf52c26ac98536db2f5ae6c599f93ba67ab3352a8784b68d3e40eee915f4cebbc602201420ce47baf EBUILD subversion-1.9.7-r1.ebuild 15859 BLAKE2B 0e057b982dc5c69823580408b77e3961aed8f57f262034fdbc5ca5df53de038f7cbb4a9a51bffd50406bc386887da3482ea542a614f997ddfd3b27bbea2a85cf SHA512 3de363cf9407f1525cfd30655740966a641f2252d4b0d65ba997252cf699cafa951327d886f181370ebb53cfcaf3cd7d3bbfbdd4e9a8248ea0a332f4b969fe26 diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild index 99f5f8e2634b..27db0ff68b2e 100644 --- a/dev-vcs/subversion/subversion-1.10.4.ebuild +++ b/dev-vcs/subversion/subversion-1.10.4.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" COMMON_DEPEND=" |