From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- dev-vcs/Manifest.gz | Bin 11647 -> 11651 bytes dev-vcs/git-annex/Manifest | 3 +- dev-vcs/git-annex/git-annex-6.20170818.ebuild | 161 ------- dev-vcs/git-annex/metadata.xml | 1 - dev-vcs/mercurial/Manifest | 6 +- dev-vcs/mercurial/mercurial-5.4.1.ebuild | 162 +++++++ dev-vcs/mercurial/mercurial-5.4.ebuild | 171 ------- dev-vcs/mercurial/mercurial-9999.ebuild | 12 +- dev-vcs/subversion/Manifest | 2 - dev-vcs/subversion/subversion-1.12.2.ebuild | 532 --------------------- dev-vcs/svn2git/Manifest | 10 - dev-vcs/svn2git/files/svn2git-1.0.10-version.patch | 23 - dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch | 23 - .../files/svn2git-1.0.2.1-include-path.patch | 13 - dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild | 53 -- dev-vcs/svn2git/svn2git-1.0.12.ebuild | 47 -- dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild | 51 -- dev-vcs/svn2git/svn2git-1.0.13.ebuild | 47 -- 18 files changed, 168 insertions(+), 1149 deletions(-) delete mode 100644 dev-vcs/git-annex/git-annex-6.20170818.ebuild create mode 100644 dev-vcs/mercurial/mercurial-5.4.1.ebuild delete mode 100644 dev-vcs/mercurial/mercurial-5.4.ebuild delete mode 100644 dev-vcs/subversion/subversion-1.12.2.ebuild delete mode 100644 dev-vcs/svn2git/files/svn2git-1.0.10-version.patch delete mode 100644 dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch delete mode 100644 dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch delete mode 100644 dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild delete mode 100644 dev-vcs/svn2git/svn2git-1.0.12.ebuild delete mode 100644 dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild delete mode 100644 dev-vcs/svn2git/svn2git-1.0.13.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index d77aacf33ffb..21354b5ab3f3 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index d690389670ed..590d14674f8e 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -5,5 +5,4 @@ AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc -EBUILD git-annex-6.20170818.ebuild 4436 BLAKE2B d0f7708835679700a53744352a3d7c78e4d5c7f9b4ce8072f7d0534f64b18d2acfb82c6168733116e004fc969f9c35a19309275b61bb5889548923eb1390268f SHA512 8a618c518acdb2883788bc65c5ae99fee4c2ffb92dcbc643d47c10342dc2ce6ede7422bb23b74383ffc307eb8800dfb7e5d74bfd638ad7e5eda6abcafff3c8d0 -MISC metadata.xml 1735 BLAKE2B 7722b62eae4ad8f3859262d67f6ed9223b6eb86962fa52a4d53ed9f9569dfd6045be8bd7c975fe8719a25fc13ae7c64d7be2fbd5993f77583f2b5d8a77d83c20 SHA512 33e68df57c88e73f1d1b88d051a0f9a22a84dea82e26b8b552a36f213c63680fd780bbc8c2cdf1f1c9e57b47d982218a4b096ac59e8137b019af7164fe72ea69 +MISC metadata.xml 1661 BLAKE2B 356d0921a762cfb657a0da795457c4016c2b131d0465e214cd24ca1b61b6b2666d0d4d3888abcaad00c70bae8f45b25400abfcba669aaa0e6f136f7e782424f0 SHA512 711b59db225918c774489ce308f16fd372377ff64c1449030bc75c4ae17212515ddeac741ee11978a6e3212b3edc75fd45d730664bd625a54d7887bc12dab928 diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild deleted file mode 100644 index ac78674adb6d..000000000000 --- a/dev-vcs/git-annex/git-annex-6.20170818.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.3.9999 -#hackport: flags: -production,-android,-androidsplice,-testsuite - -CABAL_FEATURES="" -inherit haskell-cabal bash-completion-r1 - -DESCRIPTION="manage files with git, without checking their contents into git" -HOMEPAGE="http://git-annex.branchable.com/" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav" - -RDEPEND="dev-haskell/aeson:= - dev-haskell/async:= - dev-haskell/bloomfilter:= - dev-haskell/byteable:= - dev-haskell/case-insensitive:= - dev-haskell/crypto-api:= - dev-haskell/cryptonite:= - dev-haskell/data-default:= - dev-haskell/disk-free-space:= - dev-haskell/dlist:= - dev-haskell/edit-distance:= - dev-haskell/esqueleto:= - >=dev-haskell/exceptions-0.6:= - >=dev-haskell/feed-0.3.9:= - dev-haskell/free:= - dev-haskell/hslogger:= - dev-haskell/http-client:= - >=dev-haskell/http-conduit-2.0:= - >=dev-haskell/http-types-0.7:= - dev-haskell/ifelse:= - dev-haskell/memory:= - dev-haskell/monad-control:= - dev-haskell/monad-logger:= - >=dev-haskell/mtl-2:= - dev-haskell/old-locale:= - >=dev-haskell/optparse-applicative-0.11.0:= - dev-haskell/persistent:= - dev-haskell/persistent-sqlite:= - dev-haskell/persistent-template:= - >=dev-haskell/quickcheck-2.1:2= - dev-haskell/random:= - dev-haskell/regex-tdfa:= - dev-haskell/resourcet:= - dev-haskell/safesemaphore:= - dev-haskell/sandi:= - dev-haskell/securemem:= - dev-haskell/socks:= - dev-haskell/split:= - >=dev-haskell/stm-2.3:= - dev-haskell/stm-chans:= - dev-haskell/text:= - dev-haskell/unix-compat:= - dev-haskell/unordered-containers:= - dev-haskell/utf8-string:= - >=dev-haskell/uuid-1.2.6:= - >=dev-lang/ghc-7.8.2:= - assistant? ( >=dev-haskell/dns-1.0.0:= - dev-haskell/hinotify:= - dev-haskell/mountpoints:= - sys-process/lsof ) - benchmark? ( dev-haskell/criterion:= ) - concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) - dbus? ( >=dev-haskell/dbus-0.10.7:= - >=dev-haskell/fdo-notify-0.3:= ) - magicmime? ( dev-haskell/magic:= ) - network-uri? ( >=dev-haskell/network-2.6:= - >=dev-haskell/network-uri-2.6:= ) - !network-uri? ( >=dev-haskell/network-2.4:= =dev-haskell/aws-0.9.2:= - dev-haskell/conduit:= - dev-haskell/conduit-extra:= ) - torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) - webapp? ( dev-haskell/blaze-builder:= - dev-haskell/clientsession:= - >=dev-haskell/path-pieces-0.1.4:= - >=dev-haskell/shakespeare-2.0.0:= - dev-haskell/wai:= - dev-haskell/wai-extra:= - >=dev-haskell/warp-3.0.0.5:= - >=dev-haskell/warp-tls-1.4:= - >=dev-haskell/yesod-1.2.6:= - >=dev-haskell/yesod-core-1.2.19:= - >=dev-haskell/yesod-default-1.2.0:= - >=dev-haskell/yesod-form-1.3.15:= - >=dev-haskell/yesod-static-1.2.4:= ) - webdav? ( >=dev-haskell/dav-1.0:= ) -" -# not generated by hackport: -RDEPEND="${RDEPEND} - dev-vcs/git -" - -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" - -# not generated by hackport: -DEPEND="${DEPEND} - dev-lang/perl - doc? ( www-apps/ikiwiki net-misc/rsync ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch - "${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch - "${FILESDIR}"/${PN}-6.20170101-crypto-api.patch -) - -src_configure() { - haskell-cabal_src_configure \ - --flag=-android \ - --flag=-androidsplice \ - $(cabal_flag assistant assistant) \ - $(cabal_flag benchmark benchmark) \ - $(cabal_flag concurrentoutput concurrentoutput) \ - $(cabal_flag dbus dbus) \ - $(cabal_flag magicmime magicmime) \ - $(cabal_flag network-uri network-uri) \ - $(cabal_flag pairing pairing) \ - --flag=-production \ - $(cabal_flag s3 s3) \ - --flag=-testsuite \ - $(cabal_flag torrentparser torrentparser) \ - $(cabal_flag webapp webapp) \ - $(cabal_flag webdav webdav) -} - -src_test() { - if use webapp; then - export GIT_CONFIG=${T}/temp-git-config - git config user.email "git@src_test" - git config user.name "Mr. ${P} The Test" - - emake test - fi -} - -src_install() { - haskell-cabal_src_install - - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} - - dodoc CHANGELOG README - if use webapp ; then - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" - fi -} diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index e35251395d35..556f1c584b7f 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -23,7 +23,6 @@ Enable git-annex assistant and watch command Enable benchmarking Use concurrent-output library (experimental) - Use libmagic to determine file MIME types Get Network.URI from the network-uri package. Enable pairing of git annex repositories Enable Amazon S3 remote diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 5dcebbccdb12..519908726400 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -2,9 +2,9 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99 -DIST mercurial-5.4.tar.gz 7722447 BLAKE2B 9abd7b62ca6e44ede626331d080f7a0e8e7fb980c169fbfc2e847549c915b65789e317b674a8317bf58ced3cab4e2de790513e45c6556d32cac649fe23e04fdc SHA512 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d +DIST mercurial-5.4.1.tar.gz 7725893 BLAKE2B 3205647b4a8d14ad6d02d7494d3f41b0a6d306ef039ebbcd2f62ca1f00f4a870794de968edafc9379e4e29c59da0aa4c92308facdf8f151f390ed7309782c3c5 SHA512 6173853c38f0aba59d2e29bec7da1c384c27a6004d5d00d1aee70571155122e07514fe6e56cecfdae48ec5f670823a2e6a5c9c8a36dd7041def2b8956fd35703 EBUILD mercurial-5.2.2-r1.ebuild 4255 BLAKE2B 5c5674ed8531f928586ce757e427d993b807fd60a468cbcd20dd7808887ce08a2bc3895998defc5b710811d5da879f2f988206a77f864d2b3e30ed4656ccf494 SHA512 3f2a17bf0cfa8ab76402ffb5f125b6e8f1de461a86be0ba6ea4d59f0a9f0437118358257f29a9b05adf8101f9094764f1ce4440cb2a75f82da0ffaa837078f76 EBUILD mercurial-5.3.2.ebuild 4262 BLAKE2B 33d5f02a567bc2ad2e408e128fc086f0cf677c43505a91a6a2cf09839bf9cf3746d066a92f53b88749f9d113e77ca7489fb4cf3b66d4a9786439c3d31b5385b7 SHA512 18bea024806a77d0c6b24c23ed87bb1de4831066abe55d6f0b385d7cf39a276399dd89400ae6b6988a70b31f4190d97b4548610c82693713264979f8d022bbc0 -EBUILD mercurial-5.4.ebuild 4266 BLAKE2B 070746bf6e8b7a1ab4ee60dba7cfaf9d3e6c7e9ed513cbdc31039c28eef80e7aa0f7c4749a5527a511d8627d4d4e43e157482fe2f164af8f79f0761cd3b900bf SHA512 725e6dda70241f4688783104c9cddc5048d61c071f4be85ea37c16d12a7b1257da8666031e3b4bd8b00b7d95f4b199adb1f0bb95755b71cc2b067791d3020a39 -EBUILD mercurial-9999.ebuild 4219 BLAKE2B 567a43e6491cf5317dd96998a57a6d562d07583a9b45ff4f45d01f1f2e1b61243ac646356efb90d86da51dad6634d5ea9a574a348ed73f4a2acf484a2608083f SHA512 d4e0373b8374205a72141e1376b7b17a209cd0e83456e5a0f95d382fa8b20173274f65cac74151a7dd99afb56a50cddf1fe352007fa5e1d7e198b5a37529f3c1 +EBUILD mercurial-5.4.1.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd +EBUILD mercurial-9999.ebuild 4032 BLAKE2B 802015b5f8f386bf38d7397aec896b4ae0557b6096295dd103adb29c75fad955e280d90032ecb8f28686fe7b7f69faa523775ce19b770c43dac17378db8ee451 SHA512 1c5cad662f4482fa1ec1f25824f367b72fd9e2a3b79b058ef852c3a30ef1a974aecdd39d0e8da19aedf7d7a92f3ac49c718d200b1699e106c685d448efe8f250 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83 diff --git a/dev-vcs/mercurial/mercurial-5.4.1.ebuild b/dev-vcs/mercurial/mercurial-5.4.1.ebuild new file mode 100644 index 000000000000..904d75ce7a99 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-5.4.1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6..8} ) +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 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+chg emacs gpg test tk zsh-completion" + +RDEPEND=" + app-misc/ca-certificates + dev-python/zstandard[${PYTHON_USEDEP}] + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk ) + zsh-completion? ( app-shells/zsh )" + +DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) + test? ( app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] )" + +SITEFILE="70${PN}-gentoo.el" + +# Too many tests fail #608720 +RESTRICT="test" + +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 + # Use absolute import for zstd + sed -i -e 's/from \.* import zstd/import zstd/' \ + mercurial/utils/compression.py \ + mercurial/wireprotoframing.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + filter-flags -ftracer -ftree-vectorize + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + distutils-r1_python_compile build_ext --no-zstd +} + +python_compile_all() { + rm -r contrib/win32 || die + if use chg; then + emake -C contrib/chg + fi + if use emacs; then + cd contrib || die + elisp-compile mercurial.el || die "elisp-compile failed!" + fi +} + +python_install() { + distutils-r1_python_install build_ext --no-zstd +} + +python_install_all() { + distutils-r1_python_install_all + + newbashcomp contrib/bash_completion hg + + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + newins contrib/zsh_completion _hg + fi + + dobin hgeditor + if use tk; then + dobin contrib/hgk + fi + 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 plan9 *.el ) + + if use chg; then + dobin contrib/chg/chg + doman contrib/chg/chg.1 + RM_CONTRIB+=( chg ) + fi + + for f in ${RM_CONTRIB[@]}; do + rm -rf contrib/${f} || die + done + + dodoc -r contrib + docompress -x /usr/share/doc/${PF}/contrib + doman doc/*.? + dodoc CONTRIBUTORS hgweb.cgi + + 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-largefiles* # tends to time out + if [[ ${EUID} -eq 0 ]]; then + einfo "Removing tests which require user privileges to succeed" + rm -f test-convert* + rm -f test-lock-badness* + rm -f test-permissions* + rm -f test-pull-permission* + rm -f test-journal-exists* + rm -f test-repair-strip* + fi + + 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-5.4.ebuild b/dev-vcs/mercurial/mercurial-5.4.ebuild deleted file mode 100644 index 25750d8586ff..000000000000 --- a/dev-vcs/mercurial/mercurial-5.4.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6..8} ) -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 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+chg emacs gpg test tk zsh-completion" - -BROKEN_PYTHON=" - !~dev-python/python-3.5.0 - !~dev-python/python-3.5.1 - !~dev-python/python-3.5.2 - !~dev-python/python-3.6.0 - !~dev-python/python-3.6.1" - -BDEPEND="${BROKEN_PYTHON}" - -RDEPEND="${BROKEN_PYTHON} - app-misc/ca-certificates - dev-python/zstandard[${PYTHON_USEDEP}] - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - zsh-completion? ( app-shells/zsh )" - -DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -# Too many tests fail #608720 -RESTRICT="test" - -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 - # Use absolute import for zstd - sed -i -e 's/from \.* import zstd/import zstd/' \ - mercurial/utils/compression.py \ - mercurial/wireprotoframing.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - filter-flags -ftracer -ftree-vectorize - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - distutils-r1_python_compile build_ext --no-zstd -} - -python_compile_all() { - rm -r contrib/win32 || die - if use chg; then - emake -C contrib/chg - fi - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install() { - distutils-r1_python_install build_ext --no-zstd -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - fi - - dobin hgeditor - if use tk; then - dobin contrib/hgk - fi - 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 plan9 *.el ) - - if use chg; then - dobin contrib/chg/chg - doman contrib/chg/chg.1 - RM_CONTRIB+=( chg ) - fi - - for f in ${RM_CONTRIB[@]}; do - rm -rf contrib/${f} || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - dodoc CONTRIBUTORS hgweb.cgi - - 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-largefiles* # tends to time out - if [[ ${EUID} -eq 0 ]]; then - einfo "Removing tests which require user privileges to succeed" - rm -f test-convert* - rm -f test-lock-badness* - rm -f test-permissions* - rm -f test-pull-permission* - rm -f test-journal-exists* - rm -f test-repair-strip* - fi - - 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-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index a62bf9062fdc..3be5d10a8454 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -17,17 +17,9 @@ SLOT="0" KEYWORDS="" IUSE="+chg emacs gpg test tk zsh-completion" -BROKEN_PYTHON=" - !~dev-python/python-3.5.0 - !~dev-python/python-3.5.1 - !~dev-python/python-3.5.2 - !~dev-python/python-3.6.0 - !~dev-python/python-3.6.1" +BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]" -BDEPEND="${BROKEN_PYTHON} - dev-python/docutils[${PYTHON_USEDEP}]" - -RDEPEND="${BROKEN_PYTHON} +RDEPEND=" app-misc/ca-certificates dev-python/zstandard[${PYTHON_USEDEP}] gpg? ( app-crypt/gnupg ) diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 72ad6243947a..99ddebb7d9ff 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -3,10 +3,8 @@ 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.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b -EBUILD subversion-1.12.2.ebuild 15517 BLAKE2B 6a8573f750eb273d22f67a7857652305284e8b8fc7a32fda5a00f9f826854635ef7c708cae0196a10c41804881ec5f3fa68f35415eaf3073efe4a6dae79fd965 SHA512 051325815cbea5de0ecc001c5c7d30156dce016082a92ec038f0298de24d8fde4b07b506d82567c3ae932b98466fed13da1cf790c98956f73c37a277ab1ca5fe EBUILD subversion-1.13.0-r1.ebuild 15766 BLAKE2B 10c9688414713da03840f7ccee255156f50a1faad64c0513fbc39820bf21d42e1ff6c87cb8bd40270595cf795c0de0d41d3cdabd95b5eb40711826eb2dc2ec7a SHA512 e467b90ff4e7636cafcce5f60387c1a1446937b7fc6abf464bcfa2252c41e7117d9f0717f29c6d89c60c2185e9050c642667827fcb6a8805e13cda0bab02ea24 EBUILD subversion-1.14.0.ebuild 15293 BLAKE2B 7d6d2377b26f6a17894f07335b1ef56f97f46595c4bfe1d4291ccfdd511d60428c8ba2a66c2b56a8da23e362bb34394756c63064df2087a5208a72caa5118095 SHA512 ae1781c78c6d17117f2c93af19f7308ae34d4e862e5f27d49c9aa3667a63d0ebc32f6ee3a0cf9ac05210555300e964b1b895335b835b682a99de678f5f733e68 MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild deleted file mode 100644 index 91f542b990f9..000000000000 --- a/dev-vcs/subversion/subversion-1.12.2.ebuild +++ /dev/null @@ -1,532 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby26 ruby25 ruby24" -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single toolchain-funcs 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 arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" -RESTRICT="!test? ( test )" - -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.8 ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - !!=virtual/jdk-1.8 ) - 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 - - # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 - append-cppflags -P - - 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 - - chmod +x build/transform_libtool_scripts.sh || die - - 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 "${EPREFIX}"/usr/bin/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 - --enable-svnxx - ) - - 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/svn2git/Manifest b/dev-vcs/svn2git/Manifest index 05ab8e9662b5..d98540db7d38 100644 --- a/dev-vcs/svn2git/Manifest +++ b/dev-vcs/svn2git/Manifest @@ -1,16 +1,6 @@ -AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03 -AUX svn2git-1.0.13-src-pro.patch 744 BLAKE2B ee9250e1bcfb620e2b768ca769ba42676f25218a45a9fa7305d1a2c39f2a77a1442525f087f6f30a409fbf87f61ee3ed53a23e80e82b85219e9b04b4d3ee20cd SHA512 0b046d0c6e77ce284712a93d9d2ae590100f5a3d49c37bd8119ba50a06e2988cb70ad475b6fdec98648e0cabeb5e688e3afe80c5472151b1ce02e18eb3d1a135 -AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f -DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 -DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359 -DIST svn2git-1.0.13.tar.gz 43738 BLAKE2B 97e9b90402d3c7eedf0fafd3b68429c99d93522dcfe190f88e64b744cb86e5fec0bdd0fabfef39018e290a425a53a2089df88250ff03e447f2963e2ad99fa0e0 SHA512 7cc9a9d70da285533f7f34672fb8f6571cb031d2dd4fc9df904b9e3acf64d97f42027a19bed82478c75a237febf3c8e12ba27a1abcd98403fe24247e5a26a96a DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583 DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517 -EBUILD svn2git-1.0.11-r1.ebuild 1164 BLAKE2B c838d41cf17d0241e5b1e229263d26e4015b1d76c768c3feffd41521a28752064eab6e2abb47a563777d691e0bf49e3e50458f4a9fa9d23e95f92257924eb11f SHA512 8e81668615ab102e02391130f22696c8c3bbc1ab7f13103691a35440556f62f400019e0922e9230c97e35f9f9875ee7de42f757427d2f7997d2b1ec1dc1b73f4 -EBUILD svn2git-1.0.12.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d -EBUILD svn2git-1.0.13-r1.ebuild 1081 BLAKE2B 04d13c0be9aecd14e3b2ea52af46e00de2792a140319545bea39bfdbc9515eb411c67fd9383a8674bea5a22611f1cb29a99ad44f28300ec27addfdd859d0317e SHA512 0745ce05c437203dbe4913dac9e238b741ee69a57459ed82265971e464c0eebbff16f635865b0d23d0ca303bc90b980122b8e3966011d5b250b21d1cc02ed756 -EBUILD svn2git-1.0.13.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230 EBUILD svn2git-1.0.18.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch deleted file mode 100644 index 894cf2c2a10e..000000000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d8b1c8c774a61666e7c62bf5beb8f0f1b4a3e01a Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Tue, 21 May 2013 23:11:25 +0200 -Subject: [PATCH] Stop using Git SHA1 version string - -diff --git a/src/src.pro b/src/src.pro -index da6d40d..2626a6f 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -6,10 +6,7 @@ SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1 - APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = $$(SVN_ALL_FAST_EXPORT_VERSION) - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string --- -1.8.2.1 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch b/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch deleted file mode 100644 index 74ee4306b3c1..000000000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 59a038796e6bb55b11b6d82f7d5aae42399da38a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= -Date: Fri, 12 Apr 2019 01:39:51 +0200 -Subject: [PATCH] Fix evaluation of emptyness of SVN_LIBDIR that sometimes - always gives false, sometime always true, but never what is intended - ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 426d304..cfbd865 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -28,7 +28,7 @@ DEPENDPATH += . - QT = core - - INCLUDEPATH += . $$SVN_INCLUDE $$APR_INCLUDE --!isEmpty($$SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR -+!isEmpty(SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR - LIBS += -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1 - - # Input diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch deleted file mode 100644 index e5c898ba9738..000000000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/src.pro 2011-01-11 09:02:15.696463807 +0100 -+++ b/src/src.pro 2011-01-11 09:03:59.793959849 +0100 -@@ -3,8 +3,8 @@ - # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007 - ###################################################################### - --SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1 --APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1 -+SVN_INCLUDE = /usr/include/subversion-1 -+APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - - VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild deleted file mode 100644 index 5df2948ca14b..000000000000 --- a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop qmake-utils -[[ "${PV}" == "9999" ]] && inherit git-r3 - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" -else - SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND=" - dev-qt/qtcore:5 - dev-vcs/subversion" -RDEPEND="${DEPEND} - dev-vcs/git" - -DOCS=( README.md ) - -PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch ) - -src_prepare() { - # Note: patching order matters - default - - if [[ "${PV}" != "9999" ]]; then - eapply "${FILESDIR}"/${PN}-1.0.10-version.patch - export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile - fi -} - -src_configure() { - eqmake5 fast-export2.pro -} - -src_install() { - einstalldocs - insinto /usr/share/${PN}/samples - doins samples/*.rules - dobin svn-all-fast-export - dosym svn-all-fast-export /usr/bin/svn2git -} diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild deleted file mode 100644 index f9d80383124c..000000000000 --- a/dev-vcs/svn2git/svn2git-1.0.12.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop qmake-utils -[[ "${PV}" == "9999" ]] && inherit git-r3 - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" -else - SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND=" - dev-qt/qtcore:5 - dev-vcs/subversion" -RDEPEND="${DEPEND} - dev-vcs/git" - -DOCS=( README.md ) - -src_configure() { - local qmake_args=( - APR_INCLUDE=/usr/include/apr-1 - PREFIX=/usr - SVN_INCLUDE=/usr/include/subversion-1 - VERSION=${PV} - ) - eqmake5 "${qmake_args[@]}" fast-export2.pro -} - -src_install() { - einstalldocs - insinto /usr/share/${PN}/samples - doins samples/*.rules - dobin svn-all-fast-export - dosym svn-all-fast-export /usr/bin/svn2git -} diff --git a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild deleted file mode 100644 index 7ff0f668cf45..000000000000 --- a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils -[[ "${PV}" == "9999" ]] && inherit git-r3 - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" -else - SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND=" - dev-qt/qtcore:5 - dev-vcs/subversion" -RDEPEND="${DEPEND} - dev-vcs/git" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-src-pro.patch -) - -src_configure() { - local qmake_args=( - APR_INCLUDE=/usr/include/apr-1 - PREFIX=/usr - SVN_INCLUDE=/usr/include/subversion-1 - VERSION=${PV} - ) - eqmake5 "${qmake_args[@]}" fast-export2.pro -} - -src_install() { - einstalldocs - insinto /usr/share/${PN}/samples - doins samples/*.rules - dobin svn-all-fast-export - dosym svn-all-fast-export /usr/bin/svn2git -} diff --git a/dev-vcs/svn2git/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild deleted file mode 100644 index f9d80383124c..000000000000 --- a/dev-vcs/svn2git/svn2git-1.0.13.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop qmake-utils -[[ "${PV}" == "9999" ]] && inherit git-r3 - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" -else - SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND=" - dev-qt/qtcore:5 - dev-vcs/subversion" -RDEPEND="${DEPEND} - dev-vcs/git" - -DOCS=( README.md ) - -src_configure() { - local qmake_args=( - APR_INCLUDE=/usr/include/apr-1 - PREFIX=/usr - SVN_INCLUDE=/usr/include/subversion-1 - VERSION=${PV} - ) - eqmake5 "${qmake_args[@]}" fast-export2.pro -} - -src_install() { - einstalldocs - insinto /usr/share/${PN}/samples - doins samples/*.rules - dobin svn-all-fast-export - dosym svn-all-fast-export /usr/bin/svn2git -} -- cgit v1.2.3