diff options
Diffstat (limited to 'dev-vcs')
79 files changed, 1408 insertions, 1443 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex 75d07795ecc6..4a85a4bc2aa0 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/bzr-fastimport/Manifest b/dev-vcs/bzr-fastimport/Manifest deleted file mode 100644 index 1fcf71aa694e..000000000000 --- a/dev-vcs/bzr-fastimport/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST bzr-fastimport-0.13.0.tar.gz 80255 BLAKE2B 7de24a16af62822b2b4e44d3ea3855a392993b1f57a8722e015ce426bca83aa94650321e5f46ff9d7f2571a6f9cea81c010eeb9ce9005b24734383a84da0ecea SHA512 3677a6ebb9d5d36d7d29198f239289a9670ac4f1fcbf74a1f219f8a0a5a9cd4301dbdc969c4bce2da18e3c4f7f9a3752919b662473071a7b3f1d84c2de27d821 -EBUILD bzr-fastimport-0.13.0.ebuild 940 BLAKE2B 4e25806aab34f6cb5a353821fa3f60be0b637d635153d5277c02e5a1693c3d4696285f9ffd9d40894e49e6f99b813c46dfebf9fb0d69d7d4fd13fb0f08301c57 SHA512 9ab833f2674452aeae6dc23038fd840a144333ec161cc4cdb77ab5dff39c58e28648c168e5123323b06dfd4af936285e679604c18f6275f49c6fc3fc2bdeb47d -MISC metadata.xml 249 BLAKE2B d3f54e2bb2e3a35cba372c9ce7d23b3ef882e7097390ef2923685ab4bccd85e8eb15d386c35050ddd2a4b2d699aec46d163f6288c8c5a88657f007629e771687 SHA512 1d2f485a40c7a1513ebd8504b17cfabc8febeebf12ba02c81c516da9c095f8422efc7b000db9c8c6dc088fbd43f45086be96793831fe9d688b18141b8c83acf0 diff --git a/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild b/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild deleted file mode 100644 index 586ab53eb4b1..000000000000 --- a/dev-vcs/bzr-fastimport/bzr-fastimport-0.13.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Plugin providing fast loading of revision control data into Bazaar" -HOMEPAGE="https://launchpad.net/bzr-fastimport http://wiki.bazaar.canonical.com/BzrFastImport" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-vcs/bzr-1.18 - >=dev-python/python-fastimport-0.9" -DEPEND="" - -DOCS=( NEWS README.txt doc/notes.txt ) - -pkg_postinst() { - elog "These commands need additional dependencies:" - elog - elog "bzr fast-export-from-darcs: dev-vcs/darcs" - elog "bzr fast-export-from-git: dev-vcs/git" - elog "bzr fast-export-from-hg: dev-vcs/mercurial" - elog "bzr fast-export-from-mtn: dev-vcs/monotone" - elog "bzr fast-export-from-svn: dev-vcs/subversion[python]" -} diff --git a/dev-vcs/bzr-fastimport/metadata.xml b/dev-vcs/bzr-fastimport/metadata.xml deleted file mode 100644 index 334a524e02a1..000000000000 --- a/dev-vcs/bzr-fastimport/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="launchpad">bzr-fastimport</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest index a1f98138201b..0210e253cc20 100644 --- a/dev-vcs/cvs-fast-export/Manifest +++ b/dev-vcs/cvs-fast-export/Manifest @@ -1,7 +1,5 @@ -DIST cvs-fast-export-1.45.tar.gz 517917 BLAKE2B 47d0debe2ea4d5674630065ee320c5db71f7ab6e4b17b7850d28c1951359ea98c639639574a7c3a25b9ec4e09ff53f1c5db566bff070e6381061fd828e875061 SHA512 f3acadabdd74f2099003a0cda29b021ea2173127af1a358bcb855397be95edaff2b1f30d3cf31dd6c08e79a8bad07b80b826c374d9b5e43555ec60d08dd577e4 -DIST cvs-fast-export-1.46.tar.gz 519521 BLAKE2B 7ecf0a87bef922a0fa69c1f63ab07e943e2a501c8565a610df3cb07e3af04b9abea02e78ae1d764c715e8e8b402cdc32f41e9109cee030d8339ebb8bdb97e561 SHA512 bd2e2a426bdfd76af06346c4a20469d134dd33ee98457afd8db3f1599e6f186451eb181057c97dd7383d35e66c4915f2cb42d51b818127cb3464c8cafc2f34f3 DIST cvs-fast-export-1.47.tar.gz 522489 BLAKE2B 5f83524137b38f863287feef9f95074dd40bc2189420abcf4d04cd02d686e21cc7fb26bf1e5fc3736efb04fe2e97202f1b4112483f420c7609fb208984c21095 SHA512 0da4b6d27e93c3bcf8ee0669acb0f15973f6eb3c566fd843755ac1176315220a23813d8ed72eba6f7429fa8ce5c00ed99d22fd9dd14e438473ff0a63c2d20cac -EBUILD cvs-fast-export-1.45.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a -EBUILD cvs-fast-export-1.46.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a +DIST cvs-fast-export-1.48.tar.gz 524991 BLAKE2B d26cf7dfe07eacdf21f9a3627b12548acaf2d5fc3b1c871d4f91a8ddc1bdde621a6ed2eb93e57869a2cf5507e396fcc22d5ef800bb6966f4ad8488b6ebff5b4c SHA512 6a8398bed512abac1e8d5dffcb1fed14d5a0170f45a43f16dbde9fcfd068dc921cc22510a8d4d11ae9266a336da60a0dba33789aa447c013c5a800bf21055d7a EBUILD cvs-fast-export-1.47.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7 +EBUILD cvs-fast-export-1.48.ebuild 941 BLAKE2B 101ad9f84224bc464cef4bb25598a00ab1151dc8ac6d2988717ae3d88def8cf544dc77e921702eba018873bc439bb26b799e96d3aebc596e382d944fd6ef6f12 SHA512 f03bda83aa58c75dc14a5138faf3eff4b29e85a4fa426394b8e3f9c8ab4e5d3229b18b964e09d60f89c7ab13759a4975caf9df2953e8cd0020fd4cec13cf10c7 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955 diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.45.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.45.ebuild deleted file mode 100644 index c1ecf983231a..000000000000 --- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.45.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="fast-export history from a CVS repository or RCS collection" -HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/" -SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - app-text/asciidoc" - -RESTRICT=test # upstream does not ship some tests in tarball - -src_prepare() { - default - - tc-export CC - export prefix=/usr - - # respect CC, CFLAGS and LDFLAGS - sed \ - -e 's/cc /$(CC) $(LDFLAGS) /' \ - -e 's/^CFLAGS += -O/#&/' \ - -e 's/CFLAGS=/CFLAGS+=/' \ - -i Makefile || die -} - -src_compile() { - # '.adoc.html' rules can't be executed in parallel - # as they reuse the same 'docbook-xsl.css' file name. - emake -j1 html - # Allow full parallelism for the rest - emake -} - -src_install() { - default - dodoc README -} diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.46.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.48.ebuild index c1ecf983231a..50babdf251fa 100644 --- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.46.ebuild +++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.48.ebuild @@ -44,5 +44,5 @@ src_compile() { src_install() { default - dodoc README + dodoc README.adoc } diff --git a/dev-vcs/git-bzr-ng/Manifest b/dev-vcs/git-bzr-ng/Manifest deleted file mode 100644 index 0a65a092830b..000000000000 --- a/dev-vcs/git-bzr-ng/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST git-bzr-ng-0_pre20120822.tar.xz 11592 BLAKE2B 1975e9b7e52d177736eb7f90ee35bf72f97b5cb0c682119160b59d09d9d16762a9981578c32475a1a378a6f98d3c9e6623772a8582ed1d5d9b5a4fdcc830d731 SHA512 2652b76a1fbdfac7f7387b53167d0c76a0579e232f66be05c28a156eef638e40bd7548154e6c1853872cf6978b474b948396db176976f2ac15e7311fc731ba9b -EBUILD git-bzr-ng-0_pre20120822-r2.ebuild 724 BLAKE2B a258cb05827187c09bf94da273758c25f23c0d0f6266003994f8c374d8eb16d83c298c659d6d75897bec593973b62bdfd34ebe2c3993c27203f23258d8fafe30 SHA512 7d149599794c3788cfa6242d1407f7d5ff6e507f6767072847a51414847b36491564ad618d95fdfb4ebdc74b802ac6fad8b57dcb4abc513fbf9ee45e9060d107 -MISC metadata.xml 249 BLAKE2B 5e00f5dba59ea4d8504db1b736c09e358623232442809572d956f66ac7ca4ab6a0ef750f5657a88b500f8d1db8e596fe00d5ed23dfa307b2209b34e380f05bff SHA512 2990ac74335287566eed320fe7dae61f5485d193e9f069d5ba0e584dc900499e07ec3c6970a2d83a195bd952a0d1f72a54c79d29bc2ffab3b76b8c6a5c8e29d8 diff --git a/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild b/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild deleted file mode 100644 index f85416390252..000000000000 --- a/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="Git subcommand providing a bidirectional bridge to Bazaar repositories" -HOMEPAGE="https://github.com/termie/git-bzr-ng" -SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=dev-vcs/bzr-2.2 - dev-vcs/git - >=dev-vcs/bzr-fastimport-0.10 - ${PYTHON_DEPS}" -DEPEND="app-arch/xz-utils" - -src_prepare() { - default - python_fix_shebang git-bzr -} - -src_install() { - exeinto /usr/libexec/git-core - doexe git-bzr - dodoc README.rst -} diff --git a/dev-vcs/git-bzr-ng/metadata.xml b/dev-vcs/git-bzr-ng/metadata.xml deleted file mode 100644 index 45c7b19e4421..000000000000 --- a/dev-vcs/git-bzr-ng/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">termie/git-bzr-ng</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index c09b056726b5..aedb4bf1ac2c 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -3,6 +3,6 @@ AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee -EBUILD git-cola-2.11.ebuild 2446 BLAKE2B 47be464f83286b7f1c341b762abaf7fb05e787fb178dc2b0f565dbb77294a3c564adf1159e1276d05ee99ee0933ca386792828215b5531bb0e4144d053a770e0 SHA512 b73a4b57ec6e843ff2ea2e0cc5a86020653fbc097259fc3058f6c809f6c6986d4b4a77eb97e90de4206c9ae2c53c30b4c3a3198e99c87ab23ada5dfaadb7910a +EBUILD git-cola-2.11.ebuild 2441 BLAKE2B 1c3d96219105754188faf8734a9e781727c03402b29e601b8353a882d3ddba89b2e0f7e9ded2ee4825dc0a0b9bfc4c1dbdd9fe95725b3527d34c0a2a9e40323a SHA512 99be02673adf1c44fec91fedfb61ac54eabf62424e83681a52d1f7480335b026e63e3dae86608c3d4058485375a10f4167f4b1106f0327d0889da353a4ca2336 EBUILD git-cola-3.2.ebuild 2326 BLAKE2B c765e3f1c4d9dc07bb2e10c6c001330718bf24b23542fa2acb5c75918d776a8a69deaa5749410b2409b9edbe299c5fa29ad3130f21a36546bd1efc9add5c8e0c SHA512 00c63f9819b0f76804f38268e907e9679139f347a4a7b536812747245ae4427c2537320e4fed6e94a9023a9dd09069612c2be60f80219ce114b16aa20a96045e MISC metadata.xml 342 BLAKE2B 3c25a34b0009e31ea7a125733b8105d40be8d818106b7051d6b4180a8f4c39e16ce46eada9acef2cb5424d3fdc36965bdddb3f048c07b6920593a57d6ffff001 SHA512 9ef75fe8465b602db4d9645535f9ce228af6afffac7309c5f3e7dbe266fe5c89a08e96bc53c2fb4a364a8c3ec6c3d87579eb076d6ba005499f0f4f07316caecb diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild index 2eb369d1340a..aa749f760c10 100644 --- a/dev-vcs/git-cola/git-cola-2.11.ebuild +++ b/dev-vcs/git-cola/git-cola-2.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{5,6} ) DISTUTILS_SINGLE_IMPL=true inherit distutils-r1 readme.gentoo-r1 virtualx diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest index 15ade50fdb08..eb56d9c88f8a 100644 --- a/dev-vcs/git-imerge/Manifest +++ b/dev-vcs/git-imerge/Manifest @@ -1,4 +1,4 @@ AUX git-imerge.bashcomplete 4714 BLAKE2B 5e994a45e4d243611078a8f9d08019d24ce9ab80d4f59502e47bca94baadf122e8ae9a6218b58c4268a783cc5d7e03bee7bf26d8a39d853a9bd3ac3edb189133 SHA512 a1399072ca9a775acc4ceebbb2c13c1608687df68f01b407e1b3ff8f9ce01e748025ac02d88bf210af609206ffd0f6e578495b3c2a66bdddf9793210714c1b42 DIST git-imerge-1.0.0.tar.gz 58736 BLAKE2B 16665436d10d07058eeadab5d53a2325d68174f6fcf1748948d0fc4fbe11ab4fca87853bb557e167b0f485351aedd72889fcedaa70f09439d7e66b75a61d318b SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b -EBUILD git-imerge-1.0.0.ebuild 1071 BLAKE2B aeb219159159150dc184a8f11d701d6a5c9f1ce1c7ed07dacd1d40cffd358df986817f179ec1b898272d6f5de001a8ffad30ad4fd7050786afb7e8a5fb3001fa SHA512 58ad713ad457416256406264bbced5fca2264c43bd479f8ab2d9da0fe7ed0c3b42e3b6b8b62d8334f1a942f63d93a65a3714a03c5bbd576f1824863d005476e8 +EBUILD git-imerge-1.0.0.ebuild 1064 BLAKE2B b778fcbfee97e92c6121ae7ef1c5932fb2104aa70dc29f75ca02381c17c232430cdad016fd3937f516501b7b6052241cee2510734fb45fac51c8607db8341261 SHA512 76c45ebb226fc97bc7e8b416d29029d93050cd36cb7662c2fd02e48e48daa766bec66055d8a6025722f08c92893ba9e6bfefb1ca1a8d7130ec236b7c2b9fd1af MISC metadata.xml 250 BLAKE2B f77aee69210d3e363a8b53c018b9e998e521b273b6e10451a467bcefd917fa2f6c3443000b603ab6355bfbd091b4b366f869ca5e8e695f9846634683309aef48 SHA512 c5b2424b4f6fdfbe8267055899a39cd14d992aaea9fc8dc6d007ee495e97a2d4125a9abad94c17a4c646521759fa998a3468dae0ac4d8b12c09926fc24e7403f diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild index 249da409f76c..4a1d2432a3af 100644 --- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild +++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit bash-completion-r1 python-r1 diff --git a/dev-vcs/git-num/Manifest b/dev-vcs/git-num/Manifest index 6948d3874872..7cdcfebbb92e 100644 --- a/dev-vcs/git-num/Manifest +++ b/dev-vcs/git-num/Manifest @@ -1,3 +1,3 @@ DIST git-num-2.0.1.tar.gz 53833 BLAKE2B 4080bb19ad15441fff5f641576a33d7df89ece30f10c159dbc3f8a659c29568dc295f4b3f7d01aacbf13ddad3347dc705d4e9f83a07c6c3bf5e7d2ae9f07763b SHA512 f35599a74b91efb3ccb6e8509ca1c7eb7c2f67cb90b131efc6693f8f36ea97adcb01026ad307746bdf0613200646da289aa315095cbae2580c4443b03e9dd040 -EBUILD git-num-2.0.1.ebuild 944 BLAKE2B 403d12dd26269ea6b67b74558a84181059a8ac91a77ea28cc340f8c4076bb7e4fd615663a37fef13108709190c802172063f3bd8ad90f3da476586439fcbddc1 SHA512 4018ecad97900ef50864576bef709e53ce8253a859a2203e84f080665a2a307677c2a6b65e600b9fc3cf94428505609d84fa38f2224aa9e9d44797dad4caa6b4 +EBUILD git-num-2.0.1.ebuild 941 BLAKE2B 184a3509bdda32733e27d337ebda8a56767f6eaaea5c132f83458b97836d1e41832d7757635093b71a8d868cd738fee1cc1f7103185a5621708a17d03d751fb8 SHA512 e8e6b1f2f42b0937f34a727987369fb6de7099edf0e124a1b5c9a48742ebea5df501b8cdb6e093b9a10d45d4a098f21f0da1fff22014f1f93e9e5c18f20fbf1e MISC metadata.xml 250 BLAKE2B c7535e9e453a300c160cc23db68c3c9044cf2b4badd2506a548f85b0613df59ca4af598bed1612f5a03f120a4c540aeab35f855dc780f81a8299d366d7a4fb69 SHA512 1ac35f3998bc50445dbaf10ca62a8831d129f514433d51ffe3a92da1f10ab35013eb9960869a79804216e9818c23bb70e8a9b25d131dc23a5eb4bb958792d5d0 diff --git a/dev-vcs/git-num/git-num-2.0.1.ebuild b/dev-vcs/git-num/git-num-2.0.1.ebuild index d3551f87af70..71e04e1ab471 100644 --- a/dev-vcs/git-num/git-num-2.0.1.ebuild +++ b/dev-vcs/git-num/git-num-2.0.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby22 ruby23 ruby24" +USE_RUBY="ruby24 ruby25 ruby26" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest index 2c2b43d8dd00..fda23b9e3bf1 100644 --- a/dev-vcs/git-remote-hg/Manifest +++ b/dev-vcs/git-remote-hg/Manifest @@ -1,5 +1,4 @@ -DIST git-remote-hg-0.2.tar.gz 30397 BLAKE2B 9c96c420a9e38fb3e0a223f12343834abdb742d15140330b1f5a12b68da924466106a279802a525c085c176d706cce427e73b1f86eeb99a6a413ab6de5954b18 SHA512 eb08a90b786593602510fef6210bb381a605d6c4cfda7e0c1051162d0a9929c077081f530dcdfb95f6fd8f0114ed44ea2c8f267e0e7ac110f9445941c9dd8546 -DIST git-remote-hg-0.3.tar.gz 30995 BLAKE2B c65918a985459149df85b1519f4d4b15be53c26d28a32cb660d85fa386a488668e2d042c7687fd4ea0928237d3098d5d3bcd77f8a0e78742b530b7cc2dff1195 SHA512 33ff1874909c0ce4d8b44d1dfd6ae706df44b36ead566e09be0f4e94e3b2a5c8603bd2f2fd50e8faa99d6aeb44a7792d7118c4413f8c9a8b8c29108b534bb4f4 -EBUILD git-remote-hg-0.2.ebuild 533 BLAKE2B 2bc0641461db8c97947e64d4990e6d1672327b149b1b653777881f8c251df7ef093e2aef901f790b46c0a237efd303c49edfb3686be9f4926de46e37bfc5419b SHA512 e0ae87af402526dac263d36c5b13faa7fbac95fe7b2d897502086f010ff2c14c146800de0d51392ac60ebe2dc4a3ba74033ce166b062bd9ba2d6b46dd4d34b9c -EBUILD git-remote-hg-0.3.ebuild 576 BLAKE2B a82d541d1c4d58f8a67d9c7902876a964eaf0dde80bca5c9ba59770b31fe79dec635ba4379a749ed27323fcd03df3000b59c183978381b07b12e94ee19994846 SHA512 369c2d2be9efb854b1564b0268b8959563a32cd372150e0c6b430e1db5bf3124a0fa84e8dd97153bdf3e9d12fc977f1ca88f9b91c4b1e8a79a9f69a0ec8555d2 -MISC metadata.xml 570 BLAKE2B de338749634d4141b4c73fe511c6b2097edd36ed633cb58ef1c9e6ddb237876d4a55f1423e2d6c04805de38b133f700a2784268dc3926cc731ccc5c8bb256a77 SHA512 07bfa78ad5d7558a6c3607e4b5dfcd2908d9227acedd4393c7a0002fed383dc85a68f6758b2013b83a6f810188c99952e7718d987f1cfddfd710f5a135ccf3d5 +AUX git-remote-hg-1.0.0-get_version_from_release.patch 891 BLAKE2B 1b58f32021a988624c2d1113a2d0d8622b593ac14bc34d6df082a2c65b52322fd00c0ec97f547cd6dec746003f0ccc308130f6d1248678e2b6f5de458410f5b6 SHA512 4ba7a808ce7c67562046f5274839ba9336456a18bb063537fce4320a66f41cd69e7101b6c0ad1e3d01a2030146ca5468aec6992846b358b44b083ea1901cbfd5 +DIST git-remote-hg-1.0.0.tar.gz 57611 BLAKE2B f46ca860bd7c46985ef53d5adfb949290208e351425a31fbfd33e6cf632c40b043397d398a5c378c653ab2b303d427c4b5bf29250fb51631f87cb2dbb0b541b5 SHA512 344349b8c64db5ad629176c664713773b4e8fe5ddf6bd13e7f3cac421f82eeb93fdd8aa59a2baab4b36b533cd6721adf8d31c69d4cc761e43c093c4d531c1a7d +EBUILD git-remote-hg-1.0.0-r1.ebuild 781 BLAKE2B f28b2f0d414912f58e5feeb173ca3518629e48747c1838fb7aa47f7edf8fb3a91e094f695a19fab21d23f380909791cb865d8432e8e3e8d2a7544fe9c8b81307 SHA512 9cdcabea84f9e231b71a28cd334368a522054391023baf031cc3bd92575ed2b5bea57644b6859f0a4b5b7b6837a6d40d785f4a8184c34428d70b04e8fab71acc +MISC metadata.xml 683 BLAKE2B 04203fd44fc7820216ad8b9f72a9bae1f4320a759dd6d2787c163f6aa9e42349169a82668e5be895516418b8ec3a9bb6df9519d85b67cf1bafa6f771aeb14aae SHA512 55d7417f87a517729b6ee14dff7cc282b208b95bc36b325435c6f1c1a2efeade8302372bca999739cf16d8ad180bae4d3f3df74c179c4dfc09ce0df7462bee40 diff --git a/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch b/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch new file mode 100644 index 000000000000..7226e33aa431 --- /dev/null +++ b/dev-vcs/git-remote-hg/files/git-remote-hg-1.0.0-get_version_from_release.patch @@ -0,0 +1,34 @@ +From bad5ec1a42d6c1ffae3ac94a5bacc95ffdbe3626 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Sun, 21 Apr 2019 20:34:41 +0200 +Subject: [PATCH] Don't try to fetch version via git from a release + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + setup.py | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/setup.py b/setup.py +index 26afd17..6c84c99 100644 +--- a/setup.py ++++ b/setup.py +@@ -5,15 +5,7 @@ import subprocess + import sys + import os + +-# derive version from git repo +-cmd = ["git", "describe", "--tags"] +-commit = os.environ.get('REV', None) +-if commit: +- cmd.append(commit) +-process = subprocess.Popen(cmd, stdout=subprocess.PIPE) +-version = process.communicate()[0].strip() +-# strip leading v +-version = version[1:] ++version = os.environ['PV'] + + # check for released version + assert (len(version) > 0) +-- +2.21.0 + diff --git a/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild deleted file mode 100644 index 297bee0751bb..000000000000 --- a/dev-vcs/git-remote-hg/git-remote-hg-0.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=(python2_7) - -DESCRIPTION="Semi-official Mercurial bridge from Git project" -HOMEPAGE="https://github.com/felipec/git-remote-hg" -SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-vcs/git - dev-vcs/mercurial" -RDEPEND="${DEPEND}" - -# Most (21/25) tests fail: -RESTRICT="test" - -src_install() { - dobin git-remote-hg -} diff --git a/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild deleted file mode 100644 index 3d5b16b08b94..000000000000 --- a/dev-vcs/git-remote-hg/git-remote-hg-0.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=(python2_7) - -DESCRIPTION="Semi-official Mercurial bridge from Git project" -HOMEPAGE="https://github.com/felipec/git-remote-hg" -SRC_URI="https://github.com/felipec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -CDEPEND="dev-vcs/git - dev-vcs/mercurial" - -DEPEND="${CDEPEND} - app-text/asciidoc" -RDEPEND="${CDEPEND}" - -# Most (21/25) tests fail: -RESTRICT="test" - -src_install() { - dobin git-remote-hg -} diff --git a/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild new file mode 100644 index 000000000000..18d62626ba6e --- /dev/null +++ b/dev-vcs/git-remote-hg/git-remote-hg-1.0.0-r1.ebuild @@ -0,0 +1,42 @@ +# 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="Semi-official Mercurial bridge from Git project" +HOMEPAGE="https://github.com/mnauw/git-remote-hg" +SRC_URI="https://github.com/mnauw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + app-text/asciidoc +" +DEPEND="${PYTHON_DEPEND}" +RDEPEND=" + ${DEPEND} + dev-vcs/git + dev-vcs/mercurial +" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-get_version_from_release.patch" +) + +# Some tests fail. +RESTRICT="test" + +src_compile() { + distutils-r1_src_compile + emake doc +} + +src_install() { + distutils-r1_src_install + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-doc +} diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml index 0fe237632666..516b1c49f64f 100644 --- a/dev-vcs/git-remote-hg/metadata.xml +++ b/dev-vcs/git-remote-hg/metadata.xml @@ -2,8 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>wizardedit@gentoo.org</email> - <name>Austin English</name> + <email>realnc@gmail.com</email> + <name>Nikos Chantziaras</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> 'git-remote-hg' is the semi-official Mercurial bridge from Git project, @@ -11,6 +15,6 @@ Mercurial repositories as if they were Git ones. </longdescription> <upstream> - <remote-id type="github">felipec/git-remote-hg</remote-id> + <remote-id type="github">mnauw/git-remote-hg</remote-id> </upstream> </pkgmetadata> diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest index adaaf1890ddf..100af8a34000 100644 --- a/dev-vcs/git-spindle/Manifest +++ b/dev-vcs/git-spindle/Manifest @@ -1,4 +1,4 @@ DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8 -EBUILD git-spindle-3.3-r1.ebuild 686 BLAKE2B e9c8dc04465ade49dc668436582e2a7ffa7df96940dbd2ca3740f8d181926c37d9ba74ca20072f75939bf67221b9921834be198f93160884e5ff51cacc9746e3 SHA512 0de494858b2e9aee4fdb66fa15badd9cf96801527afcfb98921bc8eb6d1385af8a4e787ba03a393c933fc5566608358efdb31937db6c168e7e7134ca340035e2 -EBUILD git-spindle-3.3.ebuild 567 BLAKE2B 67cf28749db61c22c89f8850d1efcc603f5fe5539ace76a31019f7dfb594759e48e0a0af46a00eadfda7fe9287a544eb1b6edb2ba33474b254420de0ae18b281 SHA512 1cf7e0fa874fd14e8dac447d1ec5a7cf58479476ea1b63d7ae379c4ea0ed80d9e972898a49e7a08508d5ef3359911e0d57a86feebbba65cec9299d4889198aa6 +EBUILD git-spindle-3.3-r1.ebuild 679 BLAKE2B 2806c2efc11704095d4e72d1210c468c3062519cc38b934fc84125289442fa0ec158cb0271c63c7161514e3cbe6fed4ce3c78096a505932e8202f5a851bc37e4 SHA512 6c5545bbda501b89b1d0c13fa71fcd7296a221404694d0b4e8ecf4933de699743cb24f8ff2dc283519462b891c245594f6526b455ed5a00525ec697fe621d9f9 +EBUILD git-spindle-3.3.ebuild 558 BLAKE2B 4b26b9e249dff4a544e270371797210e4a5dc38d574b252a6c0b926760cc5a37e9a5631130d3746e49d45f55d3fe6d5d01a3568554476a76cf79443a2a7383cb SHA512 b271c3bef677459ebb1a31b9c44db218608675fd7c891c92c17c74fc9b040c9b6f8ff448ec2ad9af15acd9cfd24341fcf0a07534dcf019367f782c7990b1206b MISC metadata.xml 626 BLAKE2B f24c2dedc0f5d576e138ca4eb7a77d892c16ac5b7a96bc41161b49d39e97920ea11eea3bb3c67a72086a756ec40fae9fb8b866eb38c6fd86ba885b41f01d8cdb SHA512 7f2be03b228a372aeb1a17913d790ec69c2d02d684c9495c460fff28b00b4a36e14b66e25e0ed31f0c9c0913ff5292cff02ca690308fe3feee84b66e9b3678b6 diff --git a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild index 7d970a8cd2ff..fa0d29ddcc1b 100644 --- a/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild +++ b/dev-vcs/git-spindle/git-spindle-3.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit distutils-r1 diff --git a/dev-vcs/git-spindle/git-spindle-3.3.ebuild b/dev-vcs/git-spindle/git-spindle-3.3.ebuild index 9ebebd0d3a0b..3c2c96e2b97a 100644 --- a/dev-vcs/git-spindle/git-spindle-3.3.ebuild +++ b/dev-vcs/git-spindle/git-spindle-3.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4} ) +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest index fa626aa92538..2a9e75492dea 100644 --- a/dev-vcs/git-tools/Manifest +++ b/dev-vcs/git-tools/Manifest @@ -3,8 +3,8 @@ AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8 DIST git-tools-2015_p20151225.tar.gz 12635 BLAKE2B c5414307d0db6975034f6a04b007fc5872e4af9a46cd398b3a0675470cf3f4fc328539f2907faf5e75a36570e3d2131ef7a8023a981e05df8ff671b68f07480c SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0 DIST git-tools-2015_p20160201.tar.gz 12702 BLAKE2B 14c77495f66190c18362e889d3f7a0254c3c09da2524ee8cb9717db3437e834418f0c92bee5fdcad11bb65a40524163e651af5dcdc454ce06b1f7d7e9ab33fc1 SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995 DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe -EBUILD git-tools-2015_p20151225-r2.ebuild 1414 BLAKE2B 33c744aaf1574c28316d09d34f64e5704a873a3bda84c1ecdb31163ee4b1b97ced00f1a1fb9f5941215d35fe176b22acd7dc5f2c0629255ef2987b764db816e7 SHA512 6be51e39eed53ee56220c8d28061bffbc816259e0a51474d6ba393dd61bdfbe92287d1dcb339d1eefd4aca4cea5a7a9026b9c2e1296e69c552efe53001b990a2 -EBUILD git-tools-2015_p20160201-r1.ebuild 1472 BLAKE2B 35859c92fded2b2791d0444feb0811fd2df1e4583c1843d41fc00ae40212b352365b811128ae64df6efcc162fcd0677ff8934b288ac3120c556105d50fded973 SHA512 8f3f7bea0f0bab5bb25d37d7dbd11714c77aa4f7313d66d98c2351597cc0084c9bad0d3fa7baacfa3505f0dcb2096a5063bfbd75b2a43be60ef57d5e548091dc -EBUILD git-tools-2015_p20160201.ebuild 1415 BLAKE2B 5010b65038f9ea304946d11d01b3210929f618423cb7e1311f45908093c96fa3d915f49a83935703d843d79f64d2edb4a36ee9beb228273eb1fdfe1a71e9dca5 SHA512 febdb21bd7c5bcd85ed54c37aebb25237fd13e24fc3b1c2074132c44a6c3fb1f09af36034dbe3c5cfcb1e05c317928849a91d1a7de5d5ae74632e7bce2773233 -EBUILD git-tools-2017.10.ebuild 979 BLAKE2B e0f5131f456690efa3693a7a30817e3a6d1532a6a07d7d0151e4bf646f252b2096f01ed6807d671c24bb944dd9051b747a5f56781e40858722e99b3d9b990223 SHA512 eec0b1aa9c65c0f7e3a91b35a666d73627ec2e76f4e5b18a58efe54233ebc83356289a0834f1b3719d18afade0c2341af26b0fbfa10d3f45ffdef3264081d9d7 +EBUILD git-tools-2015_p20151225-r2.ebuild 1406 BLAKE2B 8449da25f17864f73fda9e1dce732ba020bff4e23ea3c1e41d713e0c18ac8455a86a8e971c378f1e28ed8e14fcdc2de4ae4171445932e539a41a95f49d301f4e SHA512 455f8d2034c8680e08e268d6f38d06b1afcc752b12a253f00ca18854f49bca26af34bf6b3d1a072cd0b4b14e9ce4b87afe8a60e2954fd638b9123bb05abff17a +EBUILD git-tools-2015_p20160201-r1.ebuild 1464 BLAKE2B e2c20a63b9ae6e5a1c2c1a2d2d2d30dc9ae0c00b6a75aad18546ec3c3e9cbf6116cfc8d0ef70099d9b27bf46c2cab56dfbe6c2ba3af232ec835cd360f9b23d01 SHA512 a9b6009a74ecbf894c9c3dd130694ff351159075e8a4e2c62b8f21306376fa577876c10e512158f273f902a8aef3c48f2f9fca7bc958af75209ba4483dc8d798 +EBUILD git-tools-2015_p20160201.ebuild 1407 BLAKE2B 274cd48cccd269794b7b11d2b653b1cb437cb946ae23c59d4ded6eeb6909ae68a1037f49c915917371917d5718d82779393c713977518f015d6fc7b8ee50ab6f SHA512 a954983e4ac1331749f8fd1c87e993e78d19e085b2247363daab3069275ef4dd661b5c180d0f6b71c223c81243a80f2706697a09d8552baed3098ed75cbd48a8 +EBUILD git-tools-2017.10.ebuild 972 BLAKE2B 7051f2d108a92a3ec9cbb7c05538117528612a53be3e1f2136ca15f70dffc5c5601d2fe9b80e1f8f05b296f838c112c6cebedd9b345d1b9fcd85f3177b150bf9 SHA512 8486197de7f0f9c2ac795fe4343180dca7e75940b9055f5a971ac20a077498fedb728e31b4d0354db833336281027be1aa5c72f7249399f970adfdc90c03861f MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19 diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild index 289119ac2b71..2bec31938b5c 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4..5} ) +PYTHON_COMPAT=( python2_7 python3_5 ) inherit python-r1 DESCRIPTION="Assorted git-related scripts" diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild index 959b36715ce2..34fa6db50ef5 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4..5} ) +PYTHON_COMPAT=( python2_7 python3_5 ) inherit eutils python-r1 DESCRIPTION="Assorted git-related scripts" diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild index 6e0a9d41a102..b946d0420d3e 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4..5} ) +PYTHON_COMPAT=( python2_7 python3_5 ) inherit python-r1 DESCRIPTION="Assorted git-related scripts" diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild index 562b1cd8ec19..7825ea9950ee 100644 --- a/dev-vcs/git-tools/git-tools-2017.10.ebuild +++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit python-r1 DESCRIPTION="Assorted git-related scripts" diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index b6f42dfff573..38473cfd612f 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,6 +1,8 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a181ec9af6740033b0446f76b9620c97db582e85eff9aee0e3f88749981a135382c7a8d3187da921a5 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 AUX git-2.18.0_rc1-optional-cvs.patch 14471 BLAKE2B 0fcd6693bdcb7ef1fb843a19eb3802edb96e0f4820cc56338de6e0042a768d14a72eb4c02dd680bf4a9e536935529dcb5b1f25bd6f7980e46ca0ea0059f2d643 SHA512 d5cafb3c52b0cade0550492b4d52d96a912f9d721eb02677390b6edc7154f171c84b9b225baf42fa328b3ee0a7feaae75b4a4426b73db3deebe878ce62adf9d6 AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd +AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df781c77f4e5fea1f5f6f42a0a5c9ff74d08909790dc961abe4896016128a01992c1ceeb61236d4d11c9ccfdd4b8257ecd89829aaac435 SHA512 1fd1a3af27e2945d25cb24a60678c05aaa32edf312d2750d7aafa26bfcce1877d88e49f649c3ac572f75e8631fc979f82d75b3e8abbc02d1750421d4cda41321 +AUX git-2.21.0-quiet-submodules.patch 2314 BLAKE2B d9a80ae1a05d63c146115a6dddaed9c57646bcfe4a460727f1edef688c1411cfc1f224e4ea13b7ceff273d473f0ef3bf5681d559a4a58f80668be0c24387ce3a SHA512 b58d911ff51abfd40cbb350130020aca05b1ad68bd4bfa1df10c4b086f95a956235ffd22f0dac88d16240c70854ddc0fc86520fa6c59720d3ea635837bae1472 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e @@ -18,12 +20,13 @@ DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380db DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 -EBUILD git-2.19.2.ebuild 18952 BLAKE2B 93390621e13738ff6adcb1a2881c492a678230ac341a4063c35f8b4f159c1114baca992c553cdefea636d5f46c77d8fffc4ae4465682454aca5d62f78c2c9b74 SHA512 ec51656907ab90c63adb74afb57127e8358784a9584fca41c17299d345a3a080cf99c1d039f3779a5263a87c6f0c3cbb05f5c4861ef5931b90381aaebb5fd568 -EBUILD git-2.20.1.ebuild 18972 BLAKE2B 0188e866182b482014a4ba3349d716d9c753c4477fa8c7a5318ac1b4eabf4946088fe198111df456ab59e763078d4284cb07f7144a41ac2cfbf56b86a1a4ff1b SHA512 f3747ff71774e5264b37b79d018553f991a9cfe28b6e5c6b6886cb37261c6cedced077e9f5bf1b144c74ccc63c9ef79ab46881593132405fd23026028b8054a1 -EBUILD git-2.21.0-r1.ebuild 19034 BLAKE2B f129fa83dd893fa0f5c0280d46a6d6529443d02fb8a8ba0d44c43725b6e99dd9fa8d14259c91f98a0032af04f7d22170e12d31f4fa51228d3f870087b19cc366 SHA512 c23c68b9237962328b5f74c8572e50d460549bbf383d3f43b9868c6c41d7d8e54cca90b7a8d4ed6b210a74a433ff29d4b268d550dbdf0c5df56b24ca73b5bea8 -EBUILD git-2.21.0.ebuild 19017 BLAKE2B 68a828e434064dac45182e7965bb7eaefd02e74477d65c1bde406f969d21f135114b9072bd989b2359c134f30017fa4c8f820632042b9c734dc8be4093b108ae SHA512 f03a335b84800e504aa7702158a55f1da20d42ba04540a4b78b712021399491e74bf328b610fe982b847579cd68df4430973c674475dfbfc32df6bf9d39bbb02 -EBUILD git-9999-r1.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 -EBUILD git-9999-r2.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 -EBUILD git-9999-r3.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 -EBUILD git-9999.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307 +EBUILD git-2.19.2.ebuild 19013 BLAKE2B 5ac67e85648aeaca6ccf506c0348b7d21509c7f9a463309a5657f2f4dcdf1136c65559c6b8aa3159fb2b91c39d5dc4af35755bb32498645ec554e769bedf72cf SHA512 99bfefa79aa4b00a0dbcfcb944efb6dcc5fdbfa5927c6b6d84ce03a1410f206e753f1a62c4ca960b3b016081b37c30280436cbf4028caf18ea27c454bb9b0dac +EBUILD git-2.20.1.ebuild 19026 BLAKE2B d5a503c9590d6bf2381bed1925e2776717a57b6a0ae78ecc493a26345813b10a149dfd929cb9d0a3761fd386b57dfd0ba6cb24e57e6c8248124cc64f384628e2 SHA512 75c7bc502304e1b3950ddc4b0780d926eefcce807cdfbfedea1d9c301a2acff0d60f4d021d98d4a00ddfa89db935cd1fb2400aa9bb7067ebded929867c14c950 +EBUILD git-2.21.0-r1.ebuild 19095 BLAKE2B e1ed98b0bd611ddd17c61b515d5cdaf7faa39e92529a2c44bef953d8e17ecaf64d15d0b30ecff3283a84d77624477bf3b167cf9a4207813e8ca72c96ccbbcc89 SHA512 ad46d5d49b4fdf2561e1780d289f310a5da9585c965e9d1450045a7ba6986e866a314fb2786623706ab208cd0bcc8ab4a64d25f439a8d81e0d8e0c4a7fb564e8 +EBUILD git-2.21.0-r2.ebuild 19233 BLAKE2B 1ba25b97b8df5b564e3b7890ed4fcb637c041fde45c9b6497c7ad8fcebf4fe9b760e9edf7664f4557721adb57ff5ad0449026d4db21b59f7165e46d32198a592 SHA512 96cc611a321447780ec996492dfffe542576f64b3a0284dd2e011c95f8e5a631c31db186e5dc1dde9350ac38e13b4084cbe52b45ed68d3c03c0839fac84deb74 +EBUILD git-2.21.0.ebuild 19070 BLAKE2B fb5bca963913d9994c90e553cb27ae70596e180ed97d029adf38ae01ed27f48b19b52607df31b93b0485bcdbcac433d5b935e580230b2986a1ecf4af30c3d92e SHA512 f071bca6a089fb96ea19615d4919c5e52538bcdb92251b85741fe6d61d4fce3ea5892f040058c90d3ea89805630f1725f5d0795086a713ffa323a1212ac3406a +EBUILD git-9999-r1.ebuild 19150 BLAKE2B 1e719399bcbcf524a3f4f1da1bdaeecf465f062304149cbf18fc85d8e3ca592c6ff53350f63fc57ae1d72d361ee75a77b1b2d29495c053841c24f087d49568dc SHA512 adfd00305cca5fca35c8b1b4ec479af20bac97e480df7151c3ef1d6f31f934653cf94f99e342e720452fa41559d6ac039009ccf82f280990b2a88f4e686910a3 +EBUILD git-9999-r2.ebuild 19150 BLAKE2B 1e719399bcbcf524a3f4f1da1bdaeecf465f062304149cbf18fc85d8e3ca592c6ff53350f63fc57ae1d72d361ee75a77b1b2d29495c053841c24f087d49568dc SHA512 adfd00305cca5fca35c8b1b4ec479af20bac97e480df7151c3ef1d6f31f934653cf94f99e342e720452fa41559d6ac039009ccf82f280990b2a88f4e686910a3 +EBUILD git-9999-r3.ebuild 19150 BLAKE2B 1e719399bcbcf524a3f4f1da1bdaeecf465f062304149cbf18fc85d8e3ca592c6ff53350f63fc57ae1d72d361ee75a77b1b2d29495c053841c24f087d49568dc SHA512 adfd00305cca5fca35c8b1b4ec479af20bac97e480df7151c3ef1d6f31f934653cf94f99e342e720452fa41559d6ac039009ccf82f280990b2a88f4e686910a3 +EBUILD git-9999.ebuild 19150 BLAKE2B 1e719399bcbcf524a3f4f1da1bdaeecf465f062304149cbf18fc85d8e3ca592c6ff53350f63fc57ae1d72d361ee75a77b1b2d29495c053841c24f087d49568dc SHA512 adfd00305cca5fca35c8b1b4ec479af20bac97e480df7151c3ef1d6f31f934653cf94f99e342e720452fa41559d6ac039009ccf82f280990b2a88f4e686910a3 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd diff --git a/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch b/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch new file mode 100644 index 000000000000..0874ea9352e9 --- /dev/null +++ b/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch @@ -0,0 +1,38 @@ +From a57994f2d78134936521375ba9798a1b7418e230 Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" <robbat2@gentoo.org> +Date: Fri, 12 Apr 2019 00:00:07 -0700 +Subject: [PATCH] submodule foreach: test foreach option swallowing + +Add a testcase for submodule foreach option parsing not knowing where to +stop taking options, and accidently removing options intended for +foreach target commands. + +CC: Duy Nguyen <pclouds@gmail.com> +CC: Prathamesh Chavan <pc44800@gmail.com> +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> +--- + t/t7407-submodule-foreach.sh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh +index 77729ac4aa..706ae762e0 100755 +--- a/t/t7407-submodule-foreach.sh ++++ b/t/t7407-submodule-foreach.sh +@@ -411,4 +411,14 @@ test_expect_success 'multi-argument command passed to foreach is not shell-evalu + test_cmp expected actual + ' + ++test_expect_success 'option-like arguments passed to foreach commands are not lost' ' ++ ( ++ cd super && ++ git submodule foreach "echo be --quiet" > ../expected && ++ git submodule foreach echo be --quiet > ../actual ++ ) && ++ grep -sq -e "--quiet" expected && ++ test_cmp expected actual ++' ++ + test_done +-- +2.21.0 + diff --git a/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch b/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch new file mode 100644 index 000000000000..adb0dfd582a1 --- /dev/null +++ b/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch @@ -0,0 +1,61 @@ +From git-owner@vger.kernel.org Wed Apr 10 11:18:40 2019 +Date: 10 Apr 2019 18:18:35 +0700 +Message-ID: <20190410111834.GA25638@ash> +From: "Duy Nguyen" <pclouds@gmail.com> +Sender: git-owner@vger.kernel.org +Subject: Re: regression AGAIN in output of git-pull --rebase --recurse-submodules=yes --quiet +References: <robbat2-20180120T054223-685328376Z@orbis-terrarum.net> + <robbat2-20190410T062730-540884809Z@orbis-terrarum.net> +List-ID: <git.vger.kernel.org> + +... + +If you run this with GIT_TRACE=1, you can see that --quiet is passed +to submodule--helper correctly. + +trace: built-in: git submodule--helper foreach --quiet git pull --quiet origin master + +The problem here is the option parser of this command would try to +parse all options, so it considers both --quiet the same thing and are +to tell "submodule--foreach" to be quiet, the second --quiet is not +part of the "git pull" command anymore. + +So the fix would be to pass "--" to stop option parsing. +submodule--helper should not parse options it does not understand +anyway. Something like this should work. + +-- 8< -- +diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c +index 6bcc4f1bd7..6394222628 100644 +--- a/builtin/submodule--helper.c ++++ b/builtin/submodule--helper.c +@@ -571,7 +571,7 @@ static int module_foreach(int argc, const char **argv, const char *prefix) + }; + + argc = parse_options(argc, argv, prefix, module_foreach_options, +- git_submodule_helper_usage, PARSE_OPT_KEEP_UNKNOWN); ++ git_submodule_helper_usage, 0); + + if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0) + return 1; +diff --git a/git-submodule.sh b/git-submodule.sh +index 2c0fb6d723..a967b2890d 100755 +--- a/git-submodule.sh ++++ b/git-submodule.sh +@@ -346,7 +346,7 @@ cmd_foreach() + shift + done + +- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} "$@" ++ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" + } + + # +-- 8< -- + +I'm a bit reluctant to follow up with a proper patch because I can't +digest the t5572-submodule-pull.sh tests. And we definitely need to +add a test case about --quiet to make sure it won't happen again. +-- +Duy + diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild index 7a8f583cf00b..cbf08ff619b6 100644 --- a/dev-vcs/git/git-2.19.2.ebuild +++ b/dev-vcs/git/git-2.19.2.ebuild @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs}" diff --git a/dev-vcs/git/git-2.20.1.ebuild b/dev-vcs/git/git-2.20.1.ebuild index 1b32a8338352..ac806f6a945c 100644 --- a/dev-vcs/git/git-2.20.1.ebuild +++ b/dev-vcs/git/git-2.20.1.ebuild @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs}" diff --git a/dev-vcs/git/git-2.21.0-r1.ebuild b/dev-vcs/git/git-2.21.0-r1.ebuild index da10d81239ce..dfad3a4abfcb 100644 --- a/dev-vcs/git/git-2.21.0-r1.ebuild +++ b/dev-vcs/git/git-2.21.0-r1.ebuild @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-2.21.0-r2.ebuild b/dev-vcs/git/git-2.21.0-r2.ebuild new file mode 100644 index 000000000000..c574cb141d80 --- /dev/null +++ b/dev-vcs/git/git-2.21.0-r2.ebuild @@ -0,0 +1,716 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" +if [[ ${PV} == *9999 ]]; then + SCM="git-r3" + EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. + # See https://git-scm.com/docs/gitworkflows#_graduation + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + esac +fi + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER="${MY_PV}" + +DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" +HOMEPAGE="https://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_KORG="mirror://kernel/software/scm/git" + [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + sys-libs/zlib + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre ) + ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:0= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) +" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( + dev-perl/Error + dev-perl/MailTools + dev-perl/Authen-SASL + cgi? ( + dev-perl/CGI + highlight? ( app-text/highlight ) + ) + cvs? ( + >=dev-vcs/cvsps-2.1:0 + dev-perl/DBI + dev-perl/DBD-SQLite + ) + mediawiki? ( + dev-perl/DateTime-Format-ISO8601 + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + subversion? ( + dev-vcs/subversion[-dso,perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) + ) + python? ( ${PYTHON_DEPS} ) +" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE="50${PN}-gentoo.el" +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + mediawiki-experimental? ( mediawiki ) + subversion? ( perl ) + webdav? ( curl ) + pcre-jit? ( pcre ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +PATCHES=( + # bug #350330 - automagic CVS when we don't want it is bad. + "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + + "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules.patch + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch +) + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]"; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts=( + ASCIIDOC_NO_ROFF=YesPlease + $(usex cvs '' NO_CVS=YesPlease) + $(usex elibc_musl NO_REGEX=YesPlease '') + $(usex iconv '' NO_ICONV=YesPlease) + $(usex nls '' NO_GETTEXT=YesPlease) + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) + $(usex python '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) + $(usex tk '' NO_TCLTK=YesPlease) + ) + + if use blksha1 ; then + myopts+=( BLK_SHA1=YesPlease ) + elif use ppcsha1 ; then + myopts+=( PPC_SHA1=YesPlease ) + fi + + if use curl ; then + use webdav || myopts+=( NO_EXPAT=YesPlease ) + else + myopts+=( NO_CURL=YesPlease ) + fi + + # broken assumptions, because of static build system ... + myopts+=( + NO_FINK=YesPlease + NO_DARWIN_PORTS=YesPlease + INSTALL=install + TAR=tar + SHELL_PATH="${EPREFIX}/bin/sh" + SANE_TOOL_PATH= + OLD_ICONV= + NO_EXTERNAL_GREP= + ) + + # For svn-fe + extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die + + if use pcre; then + if use pcre-jit; then + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) + else + myopts+=( + USE_LIBPCRE1=YesPlease + NO_LIBPCRE1_JIT=YesPlease + ) + extlibs+=( -lpcre ) + fi + fi +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=( +# NO_MMAP=YesPlease +# NO_IPV6=YesPlease +# NO_STRLCPY=YesPlease +# NO_MEMMEM=YesPlease +# NO_MKDTEMP=YesPlease +# NO_MKSTEMPS=YesPlease +# ) +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=( NO_NSEC=YesPlease ) + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=( + NEEDS_LIBICONV=YesPlease + HAVE_CLOCK_MONOTONIC=1 + ) + grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + myopts+=( HAVE_GETDELIM=1 ) + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=( ASCIIDOC8=YesPlease ) + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + if [[ "${CHOST}" == *-uclibc* ]] ; then + myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi + + export MY_MAKEOPTS="${myopts[@]}" + export EXTLIBS="${extlibs[@]}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" || die + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + if use doc ; then + pushd "${S}"/Documentation &>/dev/null || die + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + popd &>/dev/null || die + fi + else + git-r3_src_unpack + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # add experimental patches to improve mediawiki support + # see patches for origin + if use mediawiki-experimental ; then + PATCHES+=( + "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch + "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch + "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch + ) + fi + + default + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die +} + +git_emake() { + # bug #320647: PYTHON_PATH + local PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ + sysconfdir="${EPREFIX}"/etc \ + DESTDIR="${D}" \ + GIT_TEST_OPTS="--no-color" \ + OPTAR="$(tc-getAR)" \ + OPTCC="$(tc-getCC)" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + PERL_PATH="${EPREFIX}/usr/bin/perl" \ + PERL_MM_OPT="" \ + PYTHON_PATH="${PYTHON_PATH}" \ + V=1 \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb \ + || die "emake gitweb (cgi) failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + pushd contrib/credential/osxkeychain &>/dev/null || die + git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ + || die "emake credential-osxkeychain" + popd &>/dev/null || die + fi + + pushd Documentation &>/dev/null || die + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi + popd &>/dev/null || die + + if use subversion ; then + pushd contrib/svn-fe &>/dev/null || die + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv=() + use nls && use !elibc_glibc && nlsiconv+=( -lintl ) + use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ + || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} \ + || die "emake svn-fe.1 svn-fe.html failed" + fi + popd &>/dev/null || die + fi + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + git_emake || die "emake git-credential-libsecret failed" + popd &>/dev/null || die + fi + + pushd contrib/subtree &>/dev/null || die + git_emake + use doc && git_emake doc + popd &>/dev/null || die + + pushd contrib/diff-highlight &>/dev/null || die + git_emake + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake + popd &>/dev/null || die + + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + local d + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + if use doc ; then + docinto ${d}/html + dodoc Documentation${d}*.html + fi + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + pushd contrib/subtree &>/dev/null || die + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake install + popd &>/dev/null || die + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + dobin git-credential-libsecret + popd &>/dev/null || die + fi + + if use subversion ; then + pushd contrib/svn-fe &>/dev/null || die + dobin svn-fe + dodoc svn-fe.txt + if use doc ; then + doman svn-fe.1 + docinto html + dodoc svn-fe.html + fi + popd &>/dev/null || die + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + local contrib_objects=( + buildsystems + fast-import + hg-to-git + hooks + remotes2config.sh + rerere-train.sh + stats + workdir + ) + local i + for i in "${contrib_objects[@]}" ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED%/}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + if test -d "${d}" ; then find "${d}" \ + -name .packlist \ + -delete || die + fi + done + else + rm -rf "${ED%/}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED%/}"/usr/libexec/git-core/git-svn \ + "${ED%/}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod + + # Remove disabled linguas + # we could remove sources in src_prepare, but install does not + # handle missing locale dir well + rm_loc() { + if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then + rm -r "${ED%/}/usr/share/locale/${1}" || die + fi + } + l10n_for_each_disabled_locale_do rm_loc +} + +src_test() { + local disabled=() + local tests_cvs=( + t9200-git-cvsexportcommit.sh + t9400-git-cvsserver-server.sh + t9401-git-cvsserver-crlf.sh + t9402-git-cvsserver-refs.sh + t9600-cvsimport.sh + t9601-cvsimport-vendor-branch.sh + t9602-cvsimport-branches-tags.sh + t9603-cvsimport-patchsets.sh + t9604-cvsimport-timestamps.sh + ) + local tests_perl=( + t3701-add-interactive.sh + t5502-quickfetch.sh + t5512-ls-remote.sh + t5520-pull.sh + t7106-reset-unborn-branch.sh + t7501-commit.sh + ) + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot=( + t0001-init.sh + t0004-unwritable.sh + t0070-fundamental.sh + t1004-read-tree-m-u-wf.sh + t3700-add.sh + t7300-clean.sh + ) + # t9100 still fails with symlinks in SVN 1.7 + local test_svn=( t9100-git-svn-basic.sh ) + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled+=( t5000-tar-tree.sh ) + fi + + local cvs=0 + use cvs && let cvs=${cvs}+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ ${cvs} -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled+=( ${tests_cvs[@]} ) + fi + einfo "Skipping other tests that require being non-root" + disabled+=( ${tests_nonroot[@]} ) + else + [[ ${cvs} -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=${cvs}+1 + [[ ${cvs} -gt 1 ]] && \ + has_version "dev-vcs/cvs[server]" && \ + let cvs=${cvs}+1 + if [[ ${cvs} -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled+=( ${tests_cvs[@]} ) + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled+=( ${tests_perl[@]} ) + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled+=( ${test_svn[@]} ) + + # Reset all previously disabled tests + pushd t &>/dev/null || die + local i + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled[@]} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i Makefile || die + + # Clean old results first, must always run + nonfatal git_emake clean + popd &>/dev/null || die + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + local rc + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + pushd t &>/dev/null || die + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." + elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + elog "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo + use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild index 7f9badb1427e..831b98dc4431 100644 --- a/dev-vcs/git/git-2.21.0.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 202ebcd97b24..fd9fa17c02f6 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -363,9 +366,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" + git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -377,8 +381,8 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree{,.1} + use doc && git_emake git-subtree.html popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -394,9 +398,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -446,9 +448,9 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install install-man || die "Failed to emake install install-man git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + git_emake install-html || die "Failed to emake install-html git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,9 +485,9 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe + doman svn-fe.1 dodoc svn-fe.txt if use doc ; then - doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 202ebcd97b24..fd9fa17c02f6 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -363,9 +366,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" + git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -377,8 +381,8 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree{,.1} + use doc && git_emake git-subtree.html popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -394,9 +398,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -446,9 +448,9 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install install-man || die "Failed to emake install install-man git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + git_emake install-html || die "Failed to emake install-html git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,9 +485,9 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe + doman svn-fe.1 dodoc svn-fe.txt if use doc ; then - doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 202ebcd97b24..fd9fa17c02f6 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -363,9 +366,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" + git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -377,8 +381,8 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree{,.1} + use doc && git_emake git-subtree.html popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -394,9 +398,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -446,9 +448,9 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install install-man || die "Failed to emake install install-man git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + git_emake install-html || die "Failed to emake install-html git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,9 +485,9 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe + doman svn-fe.1 dodoc svn-fe.txt if use doc ; then - doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 202ebcd97b24..fd9fa17c02f6 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then SCM="git-r3" @@ -69,6 +69,7 @@ CDEPEND=" webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -164,7 +165,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -241,8 +242,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -363,9 +366,10 @@ src_compile() { use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ || die "emake svn-fe failed" + git_emake svn-fe.1 || die "emake svn-fe.1 failed" if use doc ; then - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 svn-fe.html failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -377,8 +381,8 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree{,.1} + use doc && git_emake git-subtree.html popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -394,9 +398,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -446,9 +448,9 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install install-man || die "Failed to emake install install-man git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + git_emake install-html || die "Failed to emake install-html git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,9 +485,9 @@ src_install() { if use subversion ; then pushd contrib/svn-fe &>/dev/null || die dobin svn-fe + doman svn-fe.1 dodoc svn-fe.txt if use doc ; then - doman svn-fe.1 docinto html dodoc svn-fe.html fi diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest index f6b63cec712c..98529d400535 100644 --- a/dev-vcs/gitg/Manifest +++ b/dev-vcs/gitg/Manifest @@ -1,5 +1,5 @@ DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d DIST gitg-3.30.1.tar.xz 10555888 BLAKE2B 02e8f957eee82bbf0702ca39b5b336929c131a93a94f5e28a2e4aa7c2c473c5d8bda072eba184cef37d6ad2fa7bfa21c007c86204a0a81b6d401487d752952fd SHA512 0d9241422dda6bf1840632fbcabf6b640554081ba995eba59ce90f893654e42c0ca8953e814533b90f362abb13b002e7a74b5f6841aee1f33c2834d2acab869f -EBUILD gitg-3.26.0.ebuild 1927 BLAKE2B 97bb1f4da59bcf28643516ca55e054fe6405765dee0ef2bd70cedf6fc29ec2d422767d4dce420afe5900e5759e4f1b82d0b88b971e4ca59cfee9cbfe1e7b53f2 SHA512 fd96b0f937e1beaba697bd5449f6cf916809d4e121594acf405cdb98a156dae4f640ac2972f768cfb213649455948f3d008218fe7a7e0c052686be43185db217 -EBUILD gitg-3.30.1.ebuild 1944 BLAKE2B fe99fdadd1633c07920a7106b1a71aa12f68c71d2c63d9fa6fc113f7cd3c7b3fe2c2897aadbe7fccd1b83a470b3c4d1d821bc9360a01efb58530130b4d445958 SHA512 15c94b1d1f9ab6131b2406f605a6e4f36bff8913ddeb23682ed4bfb25bfc00430a73cd38bccbab143f1a7667adb45abf66d7a7256ed0af34cbae2cdde22bc656 +EBUILD gitg-3.26.0.ebuild 1922 BLAKE2B 7b86abf6af11e82908ddabe99737ee663a63b407b80562545b34b6b9252937185e85c9cc2fa7007f33bcbdcfc2865daf30361b77b849c298624cc5ff1e02cf1b SHA512 b99a42a88bc033d5425d7dfb21054f594f1a1255ca77befc387320d33d4df92c54c41d7bf322363fe5b93bb669ba4729e68f9992d382c7e644065dddf1fdc5c4 +EBUILD gitg-3.30.1.ebuild 1942 BLAKE2B 12feca54eaaf676b14aac41a4f4c805a2a2f5df5acab6e4be8e7dc3fe54a8aaea067d8e74e8cba9d3da760edbfbce0e103553380ea5b504ed80c376cd95f4988 SHA512 090749745016a612ad59308ffe1d80507f81e4cc4170fd1bfacbcb061a5572215592d2378734bf00426c9cb0171396a62517c93f0671fa2be3346cb170081540 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30 diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild index c9365256aab7..46818ef6d31e 100644 --- a/dev-vcs/gitg/gitg-3.26.0.ebuild +++ b/dev-vcs/gitg/gitg-3.26.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found inherit gnome2 pax-utils python-r1 vala diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild index 338a545b1e50..82d402136f84 100644 --- a/dev-vcs/gitg/gitg-3.30.1.ebuild +++ b/dev-vcs/gitg/gitg-3.30.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6,7} ) +PYTHON_COMPAT=( python3_{5,6,7} ) VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest index b7a918953cc4..7a43328f1df2 100644 --- a/dev-vcs/gitolite-gentoo/Manifest +++ b/dev-vcs/gitolite-gentoo/Manifest @@ -28,6 +28,7 @@ EBUILD gitolite-gentoo-3.6.4.1-r1.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924 EBUILD gitolite-gentoo-3.6.4.1.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0 EBUILD gitolite-gentoo-3.6.4.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0 EBUILD gitolite-gentoo-3.6.5.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c +EBUILD gitolite-gentoo-3.6.6.1-r1.ebuild 2822 BLAKE2B 54201f3e814df8458ee90ec9524593e6450da69f2a1fd963a75f3273fe20afc737f8302dc8d1cf46a2f1fcb50a9e09695a26465d3d7d49daa40b528f95db388e SHA512 044bc927329b9ce7735783309051b28d1a97e9126c1e6e753bbe646408aeaccc80187188a761eff4c28951a64811c6ba88405404b525669ff55b34d1258bda34 EBUILD gitolite-gentoo-3.6.6.1.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338 EBUILD gitolite-gentoo-3.6.6.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338 EBUILD gitolite-gentoo-9999.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild new file mode 100644 index 000000000000..b3f60acd4968 --- /dev/null +++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild @@ -0,0 +1,108 @@ +# 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="git://git.gentoo.org/proj/gitolite-gentoo" +EGIT_MASTER=master + +inherit perl-module user versionator ${SCM} + +DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork" +HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git" +if [[ ${PV} != *9999 ]]; then + SRC_URI="mirror://gentoo/${P}.tar.bz2" + KEYWORDS="~amd64 ~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 + vim-syntax? ( app-vim/gitolite-syntax ) + selinux? ( sec-policy/selinux-gitosis ) + >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 + dev-perl/JSON" + +PATCHES=( ) + +pkg_setup() { + enewgroup git + enewuser git -1 /bin/sh /var/lib/gitolite git +} + +src_prepare() { + default + echo "${PF}-gentoo" > 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 + + 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.html first!" + ewarn + elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:" + elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\"" + elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc" + ewarn + fi + + # bug 352291 + gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd) + if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then + 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 + fi +} diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest index 211894092cf6..364a6573ace1 100644 --- a/dev-vcs/hub/Manifest +++ b/dev-vcs/hub/Manifest @@ -1,13 +1,16 @@ DIST hub-2.10.0.tar.gz 1042511 BLAKE2B 8e95a6ce24ec9ed5c6d163346ab89a3a587d9f1700eed0773ae14473b06a1cbdba16ff5d75d3f64faa6b13382085a1cf8fb826e09cfd0ba3a0f0589f0abdc615 SHA512 6ded3a57f73fec226234e9b727d676a61a3312825c98cfb5d908ca45c163326352859a126e8b6c7f2e2302badc25a60c9c04c9184e4afab81c9f23d4555a045e +DIST hub-2.11.1.tar.gz 1043499 BLAKE2B af3ac833c874f15ce183a41a4b6920ba77b9d882b343e12fddeba58453c2c03cd45fa1ec3e7a488dc2d916d0e12f2cf14d7e4d749848d3a10e44b039e7efae49 SHA512 ee5a42713e7810d0e825c6bc1ca2313c5679693197ca6845e189cc18fbbce04e32e1a5f0e9d2735e5a127b2aeadc33446011fb747b96b3eb6e906cb0e87f5f27 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-2.7.1.tar.gz 998391 BLAKE2B 520f6f4edcae983bb65f56ddb44ef731a21a32e759df72311c77d87c103adaf83a8570b068767bbe49d65b614efbba9f6e5c9180794321dfc5f07c0ee925f3b2 SHA512 71232e443821dadc961d16f428cac01c0cc2adcd476e94727a5de430716826478803b8e6a881e2387103330122dd603180b546c99823c3c36942674185141714 DIST hub-linux-amd64-2.10.0.tgz 4295227 BLAKE2B 889dca0f5d750201d97d9eb1ab23cb781c2b12eb1cd7958c7816ee6c69dd344dc02b824754293071566b80ed7de24310d0ff78d690efb574de302910f16d6784 SHA512 5828977a14324a315a28dab1e25f7adf1671b14d24073cde550781eaaebee3f5f7c683a99329688dd86ac2e59252aa25f30c030d1a2f4bb8a7d135ec7bb88702 +DIST hub-linux-amd64-2.11.1.tgz 4294575 BLAKE2B b82c768100ba0959b9f7a8e61f0896cc1b0f516215f9c406cb2c2b1e19240a9bab7728129ad956ac1bc8380fc3395fc6430436bfc824be19443dbc2e270ba062 SHA512 e8f1053924eaec23784fb7a829e59d25fbb271165b576cc76060e66755a485b8cd91b48869bf2e4b87790907aa0c22857ca6981a798f19f55d638944b3275c6b 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 DIST hub-linux-amd64-2.7.1.tgz 4263689 BLAKE2B bf30e98455d6afe98cb32e9253cbf99fadc39a821d44844ae6b35f909c5ce2b760d04a0cc3eba5743443c7014109f02805779277ce43fffddd1e7697904b6f49 SHA512 ae12658460aa2752cd245712a4c1035d738fd7e47a096999515b6fe381ab4741fb80bad75b8d9b0070a8cc83a5a2d4c90dc4a4f18019b9dae9817fe2c08703ca EBUILD hub-2.10.0.ebuild 1147 BLAKE2B 878208535c658995bdf760fc48386dd24eb2ca3f5a6a7e4dc77846311f77919c94fed1a3a77a1bfaeebb63243d8621032a48c31723164672d6ada7584607f3c2 SHA512 e0eda94b80e52b63f5674dc7aab31f702776d8d714323b36b81e9ebd85a4549b5f945a8c2c0115af5524c2d0f9d87df296720c16eead22e936a91ead28caa9d6 +EBUILD hub-2.11.1.ebuild 1139 BLAKE2B 366d37f8de51f0c3a69385231e28fb7c7352f4fab6de919d09d441c0f1dc6bbb5264289705af5f10991cbeb611924da905fe748d44ca3e7be0dd168bd33cf978 SHA512 b4822a66dbe0e317ad44ebc762554fab82981e79f649ee34d62b936f28097a95b3fe8d1a90d34bb98ae63d3a3a31a7850f6868ec8def2aaf206b3c9eef0fac68 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 1111 BLAKE2B 814d6505802b70ebc861e9f68a21ee37058932e66bdef4ff79fc78a693bac1c051f9b2278b55c06719183674b7c8e739df6754e737f36a7ab3d2c6c2948b1761 SHA512 e4ae0037249875c397b541aa50b2c193a7c63c5e6b88f10c6bb8296490e6a5aa217209278601bd69d2816fe10dde610d745354941171de2c19e26fce25a682b5 diff --git a/dev-vcs/hub/hub-2.11.1.ebuild b/dev-vcs/hub/hub-2.11.1.ebuild new file mode 100644 index 000000000000..c7c9daaf3033 --- /dev/null +++ b/dev-vcs/hub/hub-2.11.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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() { + GOCACHE="${T}"/go-cache \ + GOPATH= \ + LDFLAGS= \ + ./script/build -o ${PN} || die +} + +#src_test() { +# ./script/test || die +#} + +src_install() { + dobin ${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 def28a6c07cf..052b4b9b24cf 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -2,15 +2,11 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 AUX mercurial-4.8.1-unbundle_zstd.patch 393 BLAKE2B 8556147baa6e493ee81aef1a68b2b6372ba094c6d5c73e97faa3f2da48179085ad475fe8d646916d3fb3294a166abec4a8b2a5b5e00cfd8fdaf55290a745ef2a SHA512 003844caff3dd4df15db8a6a084ee71d456026dc9222bf469f9489a9946a9205a57db274a26dabdc2d73fdff24cfd291f70b99141f2c9aad6e58d0fe1a1e7254 -DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941 DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd -DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9ac15aef21284337924d13bd5b4b14684d729149c4b48bf8fde13679cf661d92da968943c3f04ea065729df42318c SHA512 04d3f97dd4a0f36c6f6d639d8eccc7e4f29b2dc211fa69e7fc17dae0eb954f2ddaaf04f70facc6b968a166db7c07ed80792575d7a27e80bc0c1a43fc38b5e536 -DIST mercurial-4.8.2.tar.gz 6870985 BLAKE2B 822cbfd09b299870b02b7e181c216557d4dcbb60abcb34a95d22b457f130ff2c84c4f85291b6cd4b0314acd9061ec0d416c96821c2daa8627cd7740965944103 SHA512 1010f20ea5ed081f2d5c58e97696027b2d06dd0471b39e88a1858d5409bcf59f2ccf360925c417495834fccba06e1525ae70894233164d617227814ca2277e20 +DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61055a2ad16506b8c1c9a932d6825ef01a63b31f5bdbdb25e8829badab72857f101d12576fb269572c3d03cb4e7abd SHA512 2265ab501e24a2d229ef29404ca35d318faf620db163ec33225348d53139f7b6cb121e935ce444ec697ced69697f43df57dd7199ad20c1ca6f0275d9744ce391 DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb -EBUILD mercurial-4.5.2.ebuild 3580 BLAKE2B 38b2b4d0255288f9f9179a1ccdbc7f5274d79d6bd54b52778b6830ace4db64245b62186e4a3184d12640f6e1936962904fbcccd1aea67972e5ddf8b323e1940a SHA512 224cb7c76ab471e09f8090441f2d50d1147d6c124ddb5b9ed1498abc7f1d3b0c35bc9c2a2ec6eda630055ef69b01b12d12d1c0d418203227656358303e6f2e17 EBUILD mercurial-4.6.2.ebuild 3581 BLAKE2B 9a619b0d2508dca3f8d883ba6845669307d56f262ddb3fd5154a1305c28a4bc63542691f64d9eef731673ec8a6ba11d9bfb9f9c52b76c1a7b796d23396b5ec48 SHA512 96ca6367f5cb5a1bf28a59fdbe408f79719674fc1604b6f3021c1403b22d4afe5427fcd8611a0bbc07f363a4c0140d668153fc8cbd9c2f19d109c1e799699896 -EBUILD mercurial-4.7.1.ebuild 3537 BLAKE2B 97176fa1ddffb88942dc6079e6d36a6edf822069079dbf29a4aeebd3ea0054b6ecf4dd4f8fd3ae49256380fe6961d45289c8ce25e61c4ae759d5316e0c1d48d1 SHA512 f37c8bf4060f48acdafb51ae189efefd60e7ad46dca136c419b74e187058b985b69d24eedb2be2d017ef6c948a0bb9216c263fcc7166dbe942b9a1eb56f6453d -EBUILD mercurial-4.8.2.ebuild 3812 BLAKE2B 9c0e45cfd188d64aa450011bfca668ddd279b1586a9cce2dd71b62673caa8ee8f50418a23724ee0d456606b33ef474480816bc9d210cbd3731c4337033a5ce82 SHA512 db503fe36beeba90ecb3134832b9ed86c89c246ce459054e5a694be9263d3c2e98aa0ada02e571e16e416741b3327e59c9d99f60474c4ceca75d58eaacbf9664 -EBUILD mercurial-4.9-r1.ebuild 3883 BLAKE2B 9bdab668469e0e0037625cf597a192eb817dcc732091bb0a24e13aade8cddf12a2a8d7875a0beb422d8345ccb88f57fdf34472b88362027fa835f92a8e21b9be SHA512 2ccc5e2a47e787a1d4d1f1bdd99534baae8c3196afc39376cbafdfb1084c1d629a36a042eaa006ebb1dcd7b50444fb414f3768409ee9fce1c6c66a609322a234 -EBUILD mercurial-9999.ebuild 4175 BLAKE2B 22d6cba47692486bd37371d324a514886dcc378c10868edb67229e6657912ebb846e70573eec1ecbf3cfabeb6211a31bdef4ec154e56aaac6afff410493cc5eb SHA512 457878af1028d7887651b1dae1518f81bdf8825a701ffcfa6e7f60045bf885d1b1703e69cef66b63ccdab082f5b56096ff5ebbcd7d6ae8b4c7a7c5428ed7df0b -MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 +EBUILD mercurial-4.9-r2.ebuild 3958 BLAKE2B 833bd8676a7a9c90dfe3d066efab9ce66cec55a26b8fa6716af38fe07f49778497e7cca7b2c91f3051a326ba6badb1a32ebbb0f79bf0aedb7b7b5cc64025805c SHA512 e7b65c2fd98a2852aedda543e7510092c1c877abb6c10a4b4aff76b030e428815c5e648130e3c344ec41c286290ff43ce08d1043f11b2168ce7595c7a433bb88 +EBUILD mercurial-4.9.1.ebuild 3965 BLAKE2B ea181cd48242ae132c7c4f77a0f0ae09cd1e707c2a5d02a76256177f133823964f24665562437ed06b768b950a8edc3f00b81cd8108e768ec51848aab438f61b SHA512 9baa58616d08e8f553cbe600ebd28071521d7b909d38d831c3ca7aa4899985bfc6084f526813f5857598882d15df4bd94eadc041f76ecc7c24e2fba436a3614e +EBUILD mercurial-9999.ebuild 4321 BLAKE2B ae7ccadf37710c8bb40a28f61a7f950de9a9f318c71f622334a61ddc5e4d3479ce6f11686cb040e64d06aa7ac91fa8e0d051d5932495a7103799c28b75020191 SHA512 4b3477cf3ab19655c403c713b409a676e63f3f1a555e189158b50f460747136b58257df5960fcc514a1e7abaa6a709f91ffd2f98277012d2be9a284e99f205bc +MISC metadata.xml 524 BLAKE2B f7cbb22ba27d9d14c7ae81d6e5c3d2e415548b1902bb9f7229a08f5803855bffa22d5471b8c5ef7c3e59ea8e17c4a174bcadbc5553d4610ff55bf1852c69cb4e SHA512 8996da1193697d52d3eadcf27c77ef0195bd0982549e1578bdf3560df50d6bfdbb05a104cb416d516d2782a6df56a47e5e2731d01c1515f0a047c7848a63b7c5 diff --git a/dev-vcs/mercurial/mercurial-4.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild deleted file mode 100644 index f1ffee5400f7..000000000000 --- a/dev-vcs/mercurial/mercurial-4.5.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -# Too many tests fail #608720 -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/{win32,macosx} || die - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS - cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die - - dobin hgeditor - dobin contrib/hgk - python_foreach_impl python_doscript contrib/hg-ssh - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 - *.el mercurial.spec) - for f in ${RM_CONTRIB[@]}; do - rm -r contrib/$f || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - - insinto /etc/mercurial/hgrc.d - doins "${FILESDIR}/cacerts.rc" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/mercurial/mercurial-4.7.1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1.ebuild deleted file mode 100644 index 5b60d94346eb..000000000000 --- a/dev-vcs/mercurial/mercurial-4.7.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="https://www.mercurial-scm.org/" -SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" - -RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - app-misc/ca-certificates" -DEPEND="emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -# Too many tests fail #608720 -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) - -python_prepare_all() { - # fix up logic that won't work in Gentoo Prefix (also won't outside in - # certain cases), bug #362891 - sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - strip-flags -ftracer -ftree-vectorize - # Note: make it impl-conditional if py3 is supported - append-flags -fno-strict-aliasing - - "${PYTHON}" setup.py build_mo || die -} - -python_compile_all() { - rm -r contrib/win32 || 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" -} - -src_test() { - pushd tests &>/dev/null || die - rm -rf *svn* # Subversion tests fail with 1.5 - rm -f test-archive* # Fails due to verbose tar output changes - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - #rm -f test-doctest* # doctest always fails with python 2.5.x - rm -f test-largefiles* # tends to time out - - popd &>/dev/null || die - distutils-r1_src_test -} - -python_test() { - local TEST_DIR - - rm -rf "${TMPDIR}"/test - distutils_install_for_testing - cd tests || die - "${PYTHON}" run-tests.py --verbose \ - --tmpdir="${TMPDIR}"/test \ - --with-hg="${TEST_DIR}"/scripts/hg \ - || die "Tests fail with ${EPYTHON}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-vcs/cvs" - elog " dev-vcs/darcs" - elog " dev-vcs/git" - elog " dev-vcs/monotone" - elog " dev-vcs/subversion" -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/mercurial/mercurial-4.8.2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild index 4f165402a1f0..45e70b817358 100644 --- a/dev-vcs/mercurial/mercurial-4.8.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild @@ -14,8 +14,8 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+chg bugzilla emacs gpg test tk" RDEPEND="app-misc/ca-certificates dev-python/zstandard[${PYTHON_USEDEP}] @@ -58,6 +58,9 @@ python_configure_all() { 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!" @@ -86,6 +89,13 @@ python_install_all() { fi local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion wix 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 -r contrib/${f} || die done diff --git a/dev-vcs/mercurial/mercurial-4.9-r1.ebuild b/dev-vcs/mercurial/mercurial-4.9.1.ebuild index d8cadd73e519..c47475c298ef 100644 --- a/dev-vcs/mercurial/mercurial-4.9-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-4.9.1.ebuild @@ -14,8 +14,8 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bugzilla emacs gpg test tk" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+chg bugzilla emacs gpg test tk" RDEPEND="app-misc/ca-certificates dev-python/zstandard[${PYTHON_USEDEP}] @@ -58,7 +58,9 @@ python_configure_all() { python_compile_all() { rm -r contrib/win32 || die - emake -C contrib/chg + if use chg; then + emake -C contrib/chg + fi if use emacs; then cd contrib || die elisp-compile mercurial.el || die "elisp-compile failed!" @@ -86,10 +88,14 @@ python_install_all() { elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi - dobin contrib/chg/chg - doman contrib/chg/chg.1 + local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion wix plan9 *.el ) + + if use chg; then + dobin contrib/chg/chg + doman contrib/chg/chg.1 + RM_CONTRIB+=( chg ) + fi - local RM_CONTRIB=( chg hgk hg-ssh bash_completion zsh_completion wix plan9 *.el ) for f in ${RM_CONTRIB[@]}; do rm -r contrib/${f} || die done diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 797fc104685b..39b4c67502eb 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -16,7 +16,7 @@ EHG_REVISION="@" LICENSE="GPL-2+" SLOT="0" KEYWORDS="" -IUSE="bugzilla emacs gpg test tk zsh-completion" +IUSE="+chg bugzilla emacs gpg test tk zsh-completion" RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) gpg? ( app-crypt/gnupg ) @@ -52,6 +52,9 @@ python_configure_all() { python_compile_all() { rm -r contrib/{win32,macosx} || die emake doc + if use chg; then + emake -C contrib/chg + fi if use emacs; then cd contrib || die elisp-compile mercurial.el || die "elisp-compile failed!" @@ -83,6 +86,13 @@ python_install_all() { local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9 *.el mercurial.spec) + + 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 diff --git a/dev-vcs/mercurial/metadata.xml b/dev-vcs/mercurial/metadata.xml index 6f2bedbfd600..8abebf1fdf19 100644 --- a/dev-vcs/mercurial/metadata.xml +++ b/dev-vcs/mercurial/metadata.xml @@ -6,6 +6,7 @@ <name>Lars Wendler</name> </maintainer> <use> + <flag name="chg">Support Mercurial command server client</flag> <flag name="bugzilla">Support bugzilla integration.</flag> <flag name="gpg">Support signing with GnuPG.</flag> <flag name="tk">Install dev-lang/tk for hgk script.</flag> diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest index fa2e2d5c9cff..873fecc5c796 100644 --- a/dev-vcs/notify-webhook/Manifest +++ b/dev-vcs/notify-webhook/Manifest @@ -1,3 +1,3 @@ DIST notify-webhook-0.1.0.tar.gz 17525 BLAKE2B 947027414bd30f96c9e27ca8b7f965a077792a6b8962180094df6bdeef8261140c063041f1b6598c518edfd3b6807da5020a4640aadbddb202887bac91d3b51d SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4 -EBUILD notify-webhook-0.1.0.ebuild 655 BLAKE2B 8102f5779b6d32c70c40d61af786d7a26be8dea3f76de42e81afd28f250aee524c573f75dfcf27e779d752ffc904af4e9202edef0403a94c8739aa8fc9321fa7 SHA512 16ba094c3d211d3551a6296fe9788ccb2f7d61b1d7e1dcd7efba8115da3082e734d75ec706f0801b6c3983b5854b7d2e8babbb58bec1ff4ffd5e00ae4441ea13 +EBUILD notify-webhook-0.1.0.ebuild 648 BLAKE2B 1c29cd51c8f9415add749586a4461fd62a1d3a03276772f27c81943115f1268615cbae16721e620a8315ff3f7f61f8dcd017022beee87fb852c044934d6ea3f8 SHA512 2fd52492fe6fb1f6afff68b34c5129e26840d7a23d33cd2ddba60c07b27421f1a8b394cc0232d85297ab7ed6149543ae593a8397ec28c9dfd610796bc86b5ac5 MISC metadata.xml 598 BLAKE2B d3cb099dbdcb844e0158112eaa1748c9587f88241860f1a862d852a96b1ea6fd01fd0e3555442cb6fbe066da5c61722c443f482f26154679fbbd0ac29c9fff3e SHA512 c4c8fd71b9c15c14f397a6bf65dab33907ba702d021315605dcebdbe565671b5e0a2df38d5166ef6ace416fbd0e2a03334b9525c450c2d9e726b194ca63ebf5e diff --git a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild index 5b121749659c..605285ee20d6 100644 --- a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild +++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python3_{4,5} pypy3 ) +PYTHON_COMPAT=( python3_5 pypy3 ) DESCRIPTION="Git post-receive web hook notifier in Python." HOMEPAGE="https://github.com/metajack/notify-webhook" diff --git a/dev-vcs/pwclient/Manifest b/dev-vcs/pwclient/Manifest index db851e8fe7c0..68e5c37ea6f8 100644 --- a/dev-vcs/pwclient/Manifest +++ b/dev-vcs/pwclient/Manifest @@ -2,5 +2,5 @@ AUX pwclient-20141110122616-0001-pwclient-handle-missing-.pwclientrc-better.patc AUX pwclient-20141110122616-0002-pwclient-use-print_function-for-better-py3-compatibi.patch 4005 BLAKE2B c591d837988f4d5f698ad9c723b77491ed547bb017f4382549b450856eaf570579ca3e1d8ac7506bac13282fd0527e177851171145104a3361a44664bc2c9ab8 SHA512 6bd87392b99a6339f71ab0ed47115a63a5ed43c0d3c1b8b56e2fdfd77ebb8f8692ae3074c6e858f44b1de5d9bd439042b9d50fa38c90712b62d524e4cfcb8ba3 AUX pwclient-20141110122616-0003-pwclient-basic-python3-support.patch 4223 BLAKE2B d4709dd5a2f18647e646cc285a52bad1aaab7637f9b96dc528cac429b39253f0f7c9361cf81f851edfc68337f3805a80f8ceb4bc63098a037aa7a70bdaddf3c5 SHA512 be178e4f303ff777ed870a029561802e2294a53feed1e9bbf546b0947cc1ae0ca5ede44c6e73018c1a3370e3df388f5dc921459d9f0730f1152078ff439acaab DIST pwclient-20141110122616 23527 BLAKE2B 61a49c6104db0015d0cf9ea4fddefe3ccde6495d0a0caf918d858e535bbbd085ee5a80f856753ea547b1ac18fb22344036734a5814d06865bde2622368b88155 SHA512 4933b7c5b4129d5fa1e47fa09dd8a75e5e5aac3254d8ed4bb65f8e7363d082217deecf8fc99f53092b607c49eebf9144e335079472a790a0193d0c6cddcf433f -EBUILD pwclient-20141110122616.ebuild 1053 BLAKE2B 92d1e35e6551828c250c973de5e91ebd429ab1483be8d1fe9c4c1fd28d15407448eb95d76a2c63637c357234e11bfd68107583e197a02f2e58045824b9d419bf SHA512 84d3287c8dfc3bd0c408b09a0cce78db126fd123dad760e6cd7f7837ab282367d1635a7d447f1d18ecb49676181e213f15c96a4acb1912f6f82d84ec1a3e975e +EBUILD pwclient-20141110122616.ebuild 1046 BLAKE2B 39db6c0dc15f1a523e0ca911c59aeeafc36b05e4b4d786dc7c8a243836083e79dfa1ad3203507682779fe72a5aaaaaaee0621780b156b288224dc31c949044a4 SHA512 96ea5abbaf50eca479fb23c1e517f86a9c0a8fb80a95528370423b8bf69f2b1ec43b8d1308866fbc7725d3d3d2e4988a548d980ba5dd83b0fb20245fcc3d32a5 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-vcs/pwclient/pwclient-20141110122616.ebuild b/dev-vcs/pwclient/pwclient-20141110122616.ebuild index 327b429fd3e1..9a0ace1caf6d 100644 --- a/dev-vcs/pwclient/pwclient-20141110122616.ebuild +++ b/dev-vcs/pwclient/pwclient-20141110122616.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit eutils python-r1 diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest index 1a8dad5ecf14..ebdaff1a3f59 100644 --- a/dev-vcs/python-gitlab/Manifest +++ b/dev-vcs/python-gitlab/Manifest @@ -1,3 +1,5 @@ DIST python-gitlab-1.7.0.tar.gz 110657 BLAKE2B 1003d3373d3ef5474b1d5c10b1c6af57e7467cec432fc1eb75b4e1ba7766361641f25461ac2bf1b7692dab855d4e5cbc204240ede3568e71ed1af75682807fb0 SHA512 ad50d989e27948ff5188f4191ad3b7f1e1b45608627b2042bf02d635b2aa8da0a24f6b0383f483a01df54e4ab14576e7e4252576b9c2bdf67a187ae6aad69d53 +DIST python-gitlab-1.8.0.tar.gz 115603 BLAKE2B 8ebebc1735e5531b4f95d82122b6ecf78fd541bce503f0cdf8c47b2ec2edab89efcad6c0ab39d82b57ffb8c3e341cb2160916b7df6c4886465e90557db3141c3 SHA512 4843aefb7cd363520e9065cfc08b81ec2c5c2c9cbdb5d6adbd35ec0f615bafd40e66746739c910b5e7e041f06e2aa9dc8beb8a884a714e6837cd5fb6fefb53be EBUILD python-gitlab-1.7.0.ebuild 1033 BLAKE2B b2aa8e06cd851f080922700d542e31ef7a9fa7f032096d5bfb10eb6f5fee2dd57da20b17e0f36e2eac69b56c0afd0a90712bc99fcba8dc2529fdf53f5d20bc3e SHA512 8860df6dfb71ebca1f93aead4cd72f40f922775468a153124c8a757fa94d5da1d23612879aa8e012466801af7e26f1aec0eb07ca9026f35f3a92e104ecf1feea +EBUILD python-gitlab-1.8.0.ebuild 1033 BLAKE2B b2aa8e06cd851f080922700d542e31ef7a9fa7f032096d5bfb10eb6f5fee2dd57da20b17e0f36e2eac69b56c0afd0a90712bc99fcba8dc2529fdf53f5d20bc3e SHA512 8860df6dfb71ebca1f93aead4cd72f40f922775468a153124c8a757fa94d5da1d23612879aa8e012466801af7e26f1aec0eb07ca9026f35f3a92e104ecf1feea MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 diff --git a/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild new file mode 100644 index 000000000000..2ee27c73fd03 --- /dev/null +++ b/dev-vcs/python-gitlab/python-gitlab-1.8.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6} ) + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +inherit distutils-r1 + +DESCRIPTION="Python command line interface to gitlab API" +HOMEPAGE="https://github.com/python-gitlab/python-gitlab/" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="test" + +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/testrepository[${PYTHON_USEDEP}] + dev-python/hacking[${PYTHON_USEDEP}] + dev-python/httmock[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.3 + dev-python/sphinx_rtd_theme )" + +RDEPEND="dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" + +python_install_all() { + distutils-r1_python_install_all + dodoc -r *.rst docs +} diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index c32c74ef6e90..5917d0a58cb9 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -6,5 +6,5 @@ DIST stgit-0.18.tar.gz 235852 BLAKE2B ff35856c1f20a6a611a2faa22ba573b1c33636c9e9 DIST stgit-0.19.tar.gz 246256 BLAKE2B ece625a0f78f4a80a9a20b25d0638ee71475029ebd861b28dccc444a70d631e687372031c2dee03faebc8890b8742674d6fd7c2ee1794e8a2d7044721a254847 SHA512 0edad0c600145fc779262ddae4300d4718fd04316face62cb1fb5c01e39cb0824355091863aae8d5b14bee9ebb36ac591e5e0dc9fe343c12a7c781227cac6330 EBUILD stgit-0.16-r2.ebuild 1732 BLAKE2B 2be40c1d991060b15413ae0c718b7b8793c1f8458fa0c52fc45e2e62568566975ac2c15c12b1f8065b475d9753f39dd92ae8095ee8c971c638d008da64ab82d3 SHA512 015a83ab10571d9000f0394c2173a56feac071ca6680ec9b4ee6b6e7c4be3a6e098a231be71bac87ddec9dfc415808f0a86dd30c4bb142493358d8558810cc0a EBUILD stgit-0.18.ebuild 1883 BLAKE2B 1ccceee2fb9c6b039ac956ef85444fdca246aacb75ff5a55c6351faf909a09d6148b173eba6cd7c0b0b5f54271050b83cd059979619036b9eb703c8c8b2de837 SHA512 2557043aa518718bc489ac2004a69f155a913c9bc38520cfec8c22daf2629a76d14baf6bd4cf8fc4ade0c2ee0c35974f5f33c5bc715aee1119791d26dbe7224e -EBUILD stgit-0.19.ebuild 1901 BLAKE2B a1de9f4320ba6f5c6b626c5bd256d1e1187b8d05714246b4817738ddf993971200c071d427aef2c038f6d7bebaf14f160845837ee9fb5af49ac38538726e2388 SHA512 2f7d22cbaba918cc475fe5621b4b31d37b1bce0d026391386f17aa11c5f0051b06579573b9f68d1079f546f941cdf9e9f762ab7958d782af4afda1b14101611c +EBUILD stgit-0.19.ebuild 1899 BLAKE2B f6daf01abf5f8171e0e6de03ba54433b5f9107eca8d2d757319f76cdd5b62b26c2a8ee9c9f9a0f1777156c9c0f90c0187951c519cfafbdcc53d35ec030cc9d21 SHA512 3d817026dabe0f1f85edf989fea02e810068e737ba2ec843999ffaf1c5404a8c42dbdeb0cee87339d9f35b0e208c7fe4357f9e7fb6a1e7aa835421c708958a16 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8 diff --git a/dev-vcs/stgit/stgit-0.19.ebuild b/dev-vcs/stgit/stgit-0.19.ebuild index cba2edd82da2..a8b4ca40db41 100644 --- a/dev-vcs/stgit/stgit-0.19.ebuild +++ b/dev-vcs/stgit/stgit-0.19.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit bash-completion-r1 distutils-r1 diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 518a010504ca..6f1fef82565b 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,17 +1,14 @@ AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d +AUX subversion-1.11.1-allow-apr-1.7.0+.patch 855 BLAKE2B d992df4a6a9bb3978000a3305a879fed88b6b7c1f3842e5d4707b1fccd93bdd17b10ea60b8ff2b54841c2d571005b05f3f0debc4a3b7dd38de2e625a9542396b SHA512 b781551ef5df86b10559ef1c328b53bbb8af8d6f77eb51e56a88189fd662d93c11da4fcfc033086760fdafecc9e33f6d9ec084fd13ecc8aa5174c73d57e767ed AUX subversion-1.9.7-fix-wc-queries-test-test.patch 1302 BLAKE2B ed1cd8a89ef9d1c5b2dbf5f094fee72b302e2f42d053f28efd3e9fb405b54e38bbaefd707bf87bf8bc1d06bd459d0fa8f3d3f96069595b4e65d6682a1c05cf8b SHA512 6319dfa3b6c47e4ed2035f8c7853c75e86d707abbdcd736f601b008f87b61d3a621dfc0779883eede3c1fb42ad2aa900c6393873530ba05dd11fba9af968f44a -AUX subversion-1.9.7-kf5.patch 9904 BLAKE2B 493c58c6567e2389bc9f33bb60981b22a2454c5bd5432bafcf33d9908f93cf93703fe106e1e3bb6c8d4227d3c8219c71c88f6af3f46846139d209749675e1e67 SHA512 9793c04d71b24e262d910f862b319842c0c819f71865d994351945ca2f15fef7f3a07c208c0b82ec50580b20d0732fe57f861842f03c44b4be9e7177f72e6354 AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 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.4.tar.bz2 8392477 BLAKE2B 93364178d2252332b070ebddd5791cb43e0000802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685 SHA512 c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d -DIST subversion-1.12.0-rc1.tar.bz2 8503704 BLAKE2B e9f2779155aa45ee0f60359d292c085c1a4bbb2237964d6c045278d7dff71e665662c3af8bfcd81139eb7c501f8f0923377c80348202d1dfb1c9087fafe5a1ed SHA512 b82205d6530ba36d29194382897dbf0b79bd81326eebdaf71f21d061d3759c4f77fecfc2f9f5e761bef9e2534eb4567d62b96618813be644059d5c20219ff546 -DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 -DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b -EBUILD subversion-1.10.4.ebuild 15398 BLAKE2B 7ca9109ba409c487c2fea0e4a22c2e02f5c7c299b47c4e6830877d50f97017934ec5e9e2adec365964669d812ee3147ec6746c5cf8249132f092028583c8000c SHA512 08a7a1e5da62c958eff5ab33810e0df22d03547ea0674048e5f0e85f2d5b212410f9529755d2eac55a38e57cf2e9614242dbb73b691f00e939a75a4118f7aa8a -EBUILD subversion-1.11.1.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921 -EBUILD subversion-1.12.0_rc1.ebuild 15360 BLAKE2B 7bc949661024a9b90b8b10f1821f98bc7609fef73480a2f738ab9ca6795fc18312069a19588c3a32af9f11c6b8f2568e600f3e6d274e0f14fef0d298e87630eb SHA512 349fa720c6bf02ed176b6a4d54413a519fb5bfcf262885cbf52c26ac98536db2f5ae6c599f93ba67ab3352a8784b68d3e40eee915f4cebbc602201420ce47baf -EBUILD subversion-1.9.7-r1.ebuild 15859 BLAKE2B 0e057b982dc5c69823580408b77e3961aed8f57f262034fdbc5ca5df53de038f7cbb4a9a51bffd50406bc386887da3482ea542a614f997ddfd3b27bbea2a85cf SHA512 3de363cf9407f1525cfd30655740966a641f2252d4b0d65ba997252cf699cafa951327d886f181370ebb53cfcaf3cd7d3bbfbdd4e9a8248ea0a332f4b969fe26 +DIST subversion-1.12.0.tar.bz2 8504473 BLAKE2B 21664158bf48ff1231b8ae25fd70971ee90ded5306bbf29a1e4a105fca9f15c4d8bfa4d7ab33fc5d10f86aa191120a1921d049b1fac6346cc643391a28d84997 SHA512 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 +EBUILD subversion-1.10.4.ebuild 15544 BLAKE2B 8259e0166a03c26fed0c9e8e56dd0271196545f4ac339571813a466005644e4e3391ca1bdb807730d077c884b5baf37ed35c384f9ab4218ff75e71e121e85808 SHA512 24eae69c983586bcc1218334a11ee85a98aeb11d5b1fc77706ac884809e8ec45b4bc596e480d0e2beaceda122c706f835ab483b3ce8b74cb6b6b100a78de6a54 +EBUILD subversion-1.11.1.ebuild 15553 BLAKE2B f95ddad2edeaea0eb8e24779d60089c5f653f8caaa96f802674df74d77e041c391f8d0bbde1f451f5f8fb18c36dfe09984bdfc2895a93b9781f8dcac6a280813 SHA512 a78b7b6a8877285ece8ee80288fd4b45c9687be8ac5541b505d5e201178e8fd23f7fe8647a1fa78349024b1a2409b57b64adf1bd6b6409fafd8d5009bc2eb59e +EBUILD subversion-1.12.0.ebuild 15506 BLAKE2B 4ebcab3299196e684b317c1758528638600d73b2e5f038ba97de45564a388523033ad920a1f137b1b2caeb0382181e15d49f936e945a9b55dc1ace8c61483265 SHA512 e8daf1dd5f42c65ae1a476dcbe1314c70248636202dbf2ccb2aa6e66a4e7de38fed9e02ce4e4fdfd0ce19fbf28bedd12a68929d48952f7a306c8934dec707bfc MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313 diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch new file mode 100644 index 000000000000..a0da4a5931df --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch @@ -0,0 +1,18 @@ +--- a/build/ac-macros/swig.m4 ++++ b/build/ac-macros/swig.m4 +@@ -137,13 +137,13 @@ + AC_CACHE_CHECK([for apr_int64_t Python/C API format string], + [svn_cv_pycfmt_apr_int64_t], [ + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], ++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="L"]) + fi + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r ++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="l"]) diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch deleted file mode 100644 index 5b692fa30668..000000000000 --- a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp ---- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731) -+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100 -@@ -39,8 +39,6 @@ - #include <QtCore/QString> - - #include <kaboutdata.h> --#include <kcmdlineargs.h> --#include <kcomponentdata.h> - #include <klocalizedstring.h> - #include <kwallet.h> - -@@ -221,14 +219,15 @@ - app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(q_argc, q_argv, -- get_application_name(parameters, pool), -- "subversion", -- ki18n(get_application_name(parameters, pool)), -- SVN_VER_NUMBER, -- ki18n("Version control system"), -- KCmdLineArgs::CmdLineArgKDE); -- KComponentData component_data(KCmdLineArgs::aboutData()); -+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ -+ -+ /* componentName appears in KDE GUI prompts */ -+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ -+ i18n(get_application_name(parameters, -+ pool)), /* displayName */ -+ QStringLiteral(SVN_VER_NUMBER)); -+ KAboutData::setApplicationData(aboutData); -+ - QString folder = QString::fromUtf8("Subversion"); - QString key = - QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); -@@ -291,14 +290,15 @@ - app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(q_argc, q_argv, -- get_application_name(parameters, pool), -- "subversion", -- ki18n(get_application_name(parameters, pool)), -- SVN_VER_NUMBER, -- ki18n("Version control system"), -- KCmdLineArgs::CmdLineArgKDE); -- KComponentData component_data(KCmdLineArgs::aboutData()); -+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ -+ -+ /* componentName appears in KDE GUI prompts */ -+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ -+ i18n(get_application_name(parameters, -+ pool)), /* displayName */ -+ QStringLiteral(SVN_VER_NUMBER)); -+ KAboutData::setApplicationData(aboutData); -+ - QString q_password = QString::fromUtf8(password); - QString folder = QString::fromUtf8("Subversion"); - KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); -unchanged: ---- a/build/ac-macros/compiler.m4 (revision 1798730) -+++ b/build/ac-macros/compiler.m4 (revision 1798731) -@@ -126,3 +126,18 @@ - SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option]) - fi - ]) -+ -+dnl The KWallet provider needs to use C++11 mode when using KDE 5 -+AC_DEFUN([SVN_CXX_MODE_SETUP11], -+[ -+ CXXFLAGS_KEEP="$CXXFLAGS" -+ CXXFLAGS="" -+ -+ if test "$GXX" = "yes"; then -+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) -+ fi -+ -+ CXXMODEFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS_KEEP" -+ AC_SUBST(CXXMODEFLAGS) -+]) -unchanged: ---- a/build/ac-macros/kwallet.m4 (revision 1798730) -+++ b/build/ac-macros/kwallet.m4 (revision 1802646) -@@ -25,8 +25,10 @@ - AC_DEFUN(SVN_LIB_KWALLET, - [ - AC_ARG_WITH(kwallet, -- [AS_HELP_STRING([[--with-kwallet[=PATH]]], -- [Enable use of KWallet (KDE 4) for auth credentials])], -+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]], -+ [Enable use of KWallet (KDE 5 or 4) for auth credentials. -+ PATH is the KDE install path, alternatively INCDIR:LIBDIR -+ are the header and library install paths. ])], - [svn_lib_kwallet="$withval"], - [svn_lib_kwallet=no]) - -@@ -42,40 +44,70 @@ - if test "$APR_HAS_DSO" = "yes"; then - if test -n "$PKG_CONFIG"; then - if test "$HAVE_DBUS" = "yes"; then -- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui]) -- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then -- AC_MSG_RESULT([yes]) -+ AC_MSG_CHECKING([for Qt]) -+ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then -+ AC_MSG_RESULT([yes, Qt5]) -+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui" -+ kde_config_name="kf5-config" -+ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n" -+ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core" -+ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then -+ AC_MSG_RESULT([yes, Qt4]) -+ qt_pkg_config_names="QtCore QtDBus QtGui" -+ kde_config_name="kde4-config" -+ kde_inc_names="/" -+ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore" -+ fi -+ if test -n "$qt_pkg_config_names"; then - if test "$svn_lib_kwallet" != "yes"; then -- AC_MSG_CHECKING([for kde4-config]) -- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config" -- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then -+ AC_MSG_CHECKING([for $kde_config_name]) -+ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name" -+ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then - AC_MSG_RESULT([yes]) - else -- KDE4_CONFIG="" -- AC_MSG_RESULT([no]) -+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then -+ AC_MSG_RESULT([unneeded]) -+ KDE_CONFIG="unneeded" -+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] -+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] -+ else -+ AC_MSG_RESULT([no]) -+ KDE_CONFIG="" -+ fi - fi - else -- AC_PATH_PROG(KDE4_CONFIG, kde4-config) -+ AC_PATH_PROG(KDE_CONFIG, $kde_config_name) -+ if test -n "$KDE_CONFIG"; then -+ kde_incdir="`$KDE_CONFIG --install include`" -+ kde_libdir="`$KDE_CONFIG --install lib`" -+ fi - fi -- if test -n "$KDE4_CONFIG"; then -- AC_MSG_CHECKING([for KWallet]) -+ if test -n "$KDE_CONFIG"; then -+ if test $kde_config_name = "kf5-config"; then -+ dnl KF5 does not compile with -std=c++98 -+ SVN_CXX_MODE_SETUP11 -+ fi - old_CXXFLAGS="$CXXFLAGS" - old_LDFLAGS="$LDFLAGS" - old_LIBS="$LIBS" -- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do -+ dnl --std=c++11 may be required -+ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS" -+ AC_MSG_CHECKING([for KWallet]) -+ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do - if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then - CPPFLAGS="$CPPFLAGS $d" - fi - done -- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" -- kde_incdir="`$KDE4_CONFIG --install include`" -- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir" -- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" -- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" -- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" -+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`" -+ for kde_inc_name in $kde_inc_names; do -+ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name" -+ done -+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes" -+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`" -+ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options" -+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC" - LIBS="$LIBS $SVN_KWALLET_LIBS" -- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" -- kde_libdir="`$KDE4_CONFIG --install lib`" -+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`" - LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`" - AC_LANG(C++) - AC_LINK_IFELSE([AC_LANG_SOURCE([[ -@@ -87,16 +119,19 @@ - AC_MSG_RESULT([yes]) - CXXFLAGS="$old_CXXFLAGS" - LIBS="$old_LIBS" -+ if test "$kde_config_name" = "kf5-config"; then -+ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available]) -+ fi - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot find KWallet]) - fi - else -- AC_MSG_ERROR([cannot find kde4-config]) -+ AC_MSG_ERROR([cannot find $kde_config_name]) - fi - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui]) -+ AC_MSG_ERROR([cannot find Qt]) - fi - else - AC_MSG_ERROR([cannot find D-Bus]) diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild index 27db0ff68b2e..ae74dc6cd387 100644 --- a/dev-vcs/subversion/subversion-1.10.4.ebuild +++ b/dev-vcs/subversion/subversion-1.10.4.ebuild @@ -130,6 +130,9 @@ pkg_setup() { append-cppflags -DSVN_DEBUG -DAP_DEBUG fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ @@ -152,6 +155,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild index a4a22eed9157..7c3f14bd27c1 100644 --- a/dev-vcs/subversion/subversion-1.11.1.ebuild +++ b/dev-vcs/subversion/subversion-1.11.1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~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=" @@ -126,6 +126,9 @@ pkg_setup() { 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 @@ -152,6 +155,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild b/dev-vcs/subversion/subversion-1.12.0.ebuild index 088d6446ba45..df6ddf73f8a5 100644 --- a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild +++ b/dev-vcs/subversion/subversion-1.12.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby26 ruby25 ruby24 ruby23" +USE_RUBY="ruby26 ruby25 ruby24" DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~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=" @@ -126,6 +126,9 @@ pkg_setup() { 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 @@ -151,6 +154,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild deleted file mode 100644 index b9444c0aaa89..000000000000 --- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby22 ruby21" -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils 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/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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 - >=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - 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} - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - http? ( virtual/pkgconfig ) - java? ( >=virtual/jdk-1.5 ) - kwallet? ( - kde-frameworks/kdelibs4support:5 - virtual/pkgconfig - ) - nls? ( sys-devel/gettext ) - test? ( ${PYTHON_DEPS} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -PATCHES=( - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch - "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch - "${FILESDIR}"/${P}-kf5.patch - "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch -) - -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() { - default - - 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 - 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 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED%/}"/etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED%/}"/etc/xinetd.d/svnserve || die - - # 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 - [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } - 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 ea81104cd1c4..c94a5b2870a0 100644 --- a/dev-vcs/svn2git/Manifest +++ b/dev-vcs/svn2git/Manifest @@ -1,10 +1,12 @@ 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 EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895 EBUILD svn2git-1.0.12.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1 +EBUILD svn2git-1.0.13-r1.ebuild 1147 BLAKE2B 99b5dc61a997636dcd2cfb68d4da3e7a62bb7c12eeb89f0be08ee53fb25cc96b75954003a2f83bba7969168cc9f186a9d0af35bcb6eb7f04ff39561b1fec9617 SHA512 dfb512df2de53488b400244a0c8658acd3d05e043615b48ca310724b3017db018d2103c6ddc5fdd2ec5554a172d17eb8b12d8fda3cbc62495d4d5f4e00cf5239 EBUILD svn2git-1.0.13.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1 EBUILD svn2git-9999.ebuild 1087 BLAKE2B 8eab32efa9f4e0a54a6a071a26bdd3aface14ffb0d6b9d621545d23b7f81fc9db41f2c299238191b40401dd2eec0b7bc010d26867705c39df4df03834beb9ce2 SHA512 36acedf8fe41f50789da0ecad078d6335ba50c10cf14eea2220ab9afa6a3c170a41cdec83acd8d6281bcd8abb3ef497917037bf95e2fcff2a778e6fb29dea508 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590 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 new file mode 100644 index 000000000000..74ee4306b3c1 --- /dev/null +++ b/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch @@ -0,0 +1,23 @@ +From 59a038796e6bb55b11b6d82f7d5aae42399da38a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= <Bjoern@Kautler.net> +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/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild new file mode 100644 index 000000000000..dc22eca75dd5 --- /dev/null +++ b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild @@ -0,0 +1,51 @@ +# 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 || die 'doins failed' + dobin svn-all-fast-export || die 'dobin failed' + dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' +} diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest index 143f9e0ad472..8e69bbe2b2f7 100644 --- a/dev-vcs/svneverever/Manifest +++ b/dev-vcs/svneverever/Manifest @@ -1,3 +1,3 @@ DIST svneverever-1.3.0.tar.gz 6006 BLAKE2B ab5b280f5aaba0cbe25cbbf1223930d4dff9f272666ede8845338bea77da6079de9b49be2c9efd346045be5a6af7a9a372365b577df27b0815a57179ce2e050f SHA512 dfc5f8e96808d95ce387b2c0d2ea34c4cae81851dc5813b05eeec719ae7cbfb69ff33f38a88429b1caab2873af676072ce3d76592d8fac5dd186f18454bade10 -EBUILD svneverever-1.3.0.ebuild 496 BLAKE2B fa476de18ab8a794081632c7020cf8f91f5d83f28875a5fa4f066cdc2fd33099063aac97e1050195a5bff9e15315663ef4f9e6a1eda34af0f7eebcfb0c50f7a2 SHA512 0bfb481d6c80408a792861c027c132742682f8b6afee3b710cc7dafaf827701c3ef1552e0d9dc1827542557f72b2f3271add4139e8773370dd29d7af8f833f5b +EBUILD svneverever-1.3.0.ebuild 489 BLAKE2B 87bcd9744c8c27a66e9d98564767c435f6cf305014f6c080a94db6ef3b4574da243ea8964ace318bc22ffda0fb02f1ca4793b1f9744399ba65e6b91d90a25cbb SHA512 79dfb6ecc90d24bf9e57c365572c8eff27eb8beed9518530aa349e4e94b74f3f4a7f82490cae3717c3686321c24bb151d8b97e72f62107eb7b2c60eade057ad4 MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446 diff --git a/dev-vcs/svneverever/svneverever-1.3.0.ebuild b/dev-vcs/svneverever/svneverever-1.3.0.ebuild index d6506788667c..23f14f3b1a1f 100644 --- a/dev-vcs/svneverever/svneverever-1.3.0.ebuild +++ b/dev-vcs/svneverever/svneverever-1.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit distutils-r1 DESCRIPTION="Tool collecting path entries across SVN history" diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index 759431246b20..b27d452203d9 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,8 +1,6 @@ -DIST tortoisehg-4.5.2.tar.gz 7935559 BLAKE2B c69107f28767936232937ee0b730b9b937dc1a475d142f0783b59b434072be1b2413f141e02985f3efe09a107782e64411323bd7c0a41be8802b1f23f54fdc77 SHA512 7be831203a33a9d7ea9e3caebb5a4d3f21ff0f07c508926b33b43db39ae11b3533c4274af78cdc2955fbea20f3e4ebe364004c9ad0a781ec7d49c19c2f5a1935 -DIST tortoisehg-4.8.2.tar.gz 8961094 BLAKE2B 3230ccd1f5fbfe44e1a656c5942592023d392816972663030df4d7c604dbea79a757b1695e60c450637d74aa53e0a821fd1e159ee9f1560ea6e48c766fd13dcb SHA512 46357dd982bdb1ecde419b63ae845f60523769e1be8145e883fcd6928008bac63a4c206423e764d4e6723049bd7ebad5fcd8027fa11beea485287fe3e74be566 +DIST tortoisehg-4.9.1.tar.gz 7960667 BLAKE2B f8a6ed65967c6389b65fd9388b3e898bf4ce09e7f95dd88467a10c061b9454eab76d0308905fd417575bf6d75dd7129a2f303bc774fd8e68824b33c18fd8054c SHA512 aef1b0d6047114794bfe78de2c0def83748e238917ce44fb56d562d53c26666dbb385867da70c4625893b148e2affa3766e40292348b78aff428df5a77d8f902 DIST tortoisehg-4.9.tar.gz 7960163 BLAKE2B bc13032ba1e36ed3e6aca978cb3917b2e5fdcf1b7dab2e66a34a0aca2e084960954f9ec135a1c2120e09931b876db7d1f3d0f3a8f69f950ff939eea9d7814523 SHA512 cc7b0360c6b362b0b9695a484b59eea879e1d4e28ed68e98ce6975342a22ddafc97976c5b0cdea289bfd78932dacf76c0b236e36bec48acd48ee361f2c09ff13 -EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb -EBUILD tortoisehg-4.8.2.ebuild 1954 BLAKE2B f9d216665c4096ac29672635363b759f52e17503c0b62d4d208a44c7da31107bc16be3486122ade24a0b3a45e11ad27fe03d0116412364bf38b894da5e5b4237 SHA512 e87da39e030e65be2df13fc830f183b98f6a105d885c991868cc224c40a1a102dc8d75765dff8357b3464dc08b4b3eb131946fa1fdc868d521e00e56e9fd55de +EBUILD tortoisehg-4.9.1.ebuild 1954 BLAKE2B 9028aad0942af4da0ac5f8360882c442b666b30c5fa1b74ff512aff4b36ff0827621c6673d1d7e36335ebaeb787fbc6cbde21f561bbfa8c674a344015f021753 SHA512 6cdafa06ce1fa0d22e0db989604ee16f65bd5cfe9afb5c2bb6faa81bba67c347b41a54dad39e4522bd1c31ad3c1f3c11853bd78d9b517aa0f174dd17d6beec46 EBUILD tortoisehg-4.9.ebuild 1953 BLAKE2B cbcbb7714905528371d0a43308a0b6336af836f276c1a8138399952b3fe0dcbcca09ca530be511cc00ef15a142c118fdb54edfbadf8e577d6071b5785e6bba06 SHA512 f58b4e1da76d552a98fb4e54006b1113c9e8309e75fbebfe531050e48a15fbef9722fef28e32982e29e9772866bd4c711ba8efae5770caff483bc050c091d2e2 EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild deleted file mode 100644 index d5027f979624..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-4.5.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="amd64 x86" - SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6" -else - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND="dev-vcs/mercurial" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-1.0.3 )" - -# Workaround race condition in build_qt -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - if [[ ${L10N+set} ]]; then - cd i18n/tortoisehg || die - local x y keep - for x in *.po; do - keep=false - for y in ${L10N}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=true - break - fi - done - ${keep} || rm "${x}" || die - done - cd "${S}" || die - fi - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - if use doc ; then - dohtml -r doc/build/html/ - fi - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop - - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ - || die -} - -pkg_postinst() { - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} diff --git a/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild index c13880f7663e..ff2d174552da 100644 --- a/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild @@ -9,7 +9,7 @@ inherit desktop distutils-r1 if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64 ~x86" SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.7 <dev-vcs/mercurial-4.9" + HG_DEPEND=">=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10" else inherit mercurial EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" @@ -68,7 +68,7 @@ python_install_all() { domenu contrib/thg.desktop # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ + rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py* \ || die } |