From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- dev-vcs/Manifest.gz | Bin 13780 -> 13789 bytes dev-vcs/gitolite/Manifest | 6 +- dev-vcs/gitolite/gitolite-3.6.11.ebuild | 102 ++++ dev-vcs/gitolite/gitolite-3.6.3.ebuild | 96 ---- dev-vcs/gitolite/gitolite-3.6.ebuild | 82 ---- dev-vcs/hg-git/Manifest | 4 +- .../hg-git/files/hg-git-0.8.10-hg45-memctx.patch | 43 -- .../files/hg-git-0.8.10-hg45-memfilectx.patch | 73 --- dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch | 219 +++++++++ dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild | 28 ++ dev-vcs/hub/Manifest | 3 + dev-vcs/hub/hub-2.7.0.ebuild | 48 ++ dev-vcs/mercurial/Manifest | 6 +- dev-vcs/mercurial/mercurial-4.7.2.ebuild | 4 +- dev-vcs/mercurial/mercurial-4.8.1.ebuild | 4 +- dev-vcs/mercurial/mercurial-4.8.2.ebuild | 145 ++++++ dev-vcs/subversion/Manifest | 4 +- dev-vcs/subversion/subversion-1.10.2.ebuild | 527 --------------------- dev-vcs/subversion/subversion-1.11.1.ebuild | 527 +++++++++++++++++++++ 19 files changed, 1086 insertions(+), 835 deletions(-) create mode 100644 dev-vcs/gitolite/gitolite-3.6.11.ebuild delete mode 100644 dev-vcs/gitolite/gitolite-3.6.3.ebuild delete mode 100644 dev-vcs/gitolite/gitolite-3.6.ebuild delete mode 100644 dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch delete mode 100644 dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch create mode 100644 dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch create mode 100644 dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild create mode 100644 dev-vcs/hub/hub-2.7.0.ebuild create mode 100644 dev-vcs/mercurial/mercurial-4.8.2.ebuild delete mode 100644 dev-vcs/subversion/subversion-1.10.2.ebuild create mode 100644 dev-vcs/subversion/subversion-1.11.1.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index a80a1fcc5fff..0045af61b512 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest index 510dcd7e5258..3ca55592bfb1 100644 --- a/dev-vcs/gitolite/Manifest +++ b/dev-vcs/gitolite/Manifest @@ -1,17 +1,15 @@ AUX gitolite-3.6.6-fix-shebang.patch 731 BLAKE2B 2e3bd0dbf56c955587dfc6a446ea2397875a0f9051e69ed891e9b630441407846f65bb2583999bb9f1c94693410d4bdd81e314da42e22ba978cb72af89968482 SHA512 dfffd0a7ef37e01edc690bba13f39edb4a751684addc1cfae8248c59fe48a59e51232ba21a1a9f1056756dcd6b51f04375f6652085f2dccad1f55073751bc105 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee DIST gitolite-3.6.10.tar.gz 198151 BLAKE2B 492732f92594871ac834ebd60eb24d7d6a07bcc1c66e35ef0963113d89a3e92204937c9c19342658eafe6a645fbaad3f0b830184b77f0298e5ab1422783f0a8e SHA512 a17fcc4922abdf3a03ebf83cae94501d142ad22cbf3ed3bdeb4b382d5e545a6b94fc3d33e402594565e29436ab5f54e498a285b4c1c814f8c475f9b1dcb5463d -DIST gitolite-3.6.3.tar.gz 174689 BLAKE2B bf58c4991d4bb9b578b983854dcd5011d55f05515a13781910327bd07aa00ab7426367f5c084341326742796266f5648ce5470dec5247b74bc850f5cfa327c93 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362 +DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212 DIST gitolite-3.6.6.tar.gz 183469 BLAKE2B 91b1b04820f8abe427c7d6a81131a9fce1ff3df8d06c3f1d7515ead91b654048ef24b391fc28f2fe9c6dd0e502e24064a55b5fee8c1da34e3d07974c8f203c26 SHA512 1529330ed2afa315fcb650c55d515e5d4b61921f46b4d763a759537434492959f100d2219ab7673e568d46f397a25a45d4388fe3827ea988333fc8719820f8bc DIST gitolite-3.6.7.tar.gz 186298 BLAKE2B 32ccedce5cfe877d69f66ccc354300b1b363de0ac16bf8ec6d97010441d1e5a95e63252c833604d7e4e5b90dd4d84b4e262ee5ed092df80631e7478500e3da97 SHA512 d22bf5c34834f82df771e6d4527496a302da312f7f78dfe81c1284f5a1ea05de90ec217e03e94918d69a006a72fa16dc0006b1f555826ad6183d9dce2dd9d425 DIST gitolite-3.6.8.tar.gz 197551 BLAKE2B 9788c06885fc7fc8edf422080628f465b33dea2aec8090daf330206041e4776bbae7189b343fc604b0959be556a15016d656b4df133f784d55bc7a6b701ad8ef SHA512 f65d4e4354079f868c9f9a943efb84ad4e29f96c69a3792c13dda383dac0133baa3d93925967c6be71e923b27e0ad91b57b5f1245cf64eeec0f0b719cbda4270 -DIST gitolite-3.6.tar.gz 156481 BLAKE2B 4cb36e631c458c529d51689bb9612ede34b352d523b62afefed70ab90fadbda1c1d954400c5ddf407ef57a3df8371814c73fdcc526bf3750dad9bfa10f1e7747 SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4 EBUILD gitolite-3.6.10.ebuild 2427 BLAKE2B 7e3c7890b8943204bd93d0a70943218fbcec02376902797bb607744fc798427674b78c37a10f3792581a736b7cbeacc51d85cc0825972ed9affaab8100d49d65 SHA512 7846c0f2828fe01bd6b8b7b0afe3523d10b1bd725c5f8d2950499ed948fe2bdc161e27d89a12d2ab408e7ce09aa816daf7caef4965863991c13529ee25431f68 -EBUILD gitolite-3.6.3.ebuild 2350 BLAKE2B 085ed29e81b5c2914201168b94dd4d01b86dbc0bb4c221956f8ff382bade290c41a76e62d417e42cb2c03a1b220704e029240c3cce7b93d02a75e7d0aaef17b1 SHA512 c0a6ba41dc2854d273f780b4f59f9350d660e18861ea6153d4e42ae05235db16caeb10c2ae7f13a462eeb370b8e4e6879d7336949e4563d9d507848581e98d83 +EBUILD gitolite-3.6.11.ebuild 2427 BLAKE2B 673516c57ac3a47f6ef616cd905e97a79250a788df5375aa6f2f9f9bb1f224baee347643de3a18b182c509af454d0bac189b03b2c84c2fca42d66fc183baff28 SHA512 43afd5f2c92ba86dc81c1be394f36ef4534d402d400c694ac080734a9e12eddf780876c9ee0a86da0cdbe25ad3e2bbaee16d2fc52d8012394c8ebbb1b3df54e8 EBUILD gitolite-3.6.6.ebuild 2431 BLAKE2B 3d34e9ddf77bb044de9a1bd1984082e33d8f6fd6cafc71e63bf4860c2cf94e934dba75346b0648badf0637cbbe77a57c9bce5971c1e4d01c597c9d951cfe0164 SHA512 8b4cf676c8a3434e97962301be3608b7ea10b48e8b5f0f8d185b274c1d9e2bc3d6f7c046879d2b825d16bdc5d514d9c790caa6bb4922b1a1d5a5827a17858c3d EBUILD gitolite-3.6.7.ebuild 2398 BLAKE2B 864703fc35faa76894bb8a7c82dd97fe80cc5ebd02a607cab670ebf168eaf6ca97b10ca93824023da02974f5fd740002084f0d08f9eb6411c6b2082bcae16f95 SHA512 1584babccb49c0d491bc749d804bf6ff5e3c4adcb1dfdf80d04d577a076e11315ceec5989f7e9be0e410b86b450aa8637d2cca177a75216a66bcc8577a28384b EBUILD gitolite-3.6.8.ebuild 2430 BLAKE2B f383d1280a6a525da61d8b616b986264ba96ed49b9c0935ae7eaed6bd8f84987f3d4a20b4bba0a2618af1106768436c7be624edce1d62ce277b1b89e87a73f1f SHA512 7cfaa7d4b3c4a5e22995f6db00ecbfa040c440df8534f98d951d106cf332df8dae1a6dab4bcb7b9e7e171e03597fa0950987cee34c6fa887514d487832cbfeee -EBUILD gitolite-3.6.ebuild 1866 BLAKE2B cd81d9ee5108877d42a2cc3ccf3f6ae57f870838c2a11b17638e49d47ab56e6dd54c31481a226b31c8a22fb4c2d1407153d0e7b349c492831614f271a917818b SHA512 be5e90a8996a7c9f433d28e975de5d1a462fe57b134f903572069c43a373f81b6ba4253395f62b66e467a8b3de4e8036b6db37dac3dae9b1c1d4cacc94365b58 EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8 diff --git a/dev-vcs/gitolite/gitolite-3.6.11.ebuild b/dev-vcs/gitolite/gitolite-3.6.11.ebuild new file mode 100644 index 000000000000..8da763ed6c3b --- /dev/null +++ b/dev-vcs/gitolite/gitolite-3.6.11.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git" +EGIT_MASTER=master + +inherit perl-module user versionator ${SCM} + +DESCRIPTION="Highly flexible server for git directory version tracker" +HOMEPAGE="https://github.com/sitaramc/gitolite" +if [[ ${PV} != *9999 ]]; then + SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +else + SRC_URI="" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux tools" + +DEPEND="dev-lang/perl + virtual/perl-File-Path + virtual/perl-File-Temp + >=dev-vcs/git-1.6.6" +RDEPEND="${DEPEND} + !app-vim/gitolite-syntax + !dev-vcs/gitolite-gentoo + selinux? ( sec-policy/selinux-gitosis ) + dev-perl/JSON" + +PATCHES=( ) + +pkg_setup() { + enewgroup git + enewuser git -1 /bin/sh /var/lib/gitolite git +} + +src_prepare() { + default + echo $PF > src/VERSION || die +} + +src_install() { + local uexec=/usr/libexec/${PN} + + rm -rf src/lib/Gitolite/Test{,.pm} + insinto $VENDOR_LIB + doins -r src/lib/Gitolite + + dodoc README.markdown CHANGELOG + # These are meant by upstream as examples, you are strongly recommended to + # customize them for your needs. + dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh + + insinto /usr/share/vim/vimfiles + doins -r contrib/vim/* + + insopts -m0755 + insinto $uexec + doins -r src/{commands,syntactic-sugar,triggers,VREF}/ + doins -r contrib/{commands,triggers,hooks} + + insopts -m0644 + doins src/VERSION + + exeinto $uexec + doexe src/gitolite{,-shell} + + dodir /usr/bin + for bin in gitolite{,-shell}; do + dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin} + done + + if use tools; then + dobin check-g2-compat convert-gitosis-conf + dobin contrib/utils/rc-format-v3.4 + fi + + keepdir /var/lib/gitolite + fowners git:git /var/lib/gitolite + fperms 750 /var/lib/gitolite + + fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only +} + +pkg_postinst() { + if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then + ewarn + elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!" + elog "Please read http://gitolite.com/gitolite/migr/index.html first!" + fi + + # bug 352291 + ewarn + elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)." + elog "Especially if you're migrating from gitosis." + ewarn +} diff --git a/dev-vcs/gitolite/gitolite-3.6.3.ebuild b/dev-vcs/gitolite/gitolite-3.6.3.ebuild deleted file mode 100644 index 4fc564404802..000000000000 --- a/dev-vcs/gitolite/gitolite-3.6.3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git" -EGIT_MASTER=master - -inherit perl-module user versionator ${SCM} - -DESCRIPTION="Highly flexible server for git directory version tracker" -HOMEPAGE="https://github.com/sitaramc/gitolite" -if [[ ${PV} != *9999 ]]; then - SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm x86" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux tools vim-syntax" - -DEPEND="dev-lang/perl - virtual/perl-File-Path - virtual/perl-File-Temp - >=dev-vcs/git-1.6.6" -RDEPEND="${DEPEND} - !dev-vcs/gitolite-gentoo - selinux? ( sec-policy/selinux-gitosis ) - vim-syntax? ( app-vim/gitolite-syntax ) - dev-perl/JSON" - -pkg_setup() { - enewgroup git - enewuser git -1 /bin/sh /var/lib/gitolite git -} - -src_prepare() { - echo $PF > src/VERSION -} - -src_install() { - local uexec=/usr/libexec/${PN} - - rm -rf src/lib/Gitolite/Test{,.pm} - insinto $VENDOR_LIB - doins -r src/lib/Gitolite - - dodoc README.markdown CHANGELOG - # These are meant by upstream as examples, you are strongly recommended to - # customize them for your needs. - dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh - - insopts -m0755 - insinto $uexec - doins -r src/{commands,syntactic-sugar,triggers,VREF}/ - doins -r contrib/{commands,triggers} - - insopts -m0644 - doins src/VERSION - - exeinto $uexec - doexe src/gitolite{,-shell} - - dodir /usr/bin - for bin in gitolite{,-shell}; do - dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin} - done - - if use tools; then - dobin check-g2-compat convert-gitosis-conf - dobin contrib/utils/rc-format-v3.4 - fi - - keepdir /var/lib/gitolite - fowners git:git /var/lib/gitolite - fperms 750 /var/lib/gitolite - - fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only -} - -pkg_postinst() { - if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then - ewarn - elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!" - elog "Please read http://gitolite.com/gitolite/migr/index.html first!" - fi - - # bug 352291 - ewarn - elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)." - elog "Especially if you're migrating from gitosis." - ewarn -} diff --git a/dev-vcs/gitolite/gitolite-3.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.ebuild deleted file mode 100644 index 91aadb960309..000000000000 --- a/dev-vcs/gitolite/gitolite-3.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module user versionator - -DESCRIPTION="Highly flexible server for git directory version tracker" -HOMEPAGE="https://github.com/sitaramc/gitolite" -SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="tools vim-syntax" - -DEPEND="dev-lang/perl - virtual/perl-File-Path - virtual/perl-File-Temp - >=dev-vcs/git-1.6.6" -RDEPEND="${DEPEND} - !dev-vcs/gitolite-gentoo - vim-syntax? ( app-vim/gitolite-syntax ) - dev-perl/JSON" - -pkg_setup() { - enewgroup git - enewuser git -1 /bin/sh /var/lib/gitolite git -} - -src_prepare() { - echo $PF > src/VERSION -} - -src_install() { - local uexec=/usr/libexec/${PN} - - rm -rf src/lib/Gitolite/Test{,.pm} - insinto $VENDOR_LIB - doins -r src/lib/Gitolite - - dodoc README.txt CHANGELOG - - insopts -m0755 - insinto $uexec - doins -r src/{commands,syntactic-sugar,triggers,VREF}/ - - insopts -m0644 - doins src/VERSION - - exeinto $uexec - doexe src/gitolite{,-shell} - - dodir /usr/bin - for bin in gitolite{,-shell}; do - dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin} - done - - if use tools; then - dobin check-g2-compat convert-gitosis-conf - fi - - keepdir /var/lib/gitolite - fowners git:git /var/lib/gitolite - fperms 750 /var/lib/gitolite - - fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only -} - -pkg_postinst() { - if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then - ewarn - elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!" - elog "Please read http://gitolite.com/gitolite/migr/index.html first!" - fi - - # bug 352291 - ewarn - elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)." - elog "Especially if you're migrating from gitosis." - ewarn -} diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest index aa1af8360bb8..54a4f5064dfa 100644 --- a/dev-vcs/hg-git/Manifest +++ b/dev-vcs/hg-git/Manifest @@ -1,9 +1,9 @@ -AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be -AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9 +AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619 DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655 DIST hg-git-0.8.12.tar.gz 124456 BLAKE2B 31a899ba1f2e0de861d81e7ff5fac9f82e9c08813b77fa8a4da3aeae590d7e8cb6c37abb80ebe34a80835c210f10145df7429685cb71ffab7bfe8d5a628d3d12 SHA512 77af45c8f35febe354382ee043be7f0f2c53e1ac7ae331a7068a0e117ed0f54adaa7c7f5127e247e089c9204b9130dde286aa887997b7ab7ede48f447797608e DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123 +EBUILD hg-git-0.8.12-r1.ebuild 750 BLAKE2B b8e1005953ae97583fabbcd3c72e0e732fe76abd3c089aecd3f9590f809253dfca1b694c14cfc51e5867f7beca5e9bcba3202399610bdf1df422ac57fb48a395 SHA512 aad9af3857bbc577d54af072c0913183a9eeaf2bf1e2846e773273cf6adf53ca5a170630d98786887d1d4d11357edfc9f6c7f65a9d88dbcd80c7ff2191787344 EBUILD hg-git-0.8.12.ebuild 704 BLAKE2B 67f021ab754992b636235ffd2ad7dd43dca05ea63096764f4e63e77ea683b6a6ab057b6581300fb38f95d2dab3a7425a7694b9ea2e24146f38be240400303de8 SHA512 a23762cace05828e78628187a6fd4c34acb6d2a9b9ae9889005d209560fe36af792b8d81eda6e831a97b509c22378e966aaec7153408cf1d07234bdbaed5cac9 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09 diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch deleted file mode 100644 index ff9d4d66d15f..000000000000 --- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Tony Tung -# Date 1517901695 28800 -# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3 -# Parent 6dc827703bfb995b89b0da5b2e9eaffe3479ea45 -compat: pass memctx to memfilectx constructor on hg 4.5+ - -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -985,16 +985,22 @@ - if copied: - copied_path = copied[0] - -- try: -- return context.memfilectx(self.repo, f, data, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -- except TypeError: -- return context.memfilectx(f, data, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -+ # Different versions of mercurial have different parameters to -+ # memfilectx. Try them from newest to oldest. -+ args_to_try = ( -+ (self.repo, memctx, f, data), # hg 4.5+ -+ (self.repo, f, data), # hg 3.1 - 4.5 -+ (f, data), # hg < 3.1 -+ ) -+ for args in args_to_try: -+ try: -+ return context.memfilectx(*args, -+ islink='l' in e, -+ isexec='x' in e, -+ copied=copied_path) -+ except TypeError as ex: -+ last_ex = ex -+ raise last_ex - - p1, p2 = (nullid, nullid) - octopus = False diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch deleted file mode 100644 index 5c94617f881b..000000000000 --- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# User Kevin Bullock -# Date 1517928348 21600 -# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a -# Parent 89303af1c4aa76b37e6d16f99f6279012eda7100 -compat: extract function for memfilectx signature variants - -diff --git a/hggit/compat.py b/hggit/compat.py ---- a/hggit/compat.py -+++ b/hggit/compat.py -@@ -1,4 +1,5 @@ - from mercurial import ( -+ context, - url, - util as hgutil, - ) -@@ -96,6 +97,26 @@ - return refs, set(server_capabilities) - - -+def memfilectx(repo, changectx, path, data, islink=False, -+ isexec=False, copied=None): -+ # Different versions of mercurial have different parameters to -+ # memfilectx. Try them from newest to oldest. -+ args_to_try = ( -+ (repo, changectx, path, data), # hg 4.5+ -+ (repo, path, data), # hg 3.1 - 4.5 -+ (path, data), # hg < 3.1 -+ ) -+ for args in args_to_try: -+ try: -+ return context.memfilectx(*args, -+ islink=islink, -+ isexec=isexec, -+ copied=copied) -+ except TypeError as ex: -+ last_ex = ex -+ raise last_ex -+ -+ - CONFIG_DEFAULTS = { - 'git': { - 'authors': None, -diff --git a/hggit/git_handler.py b/hggit/git_handler.py ---- a/hggit/git_handler.py -+++ b/hggit/git_handler.py -@@ -985,22 +985,10 @@ - if copied: - copied_path = copied[0] - -- # Different versions of mercurial have different parameters to -- # memfilectx. Try them from newest to oldest. -- args_to_try = ( -- (self.repo, memctx, f, data), # hg 4.5+ -- (self.repo, f, data), # hg 3.1 - 4.5 -- (f, data), # hg < 3.1 -- ) -- for args in args_to_try: -- try: -- return context.memfilectx(*args, -- islink='l' in e, -- isexec='x' in e, -- copied=copied_path) -- except TypeError as ex: -- last_ex = ex -- raise last_ex -+ return compat.memfilectx(self.repo, memctx, f, data, -+ islink='l' in e, -+ isexec='x' in e, -+ copied=copied_path) - - p1, p2 = (nullid, nullid) - octopus = False diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch new file mode 100644 index 000000000000..c456ce53c740 --- /dev/null +++ b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch @@ -0,0 +1,219 @@ +https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw +https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw +https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw + +# HG changeset patch +# User Alain Leufroy +# Date 1541695757 -3600 +# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e +# Parent 6ae26ba7b928019e48dd1c73358c18d6dd2d86f3 +compat: fix for hg 4.8 + +089fc0db0954 introduced a new `createopts` parameter. + +`hggit` does not support repository creation, so we can just ignore +it. + +diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py +--- a/hggit/gitrepo.py ++++ b/hggit/gitrepo.py +@@ -13,7 +13,7 @@ + + + class gitrepo(peerrepository): +- def __init__(self, ui, path, create, intents=None): ++ def __init__(self, ui, path, create, intents=None, **kwargs): + if create: # pragma: no cover + raise error.Abort('Cannot create a git repository.') + self._ui = ui + +# HG changeset patch +# User Kevin Bullock +# Date 1543713965 21600 +# Node ID 143b7511eadbea7507d847c805241a6db290ffe7 +# Parent ae6b1ba7482963bc9de51f299891e99005794e4e +compat: glob some verify output that changed in hg 4.8 + +diff --git a/tests/test-push-r.t b/tests/test-push-r.t +--- a/tests/test-push-r.t ++++ b/tests/test-push-r.t +@@ -64,7 +64,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 1 changesets, 1 total revisions ++ *1 changesets* (glob) + pushing to test-1 + searching for changes + adding changesets +@@ -75,7 +75,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 2 changesets, 2 total revisions ++ *2 changesets* (glob) + pushing to test-2 + searching for changes + adding changesets +@@ -86,7 +86,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 3 changesets, 3 total revisions ++ *3 changesets* (glob) + pushing to test-3 + searching for changes + adding changesets +@@ -97,7 +97,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 4 changesets, 4 total revisions ++ *4 changesets* (glob) + pushing to test-4 + searching for changes + adding changesets +@@ -108,7 +108,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 2 changesets, 2 total revisions ++ *2 changesets* (glob) + pushing to test-5 + searching for changes + adding changesets +@@ -119,7 +119,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 1 files, 3 changesets, 3 total revisions ++ *3 changesets* (glob) + pushing to test-6 + searching for changes + adding changesets +@@ -130,7 +130,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 2 files, 4 changesets, 5 total revisions ++ *4 changesets* (glob) + pushing to test-7 + searching for changes + adding changesets +@@ -141,7 +141,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 3 files, 5 changesets, 6 total revisions ++ *5 changesets* (glob) + pushing to test-8 + searching for changes + adding changesets +@@ -152,7 +152,7 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 2 files, 5 changesets, 5 total revisions ++ *5 changesets* (glob) + $ cd test-8 + $ hg pull ../test-7 + pulling from ../test-7 +@@ -168,4 +168,4 @@ + checking manifests + crosschecking files in changesets and manifests + checking files +- 4 files, 9 changesets, 7 total revisions ++ *9 changesets* (glob) + +# HG changeset patch +# User Kevin Bullock +# Date 1543713996 21600 +# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6 +# Parent 143b7511eadbea7507d847c805241a6db290ffe7 +compat: update how we register gitnode template keyword + +diff --git a/hggit/__init__.py b/hggit/__init__.py +--- a/hggit/__init__.py ++++ b/hggit/__init__.py +@@ -94,9 +94,11 @@ + command = registrar.command(cmdtable) + configitem = registrar.configitem(configtable) + compat.registerconfigs(configitem) ++ templatekeyword = registrar.templatekeyword() + + except (ImportError, AttributeError): + command = cmdutil.command(cmdtable) ++ templatekeyword = compat.templatekeyword() + + # support for `hg clone git://github.com/defunkt/facebox.git` + # also hg clone git+ssh://git@github.com/schacon/simplegit.git +@@ -207,7 +209,6 @@ + + + def extsetup(ui): +- templatekw.keywords.update({'gitnode': gitnodekw}) + revset.symbols.update({ + 'fromgit': revset_fromgit, 'gitnode': revset_gitnode + }) +@@ -455,12 +456,30 @@ + raise LookupError(rev, git.map_file, _('ambiguous identifier')) + + +-def gitnodekw(**args): +- """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal +-digit string.""" +- node = args['ctx'] +- repo = args['repo'] ++def _gitnodekw(node, repo): + gitnode = repo.githandler.map_git_get(node.hex()) + if gitnode is None: + gitnode = '' + return gitnode ++ ++ ++if (hgutil.safehasattr(templatekw, 'templatekeyword') and ++ hgutil.safehasattr(templatekw.templatekeyword._table['node'], ++ '_requires')): ++ @templatekeyword('gitnode', requires={'ctx', 'repo'}) ++ def gitnodekw(context, mapping): ++ """:gitnode: String. The Git changeset identification hash, as a ++ 40 hexadecimal digit string.""" ++ node = context.resource(mapping, 'ctx') ++ repo = context.resource(mapping, 'repo') ++ return _gitnodekw(node, repo) ++ ++else: ++ # COMPAT: hg < 4.6 - templatekeyword API changed ++ @templatekeyword('gitnode') ++ def gitnodekw(**args): ++ """:gitnode: String. The Git changeset identification hash, as a ++ 40 hexadecimal digit string.""" ++ node = args['ctx'] ++ repo = args['repo'] ++ return _gitnodekw(node, repo) +diff --git a/hggit/compat.py b/hggit/compat.py +--- a/hggit/compat.py ++++ b/hggit/compat.py +@@ -2,6 +2,7 @@ + bookmarks, + context, + phases, ++ templatekw, + url, + util as hgutil, + ) +@@ -192,3 +193,14 @@ + if hasconfigitems: + return getconfig(section, item) + return getconfig(section, item, CONFIG_DEFAULTS[section][item]) ++ ++ ++class templatekeyword(object): ++ def __init__(self): ++ self._table = {} ++ ++ def __call__(self, name): ++ def decorate(func): ++ templatekw.keywords.update({name: func}) ++ return func ++ return decorate diff --git a/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild new file mode 100644 index 000000000000..e5711f08ff40 --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild @@ -0,0 +1,28 @@ +# 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="push to and pull from a Git repository using Mercurial" +HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + >=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}] + >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}"/${P}-hg-4.8.patch +) diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest index 7a18853e4dcc..5dd247913024 100644 --- a/dev-vcs/hub/Manifest +++ b/dev-vcs/hub/Manifest @@ -1,6 +1,9 @@ DIST hub-2.2.9.tar.gz 318275 BLAKE2B 731c3bb4cc4d92082f93bba94a5cc7ba31fc436479655fa19ffa8078416cedd814d2667589af9d6eed59a0be0c8b38963779429838d8dbaab8a628f838a5915c SHA512 69d69683eb5f1c881b15c9b3294878c35edc51f9b7d568a3e0609c3d77cebf5c1be5c7c018b0356bdd68cf3f56691a860381a53f3e016b28b9f95ab0b852d9f9 DIST hub-2.6.1.tar.gz 994752 BLAKE2B 956f497699ecaac996fd3a92e5f7042d8e72050077e1de3b6091fe5e2481d9b8e4c46a8e34a2a95a81079b22b87bf82e2a5adf412e4dfbcbc53bf92f8b7ba2fa SHA512 a3aed611455de88a5b410887717aeb28b8837a74b437848c53903ccc809e758678643471ee7b14903ee147417754b0d443aede63e4f69a0e4b252c6a5ab619e3 +DIST hub-2.7.0.tar.gz 997861 BLAKE2B b3ab44f8107d2613af230dc9e26cef2c87c9a8f114a044bbf4d62803fb31328a53425387bc865affbb95302ec0d6364f5c3e6823dae46ef2b322812916426534 SHA512 77223b0860bac42195dfc43e9164f5da446e414e32d0d3caa931f30e5b06d6f65cd69caa2f5097285a91d2ddb48265dfedec9dd8b361417556ff38782fa1a17c DIST hub-linux-amd64-2.6.1.tgz 4242259 BLAKE2B b68234050982999f103281da974af9c008e85920c0821ecb5582bf97b0a4889f6dd053ab3e6c7c5a0e18d1b09c7093f69d70f46b94254e51b2e6eb217fe3f479 SHA512 e27d9b8037e50b924b7ef663d9f68568f2732ed28e366aa300881eeeb6a2bdd1f50b4e597e3d36eddb07eb9c133df02ab5f889d5c6ec8632824d244148524e9b +DIST hub-linux-amd64-2.7.0.tgz 4263315 BLAKE2B e157acb727c8e4a118cc29ff5a433a820aeba5f92b10446440611056e8d8dc3bd534823983cf37aba818f224d36bfba3109d236b409e68592ed04f6b22aa450b SHA512 dd48991dfbb48e6759805707ed34804a77b64e55fd56f17484c13ddc6b2a867c283305308991e462f338a4bab687cb89da42d5059193fad5825ef681b89eeb97 EBUILD hub-2.2.9.ebuild 905 BLAKE2B f71ee495cb55cf5a7f64f643f7a8e79a9604f4b7dffeb94226bf3feda1759667e5d93d645239c6ad3a97e3ea2ab1c75be2d3e1aeddda59e400199ec7e37d0208 SHA512 51c336022318210fe0a37615f92f61842da7a2d4d76005c61d5b86ebdc5f0f44dbf47874f2811f6f7870cd592bf118545c48c7e32c02a11dfcd40c26050e45dd EBUILD hub-2.6.1.ebuild 1097 BLAKE2B 4a3b7f95555f8c5ba8738fc819d2127dde609fb76e2be44d20c38cc316e62a7b30f2363cd7a670b9a92141674d83d9c18ae428538586a731483c8205f97526ad SHA512 b1b9ed74f46176faf65d64c0e69cde33419b2db3a52d9e64d075eaa982f43da44a9fd9fc4b326c0eb896065bb6e04e2848845876de9d5e41adf8720f51088c66 +EBUILD hub-2.7.0.ebuild 1097 BLAKE2B 15ace40d08118382357876dde83a5d77eb9b7f9ced783a5b4d46d50d886e940f18ee90a80bf655510bd373debb21be45d4d7ceee38ff56b9ae47f0b4b36a21f0 SHA512 43d44b346859260cd772c7381a1c57444ae88c393ebeec4805df18fd9769a3ca49545c0d1dacfc5080a148ad9595965306d616e8466fbf5f8ff8797a5936fccc MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a diff --git a/dev-vcs/hub/hub-2.7.0.ebuild b/dev-vcs/hub/hub-2.7.0.ebuild new file mode 100644 index 000000000000..26f16bf1dcaf --- /dev/null +++ b/dev-vcs/hub/hub-2.7.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN=github.com/github/hub +inherit bash-completion-r1 + +DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" +HOMEPAGE="https://github.com/github/hub" +SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://${EGO_PN}/releases/download/v${PV}/${PN}-linux-amd64-${PV}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND=">=dev-lang/go-1.5.1:=" +RDEPEND=">=dev-vcs/git-1.7.3" + +QA_FLAGS_IGNORED=".*" +RESTRICT="strip" + +src_prepare() { + mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed" + ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed" + default +} + +src_compile() { + ./script/build -o bin/${PN} || die +} + +#src_test() { +# ./script/test || die +#} + +src_install() { + dobin bin/${PN} + dodoc README.md + doman ../${PN}-linux-amd64-${PV}/share/man/man1/*.1 + + newbashcomp etc/${PN}.bash_completion.sh ${PN} + + insinto /usr/share/zsh/site-functions + newins etc/hub.zsh_completion _${PN} +} diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 7770ba2df4a3..8dbf1262ed07 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -7,11 +7,13 @@ DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5c DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9ac15aef21284337924d13bd5b4b14684d729149c4b48bf8fde13679cf661d92da968943c3f04ea065729df42318c SHA512 04d3f97dd4a0f36c6f6d639d8eccc7e4f29b2dc211fa69e7fc17dae0eb954f2ddaaf04f70facc6b968a166db7c07ed80792575d7a27e80bc0c1a43fc38b5e536 DIST mercurial-4.7.2.tar.gz 6481684 BLAKE2B 1006e541b52148f44b14767a738f4add4d03c719bc6f96f3f245f6bfd401223b1e7444216304fba749b88611cd031cb14089d9938a5533477160226286dd401d SHA512 e8742e9555a6b57e96e61091757b4bcb574605c49082874bd4edb9114a70e5cb024c1360a75c24f1a9ae3bca3205316e6a264ae18d3c9946248bc1d2b042ad43 DIST mercurial-4.8.1.tar.gz 6869733 BLAKE2B 754be4e004af2b62e7ea2cbb1bbe27d4c0f03039e9c4db5ac5e734cb2b13002d7d68a1e2794e2478ce49302f6cb90976bb43bca56a8db7b05eb4ead93a3a46de SHA512 a4485c22f9bb0bb752bf42941f613cb3542c66cbec5d7d49be2090ac544f5dca0f476e4535a56e3f4f4f5fc02fb12739e6d1c7b407264fc2ba4b19b0230b9f93 +DIST mercurial-4.8.2.tar.gz 6870985 BLAKE2B 822cbfd09b299870b02b7e181c216557d4dcbb60abcb34a95d22b457f130ff2c84c4f85291b6cd4b0314acd9061ec0d416c96821c2daa8627cd7740965944103 SHA512 1010f20ea5ed081f2d5c58e97696027b2d06dd0471b39e88a1858d5409bcf59f2ccf360925c417495834fccba06e1525ae70894233164d617227814ca2277e20 EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c980435363597625402a0e67afdc10d55cc4477ca85dea764d860cecdb8bd68ee13afc66cf6203ae96f1a3b5363b93e0e74 SHA512 766576864da5700f107a530f1a06fbf33d1d593597ad236ad841d3ba59774c4aedf3e43dda00a86b1894f99c03f7af228d8026363d81a2c3b0b8ab98f22c246a EBUILD mercurial-4.6.2.ebuild 3537 BLAKE2B 7f4c2e4c579ab768dd629d53b2fdf1062980405242376c727b05a8a474d6bc8afb4db0f82e22252dde24b6909f9ab87d8650ed73600e6dc01ae4ef2fdcfc71cd SHA512 1549175116f2496ae8bac35360b142c9ae95d458b764496648eeb9165fd79fd030bfcb0386df61a568a7d8536f8e846a9b127f22fe2937ccac5982135e89cf14 EBUILD mercurial-4.7.1-r1.ebuild 3657 BLAKE2B eab6f75f156f93bf2a23294d9edb267d58d4eab27f9f6f1643c10d2c3a440e814eb5a312b22231168ae1620b69bccc69a161bcd72e76ab3e630558a4495591fc SHA512 f9f33c0cf074f324e37f881b36b435d6cffb2adf1e3499a9f6d0400b16d26251e5a72a3f1120e2f605f798312617e2f429c05c2bd08f6f0cad2be2b3b81f4f6e EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 -EBUILD mercurial-4.7.2.ebuild 3765 BLAKE2B 9137eb5e7fee6a5a3d10ef6839fa8277f83cebb0013599d6688aeb4c56dcc76ab3d80ab91c48a19e82d31dd74bbee26c70d30928293257b2792955f4e46e948e SHA512 a12be602080e091e040f7cae1226faaebc46ff041d0c59b6b9cdd7cd6456d8168c02914411bfe888c746acebd5112237f93ea2c7c3bd6da70cd8923f7f240a67 -EBUILD mercurial-4.8.1.ebuild 3748 BLAKE2B a9e476bb253026addb579d44755d3b2719748b1ef5742ef3764bcff0a26476882b44a458604417d6a9e72ca4f47cff8d270faef1df0c28215a8d6f09115d42af SHA512 92f1e46ab7f51c41efe0da8b5a4eab6016f6983e3f63477a14cf8431fd7a75d6f6ec673bff5f3c3c8aa55a923c78c964f36bb01e155db88a63bde9fffa97f2e5 +EBUILD mercurial-4.7.2.ebuild 3777 BLAKE2B 0486c40021180ab5619bff696fe3d009e148ce172683ca85e7a5fb8bb18f0a34658a2e923ba9f806f76532084739b3ac867f1e4e20895f6770d8f84280fa5ead SHA512 f196ec182293cd8645f91fd12f4f968f80f9066df5e843db1e10c1336554311d4011846ca4a69f5f3b5918e79905d3a25b2fdfa87ad0ef0df1a8a2cc6a0e4216 +EBUILD mercurial-4.8.1.ebuild 3760 BLAKE2B 89cfaff42a3b994ef9bb6e0cd708af09ff7c44d158efb3d3b1fd6926951fed1dee624df3c8ce2abd30d2cc6a4d541b1f2806428ec3d5ce6b5e7cc29f8e95cce8 SHA512 fcfce4e0af0c59b0df7c700552825c3339e459cb42dee31259cf5cde2cc2de28fa106d98add4a09c7c95418f582bb55429e21502ae04417dde0898acf1bfa712 +EBUILD mercurial-4.8.2.ebuild 3760 BLAKE2B 89cfaff42a3b994ef9bb6e0cd708af09ff7c44d158efb3d3b1fd6926951fed1dee624df3c8ce2abd30d2cc6a4d541b1f2806428ec3d5ce6b5e7cc29f8e95cce8 SHA512 fcfce4e0af0c59b0df7c700552825c3339e459cb42dee31259cf5cde2cc2de28fa106d98add4a09c7c95418f582bb55429e21502ae04417dde0898acf1bfa712 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.7.2.ebuild b/dev-vcs/mercurial/mercurial-4.7.2.ebuild index 03aa5b03efb2..59b7732b6546 100644 --- a/dev-vcs/mercurial/mercurial-4.7.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.7.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 @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~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 ~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 diff --git a/dev-vcs/mercurial/mercurial-4.8.1.ebuild b/dev-vcs/mercurial/mercurial-4.8.1.ebuild index db363dc02c1d..c2da7946346c 100644 --- a/dev-vcs/mercurial/mercurial-4.8.1.ebuild +++ b/dev-vcs/mercurial/mercurial-4.8.1.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=7 @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~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 ~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 diff --git a/dev-vcs/mercurial/mercurial-4.8.2.ebuild b/dev-vcs/mercurial/mercurial-4.8.2.ebuild new file mode 100644 index 000000000000..c2da7946346c --- /dev/null +++ b/dev-vcs/mercurial/mercurial-4.8.2.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~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 + dev-python/zstandard[${PYTHON_USEDEP}] + bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk )" + +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" + "${FILESDIR}/${PN}-4.8.1-unbundle_zstd.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 + + # Don't use bundled zstandard (#666972) + rm -r contrib/python-zstandard || 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 || 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 plan9 *.el ) + 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" + + # symlink to system zstd + local sitedir=$(python_get_sitedir) + dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so +} + +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 242690991d11..2f172672f953 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -4,13 +4,13 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 -DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129 DIST subversion-1.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 +DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d 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.2.ebuild 15350 BLAKE2B 8299e54f27b9fd44822c32f6be3b6da4fff7b5714b10a794b61479cd4be50ce2ec38c2f480feda0b9a6e6e3fec85c4bef83e31d3588d2c07f69f062cfda2c94a SHA512 cbf3211d203f9b69c841315e7d1043b3a7c76a6a608cf3f17f163e362d316dac3cec93aac71f8a97c6b7aacd420d5e6224937b3acbf1df589412c1cefa020bed EBUILD subversion-1.10.3.ebuild 15342 BLAKE2B 0326b66d9bb6a5fb989a08d72dfca1348c14ccb9413c2590c1fd5177d46964d731eef143c95b217b7c0b4cb3a86736bb814ea357b4d05b7bb07445c57307710f SHA512 df833c808d33415fe18dd8b94968278e8b40201ce00acc202f9e9e5dfef36f4818ce684534843400770587db9001b9a1253ce901f2eaf7f2118297142345b6ec EBUILD subversion-1.11.0.ebuild 15335 BLAKE2B 1a370f57d9da2f53cc892f3656d1c15a9f2ca283e6e468d36af908262a2d979e37297b2684a48662221bb5fb3edf59a70583636693b6b4789b206b4983ec91d3 SHA512 42f0e36713135baa87380083395127f9d29d003384882276b27e1b8fedfa5452eb0d067763975a53b3a7ee583fa6e0e67cdd5a79706aa542a7004934a00680e7 +EBUILD subversion-1.11.1.ebuild 15335 BLAKE2B d90a9d6f6cc38edc3679c269d8f03da6cba1f529b2e7e37a06123c8610d9051e87f23871ff4667963b42778c32d7fecac6576c966c8fcbcffc06741ae94c26ad SHA512 87270e8d071a6995d308b21deb86f936aca09531b4fb8590cb222c641ace7ed4d49e36d563113d3b74da7179c0b8ddfdc4fa2d0ea553fd91fe95eba9efca47dc EBUILD subversion-1.9.7-r1.ebuild 15804 BLAKE2B 1231e2ab2ba1b776ef43f3b543b57ff127cf59c52a3eb42e131789b2493388aa93f17f2d9760f110081c86a464dc559cce580ffd1641c146086a426bfe09b623 SHA512 bf0969059cb64b5ddea51c7423e5a8177b5e7ba4a821014799b933eb01f0d10f84d498cb11affd218009fc4e4721aa10f69a8e03dc61aabbfda373511bd143a3 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313 diff --git a/dev-vcs/subversion/subversion-1.10.2.ebuild b/dev-vcs/subversion/subversion-1.10.2.ebuild deleted file mode 100644 index 6ee1436600be..000000000000 --- a/dev-vcs/subversion/subversion-1.10.2.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby25 ruby24 ruby23" -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single xdg-utils - -MY_P="${P/_/-}" -DESCRIPTION="Advanced version control system" -HOMEPAGE="https://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion GPL-2" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -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=" - app-arch/bzip2 - app-arch/lz4 - >=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - dev-libs/libutf8proc:= - sys-apps/file - sys-libs/zlib - berkdb? ( >=sys-libs/db-4.0.14:= ) - ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( - dev-libs/glib:2 - gnome-base/libgnome-keyring - sys-apps/dbus - ) - http? ( >=net-libs/serf-1.3.4 ) - kwallet? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kwallet:5 - sys-apps/dbus - ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - ruby? ( ${RUBY_DEPS} ) - sasl? ( dev-libs/cyrus-sasl )" -RDEPEND="${COMMON_DEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - !!=virtual/jdk-1.5 ) - kwallet? ( - kde-frameworks/kdelibs4support:5 - virtual/pkgconfig - ) - nls? ( sys-devel/gettext ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - test? ( ${PYTHON_DEPS} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -want_apache - -pkg_setup() { - if use berkdb ; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]] ; then - if [[ -n "${apu_bdb_version}" ]] ; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" - fi - fi - - depend.apache_pkg_setup - - java-pkg-opt-2_pkg_setup - - if ! use http ; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling \"http\" USE flag" - echo -ne "\a" - fi - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" - - if use ruby ; then - local rbslot - RB_VER="" - for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do - if has_version dev-lang/ruby:${rbslot} ; then - RB_VER="${rbslot/.}" - break - fi - done - [[ -z "${RB_VER}" ]] && die "No useable ruby version found" - fi -} - -src_prepare() { - eapply "${WORKDIR}/patches" - eapply_user - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" - - if use python ; then - # XXX: make python_copy_sources accept path - S=${S}/subversion/bindings/swig/python python_copy_sources - rm -r "${S}"/subversion/bindings/swig/python || die - fi - - xdg_environment_reset -} - -src_configure() { - local myconf=( - --libdir="${EPREFIX%/}/usr/$(get_libdir)" - $(use_with apache2 apache-libexecdir) - $(use_with apache2 apxs "${APXS}") - $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") - $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") - $(use_enable dso runtime-module-search) - $(use_with gnome-keyring) - $(use_enable java javahl) - $(use_with java jdk "${JAVA_HOME}") - $(use_with kwallet) - $(use_enable nls) - $(use_with sasl) - $(use_with http serf) - --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" - --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" - --disable-experimental-libtool - --without-jikes - --disable-mod-activation - --disable-static - ) - - if use python || use perl || use ruby; then - myconf+=( --with-swig ) - else - myconf+=( --without-swig ) - fi - - if use java ; then - myconf+=( --without-junit ) - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-cygwin*) - # no LD_PRELOAD support, no undefined symbols - myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=( --disable-local-library-preloading ) - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=( --disable-local-library-preloading ) - ;; - *-mint*) - myconf+=( --enable-all-static --disable-local-library-preloading ) - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=( --enable-local-library-preloading ) - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=( --disable-disallowing-of-undefined-references ) - - # for build-time scripts - if use ctypes-python || use python || use test; then - python_setup - fi - - if use python && [[ ${CHOST} == *-darwin* ]] ; then - export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_compile="$(tc-getCC)" - fi - - # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ - ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf "${myconf[@]}" -} - -src_compile() { - emake local-all - - if use ctypes-python ; then - # pre-generate .py files - use ctypes-python && emake ctypes-python - - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi - - if use python ; then - swig_py_compile() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - python_export PYTHON_INCLUDEDIR - emake swig-py \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" - } - - # this will give us proper BUILD_DIR for symlinking - BUILD_DIR=python \ - python_foreach_impl swig_py_compile - fi - - if use perl ; then - emake swig-pl - fi - - if use ruby ; then - emake swig-rb - fi - - if use java ; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl - fi - - if use extras ; then - emake tools - fi - - if use doc ; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl - fi - fi -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - default - - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } - - distutils-r1_src_test - fi - - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } - - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test - fi - else - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" - ewarn "before running the test suite." - ewarn "Test suite skipped." - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install - - if use ctypes-python ; then - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - if use python ; then - swig_py_install() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - emake \ - DESTDIR="${D}" \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" \ - install-swig-py - } - - BUILD_DIR=python \ - python_foreach_impl swig_py_install - fi - - if use perl ; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - perl_delete_localpod - find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die - fi - - if use ruby ; then - emake DESTDIR="${D}" install-swig-rb - fi - - if use java ; then - emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) - java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar - fi - - # Install Apache module configuration. - if use apache2 ; then - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion svn - bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd3 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - if ! use apache2 ; then - sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED%/}"/etc/init.d/svnserve || die - sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED%/}"/etc/xinetd.d/svnserve || die - fi - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras ; then - cat <<- EOF > 80subversion-extras - PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" - ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" - EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - - find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die - doins -r tools - fi - - if use doc ; then - docinto html - dodoc -r doc/doxygen/html/* - - if use java ; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - prune_libtool_files --all - - cd "${ED%/}"/usr/share/locale - for i in * ; do - if [[ ${i} != *${LINGUAS}* ]] ; then - rm -r ${i} || die - fi - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -pkg_postinst() { - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -pkg_postrm() { - : -} - -pkg_config() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild new file mode 100644 index 000000000000..5b17d2b2a8c6 --- /dev/null +++ b/dev-vcs/subversion/subversion-1.11.1.ebuild @@ -0,0 +1,527 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby25 ruby24 ruby23" +DISTUTILS_OPTIONAL=1 +WANT_AUTOMAKE="none" +GENTOO_DEPEND_ON_PERL="no" + +inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils + +MY_P="${P/_/-}" +DESCRIPTION="Advanced version control system" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="Subversion GPL-2" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~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=" + app-arch/bzip2 + app-arch/lz4 + >=dev-db/sqlite-3.7.12 + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + dev-libs/expat + dev-libs/libutf8proc:= + sys-apps/file + sys-libs/zlib + berkdb? ( >=sys-libs/db-4.0.14:= ) + ctypes-python? ( ${PYTHON_DEPS} ) + gnome-keyring? ( + dev-libs/glib:2 + gnome-base/libgnome-keyring + sys-apps/dbus + ) + http? ( >=net-libs/serf-1.3.4 ) + kwallet? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwallet:5 + sys-apps/dbus + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( ${RUBY_DEPS} ) + sasl? ( dev-libs/cyrus-sasl )" +RDEPEND="${COMMON_DEPEND} + apache2? ( www-servers/apache[apache2_modules_dav] ) + java? ( >=virtual/jre-1.5 ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI )" +# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once +DEPEND="${COMMON_DEPEND} + !!=virtual/jdk-1.5 ) + kwallet? ( + kde-frameworks/kdelibs4support:5 + virtual/pkgconfig + ) + nls? ( sys-devel/gettext ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + test? ( ${PYTHON_DEPS} )" + +REQUIRED_USE=" + ctypes-python? ( ${PYTHON_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( + ${PYTHON_REQUIRED_USE} + !dso + )" + +want_apache + +pkg_setup() { + if use berkdb ; then + local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ + | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ + | sed 's:.*b::')" + einfo + if [[ -z "${SVN_BDB_VERSION}" ]] ; then + if [[ -n "${apu_bdb_version}" ]] ; then + SVN_BDB_VERSION="${apu_bdb_version}" + einfo "Matching db version to apr-util" + else + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + java-pkg-opt-2_pkg_setup + + if ! use http ; then + ewarn "WebDAV support is disabled. You need WebDAV to" + ewarn "access repositories through the HTTP protocol." + ewarn "Consider enabling \"http\" USE flag" + echo -ne "\a" + fi + + if use debug ; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ + + # Allow for custom repository locations. + SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" + + if use ruby ; then + local rbslot + RB_VER="" + for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do + if has_version dev-lang/ruby:${rbslot} ; then + RB_VER="${rbslot/.}" + break + fi + done + [[ -z "${RB_VER}" ]] && die "No useable ruby version found" + fi +} + +src_prepare() { + eapply "${WORKDIR}/patches" + eapply_user + + fperms +x build/transform_libtool_scripts.sh + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + + eautoconf + elibtoolize + + sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ + -i build-outputs.mk || die "sed failed" + + if use python ; then + # XXX: make python_copy_sources accept path + S=${S}/subversion/bindings/swig/python python_copy_sources + rm -r "${S}"/subversion/bindings/swig/python || die + fi + + xdg_environment_reset +} + +src_configure() { + local myconf=( + --libdir="${EPREFIX%/}/usr/$(get_libdir)" + $(use_with apache2 apache-libexecdir) + $(use_with apache2 apxs "${APXS}") + $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") + $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") + $(use_enable dso runtime-module-search) + $(use_with gnome-keyring) + $(use_enable java javahl) + $(use_with java jdk "${JAVA_HOME}") + $(use_with kwallet) + $(use_enable nls) + $(use_with sasl) + $(use_with http serf) + --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --disable-experimental-libtool + --without-jikes + --disable-mod-activation + --disable-static + ) + + if use python || use perl || use ruby; then + myconf+=( --with-swig ) + else + myconf+=( --without-swig ) + fi + + if use java ; then + myconf+=( --without-junit ) + fi + + case ${CHOST} in + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-cygwin*) + # no LD_PRELOAD support, no undefined symbols + myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf+=( --disable-local-library-preloading ) + ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=( --disable-local-library-preloading ) + ;; + *-mint*) + myconf+=( --enable-all-static --disable-local-library-preloading ) + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=( --enable-local-library-preloading ) + ;; + esac + + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + myconf+=( --disable-disallowing-of-undefined-references ) + + # for build-time scripts + if use ctypes-python || use python || use test; then + python_setup + fi + + if use python && [[ ${CHOST} == *-darwin* ]] ; then + export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_compile="$(tc-getCC)" + fi + + # allow overriding Python include directory + ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ + ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ + econf "${myconf[@]}" +} + +src_compile() { + emake local-all + + if use ctypes-python ; then + # pre-generate .py files + use ctypes-python && emake ctypes-python + + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi + + if use python ; then + swig_py_compile() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + python_export PYTHON_INCLUDEDIR + emake swig-py \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" + } + + # this will give us proper BUILD_DIR for symlinking + BUILD_DIR=python \ + python_foreach_impl swig_py_compile + fi + + if use perl ; then + emake swig-pl + fi + + if use ruby ; then + emake swig-rb + fi + + if use java ; then + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl + fi + + if use extras ; then + emake tools + fi + + if use doc ; then + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + + if use java; then + emake doc-javahl + fi + fi +} + +src_test() { + if has_version ~${CATEGORY}/${P} ; then + default + + if use ctypes-python ; then + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" + } + + distutils-r1_src_test + fi + + if use python ; then + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die + } + + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi + else + ewarn "The test suite shows errors when there is an older version of" + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install + + if use ctypes-python ; then + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + if use python ; then + swig_py_install() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + emake \ + DESTDIR="${D}" \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" \ + install-swig-py + } + + BUILD_DIR=python \ + python_foreach_impl swig_py_install + fi + + if use perl ; then + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl + perl_delete_localpod + find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die + fi + + if use ruby ; then + emake DESTDIR="${D}" install-swig-rb + fi + + if use java ; then + emake DESTDIR="${D}" install-javahl + java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install Apache module configuration. + if use apache2 ; then + keepdir "${APACHE_MODULES_CONFDIR}" + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}/47_mod_dav_svn.conf" + fi + + # Install Bash Completion, bug 43179. + newbashcomp tools/client-side/bash_completion svn + bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # Install svnserve init-script and xinet.d snippet, bug 43245. + newinitd "${FILESDIR}"/svnserve.initd3 svnserve + newconfd "${FILESDIR}"/svnserve.confd svnserve + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + #adjust default user and group with disabled apache2 USE flag, bug 381385 + if ! use apache2 ; then + sed -e "s\USER:-apache\USER:-svn\g" \ + -e "s\GROUP:-apache\GROUP:-svnusers\g" \ + -i "${ED%/}"/etc/init.d/svnserve || die + sed -e "0,/apache/s//svn/" \ + -e "s:apache:svnusers:" \ + -i "${ED%/}"/etc/xinetd.d/svnserve || die + fi + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install extra files. + if use extras ; then + cat <<- EOF > 80subversion-extras + PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools + + find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + rm -fr tools/{buildbot,dev,diff,po} + + insinto /usr/share/${PN} + find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die + doins -r tools + fi + + if use doc ; then + docinto html + dodoc -r doc/doxygen/html/* + + if use java ; then + java-pkg_dojavadoc doc/javadoc + fi + fi + + prune_libtool_files --all + + cd "${ED%/}"/usr/share/locale + for i in * ; do + if [[ ${i} != *${LINGUAS}* ]] ; then + rm -r ${i} || die + fi + done +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug 122877. + if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi + + ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." +} + +pkg_postrm() { + : +} + +pkg_config() { + # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} + # already has EPREFIX in it + einfo "Initializing the database in ${SVN_REPOS_LOC}..." + if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then + echo "A Subversion repository already exists and I will not overwrite it." + echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." + else + mkdir -p "${SVN_REPOS_LOC}/conf" + + einfo "Populating repository directory..." + # Create initial repository. + "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + + einfo "Setting repository permissions..." + SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2 ; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + fi + chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" + echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" + echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" + echo "to finish the configuration." + fi +} -- cgit v1.2.3