From 4cd2370bed609c118b6edfde5d3f116e5c35b897 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Dec 2017 16:17:22 +0000 Subject: gentoo resync : 03.12.2017 --- dev-vcs/Manifest.gz | Bin 15162 -> 15163 bytes dev-vcs/bzr-rewrite/Manifest | 2 +- dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild | 2 +- dev-vcs/bzr-xmloutput/Manifest | 2 +- .../bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild | 2 +- dev-vcs/mercurial/Manifest | 6 +- dev-vcs/mercurial/mercurial-4.3.2.ebuild | 134 --------------------- dev-vcs/mercurial/mercurial-4.4.2.ebuild | 134 +++++++++++++++++++++ dev-vcs/subversion/Manifest | 1 - dev-vcs/subversion/files/70svn-gentoo.el | 13 -- 10 files changed, 141 insertions(+), 155 deletions(-) delete mode 100644 dev-vcs/mercurial/mercurial-4.3.2.ebuild create mode 100644 dev-vcs/mercurial/mercurial-4.4.2.ebuild delete mode 100644 dev-vcs/subversion/files/70svn-gentoo.el (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 4bbae381d0e8..a9491e78a47f 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest index 536c0a6c29d6..9143a12e3f9b 100644 --- a/dev-vcs/bzr-rewrite/Manifest +++ b/dev-vcs/bzr-rewrite/Manifest @@ -1,3 +1,3 @@ DIST bzr-rewrite-0.6.3.tar.gz 33045 SHA256 f4d0032a41a549a0bc3ac4248cd4599da859174ea33e56befcb095dd2c930794 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250 WHIRLPOOL 7c27030e94ae0f57449fc77d226c385d8956965c693e2e24e1b431043021b30a519857ca9db3d0018ac93081cafd3908221b0dcd526753dee2d7d79922927115 -EBUILD bzr-rewrite-0.6.3.ebuild 542 BLAKE2B 0ff276a7caa5902bb75e6e28be0808bc94c28871f2a8a5e79710ec162ec6c17cd5eae5aa59546f244263b68e018c8ba4c20ea4b060ac00b640bfb4cb40212995 SHA512 274383dc5e7c5a6a3660a2662068d17b8da4f9717c1e3443eebb87edc7f6082f649d666147617e6ad1f126f5a036773caffc0d4ea8520693c4658d18f86b6860 +EBUILD bzr-rewrite-0.6.3.ebuild 528 BLAKE2B 4110d4d415f8be4b30d3bd76bda56dfb7bf8b504028712eb4bfcec2a7945ba6dc76b67e667e31c7b345dc66bcf1b538cf60e2c4f341f2def4b006f96c11c9674 SHA512 685364254c80852b3e0100a68b8f55afe7aa94a245474431b7cfd9a1b363c5f1187f2514c6f0f2b973bf7b8e9a6329800ce95ce9891f5b44411bdea69ee15fd9 MISC metadata.xml 251 BLAKE2B 08c15ece32d9da3db50c1eec9624e2befc3f75886f704caec02d6b14a24648491c10c9cdaa25d7f69bce2531d73258dc54b28c92ef6d29d1742e4b5e516b788d SHA512 f05104f73a09c8e5501ef51ebb48acab3419ee56dbe8ba3a5a49be40ab77e952149f7e78f289773870ea5fd41c1ec82e72dd4ce4dd2a8e4264b7272cdd134488 diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild index 5265e66774c8..d90a497685ee 100644 --- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild +++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 -DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to the functionality in git" +DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to git rebase" HOMEPAGE="https://launchpad.net/bzr-rewrite" SRC_URI="https://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz" diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest index 98af48658a74..37bfbf29c304 100644 --- a/dev-vcs/bzr-xmloutput/Manifest +++ b/dev-vcs/bzr-xmloutput/Manifest @@ -1,4 +1,4 @@ AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 BLAKE2B 5ec184209d5da05c52685f7783d5e80115f29c1004c341b0fc6223efa3314bf7a7242f3513488f8ef2f20a2967e460904ec787ef9fb379fe591636718655d957 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7 DIST bzr-xmloutput-0.8.8.tar.gz 49969 SHA256 73b9b2f6ce4d9910031df7fd153d56d14f833c20a106f099bee5a33463f73b36 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef WHIRLPOOL e07a08cd0738524207e7ab8d6c645b86d087391fb06d1e0ecf08cfbe78e6f6a1e730af41f4e2dea9e197e7c7f0de69cf6494ab1f906919febb86e06b490fe4e2 -EBUILD bzr-xmloutput-0.8.8-r2.ebuild 616 BLAKE2B 8fa454e9b81303ac40de0f9d5dc876054b1d22ac53a7336fde726361116a2425646a1dde890947a2222751f7b4482e72dbc3d952a2213b8a53ffa9e23519ef07 SHA512 64f7abad38c25b0d089f2b47825fe15a67927c788a3aa041b6dce66327bbde275c89c68e75dd52ad7a4aebb3396c57add248c2ee7fcf450b025cfbdfc42ff93b +EBUILD bzr-xmloutput-0.8.8-r2.ebuild 611 BLAKE2B 746d20ac3a8035203dd3bf20bbb7618ea91301b3572c1c2b695295a04b7deec6cbe28ace76f471a9f46f21012b8d4d8b03d11387f078fa3696d2e762bb138653 SHA512 6235679d5ca3bf0dbed7f4f455f37bd11d117b3c2f1baf83db554cd2610681a4ab69dae51e8d9ea1cc5b344afb77a9bc5e19b0d1d9eae780a375afabbe9c28d6 MISC metadata.xml 253 BLAKE2B e68e5578eb3a3b0fecc4d9d53d9df965024851ea16c468ad728307064315ddf8547152e27f3c4a45e1b01f3763b0e7650dc6daa4f067d02dad00194379762bb0 SHA512 4fed0d9c18fc0528aaa734f5d16a7e1a36f582fb4b82365d8515301b04389b98431dfb61868c1e69a50b5cf8b5e19e73cd0facdb3ead5eef094eb24cda3ddbb3 diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild index a724c30907c0..6006269067ab 100644 --- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild +++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild @@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 -DESCRIPTION="A Bazaar plugin that provides a option to generate XML output forbuiltin commands." +DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands" HOMEPAGE="http://bazaar-vcs.org/XMLOutput" SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 48f37b3a3cba..9749b32dc919 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -3,15 +3,15 @@ AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb40 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 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.2.tar.gz 5491214 SHA256 0f5bf688ba2add6f5db98a633edef43411ecf2c7ada5f2e14b9265820a96cd48 SHA512 e69b7cff941d83531d59d91c30e336807f868302dfda565e1421b7d34c2769221220686774af236d86ac0f67dba6e8a0947ed1185b30d89463a8d211e20d1cbc WHIRLPOOL 079d05e75cde63ff907b485a45a6a9cf8b42001525a799939647d05dd60d85c1faa0cbf14b9da95488103ec9f0b177f59ad7d8bde93dca3ffe428d697669bd4e DIST mercurial-4.3.3.tar.gz 5491634 SHA256 47a63c78698bc735667984bbc5b76619ff29a38d742f20cdf9f44cce59752374 SHA512 2d5249b6b2ec6b21c548702af2cf6b8e0858197a370514465aa7a880391f2e9efd6aecefb67fc547dfb8759c1c678009dc5a33fc48743bee30fcbdd853ee1cc6 WHIRLPOOL ef42493fdb4547a4e37d5f311cf5ac6fed90eb991d48ece6b2cbb3efe6722dec1513f044800cc58708c7a680eb1828c7888873b1849772e82901ad5d6d8a757d DIST mercurial-4.3.tar.gz 5469979 SHA256 ebf11176e9b5354ec7a1bde6c5382c914d10c397410531faf89f8b5124a7cb65 SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417 WHIRLPOOL 54583dbc826fdec3e737dc49d1a8ce180d29579d091c86e48a3b7c68bb4a2d399c5aff3b2ff0e30cd911e8955537a621c73c330d70a55f7efcdeafd21257178f -DIST mercurial-4.4.1.tar.gz 5636532 SHA256 8f2a5512d6cc2ffb08988aef639330a2f0378e4ac3ee0e1fbbdb64d9fff56246 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8 WHIRLPOOL f4fdfe28c4c5e6ac146429cc85d14fcd327fd22f8aed8383979bc16ea4a4fd64826d0ec7f78961f849a449e2cf611f6bf1672206f6c60264ab29c524eb07bb85 +DIST mercurial-4.4.1.tar.gz 5636532 BLAKE2B 07b91da192db30a925bd9798c5d6ab02336501c04f9d65bb9042786c2f5e6f8c16f6ebe6817f68ac746c21f79e39dbb8284b7590063d7a6ef615a8e2b6dbe821 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8 +DIST mercurial-4.4.2.tar.gz 5647013 BLAKE2B 3663517e5e53525e50852fd4941f7c71cc446fcc1255ed09d3e8375fcc14aea01f00e4c05a1cda2876d96b4f935b0d5e3d887567bc62c9c4629954b2cef8617f SHA512 3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993 EBUILD mercurial-3.8.4.ebuild 3540 BLAKE2B 0aa5da4ba02db827a332ee78b0acc70bfc44ac8be4e69f353a6c5f5925a5531de454825474b886b26a6723748f15e7a810b0bfd57cc4db8e3cabcdbe1a24f5b1 SHA512 da16f58a42571c3c7f0bf754f3087431bdd1a357db7b38193982f0a25026a061e7d60cc191d87236584c2be9119fde60dcd20dc3a7834942b0ee22ccb816f12e EBUILD mercurial-4.1.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960 -EBUILD mercurial-4.3.2.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960 EBUILD mercurial-4.3.3.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960 EBUILD mercurial-4.3.ebuild 3547 BLAKE2B 21d755c364cb4a6f38c3b50742ab2c1266d559868fa6cd234de9f644f456ecfb3ec9e26ce198232e1bff3d0d828ed2520c5863f92ea8c3216d7fde05cca36763 SHA512 e12beef3deb63a9d375724bb2781467f7f8b3643ba50821d7501ee8e0b93f59b08d7f5428ff2537ca2725ac54246f53473aaa4e3e867fbd4c86c1bbab0d04d2b EBUILD mercurial-4.4.1.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960 +EBUILD mercurial-4.4.2.ebuild 3556 BLAKE2B a3e9365c7030ee83cc388fe20b4730a9a8dab00dc79300dee634fcd676be969a0384685fb04e17a78d8ff34167f33c3f77bfa7e9024cdcd34e6c98d27887b0d9 SHA512 c899f66157e4352eace1747630492d6120a2db0b789f4b8bf06b5cfe3aaaa9d7439f72d716938e96618eab519fd6ff81cdad4a509898113c04f337522f23a960 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 diff --git a/dev-vcs/mercurial/mercurial-4.3.2.ebuild b/dev-vcs/mercurial/mercurial-4.3.2.ebuild deleted file mode 100644 index f29a2c796da8..000000000000 --- a/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/dev-vcs/mercurial/mercurial-4.4.2.ebuild b/dev-vcs/mercurial/mercurial-4.4.2.ebuild new file mode 100644 index 000000000000..f29a2c796da8 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-4.4.2.ebuild @@ -0,0 +1,134 @@ +# 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/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 84bb1e97cb7b..8ce27551f94c 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,5 +1,4 @@ AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d -AUX 70svn-gentoo.el 443 BLAKE2B b71327d8026adff36c4d8ad13366de9cf8bee5952fa2521e63f2b4c2b5af8b23ee3966c723755b70c18e39ea2fbebbb73be6a575f4a4a2d0b0567f17fa7c315a SHA512 ab105533569ec81631491da4cd29488e77ae5713b5a2190afe1576e6434202a0c36fce7674cdf17a3e1e58650efba8915fb7e31c686def3701ef82803ecf8bea AUX subversion-1.5.4-interix.patch 4375 BLAKE2B 128151248dce1a734bd60e7e2181b9de8170ebd0a83ee8dcd7419ed3e34ef3e5d324515a34dec1a54f53c863c7e11f2328d58e0c7f18a591e967462b425c426c SHA512 e63c49ae3935be14437702136175d38fac1a820ccc641eb9d94e51d89986847a408b49995c01dcfa4d45c3bf04c94134def117ff27802b3eb02a6268d6032b75 AUX subversion-1.5.6-aix-dso.patch 734 BLAKE2B b628257f7df660247d2ae34d4f10b701cded2e84826195bb2c73623ea863fcecbf85ca8c92304db6b6f9fb9e092b76e980c3bbe0254e0e653b8a0fa13938c50b SHA512 fdc7f58519ae0b68458600472352fde8dd24cc32c3563ecd74da256fc6ad32dedfda78926aa60aa72a12b68a2a9e5dd43241bc501c707bb1f0b40c9e30d1b992 AUX subversion-1.8.0-hpux-dso.patch 615 BLAKE2B c4563ecb78e3cdcd876873eeff4f491b8a493c4df25b1f55f0de0df93961bc1fe7a14559a95c74b869a4ed91f07b8fcde42eaf0d9ca060d694ac64f41e395423 SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 diff --git a/dev-vcs/subversion/files/70svn-gentoo.el b/dev-vcs/subversion/files/70svn-gentoo.el deleted file mode 100644 index e5721e2480c1..000000000000 --- a/dev-vcs/subversion/files/70svn-gentoo.el +++ /dev/null @@ -1,13 +0,0 @@ - -;;; subversion site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(and (< emacs-major-version 22) - (add-to-list 'load-path "@SITELISP@/compat")) -(add-to-list 'vc-handled-backends 'SVN) - -(defalias 'svn-examine 'svn-status) -(autoload 'svn-status "dsvn" "Run `svn status'." t) -(autoload 'svn-update "dsvn" "Run `svn update'." t) -(autoload 'svn-status "psvn" - "Examine the status of Subversion working copy in directory DIR." t) -- cgit v1.2.3