diff options
Diffstat (limited to 'dev-vcs')
29 files changed, 78 insertions, 1073 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex 4dcf7a8fceac..03de722caa65 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/cvsd/Manifest b/dev-vcs/cvsd/Manifest deleted file mode 100644 index 9f666c4eb2a4..000000000000 --- a/dev-vcs/cvsd/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX cvsd.rc6 373 BLAKE2B b46409472c76d0ff4374a5f47b051fdf270b1cf8b1bed582f04d75582a8c016047c5e63c4d78494c626d135a98b415c5fee565ed173442600dbd5bcf3105ddc1 SHA512 f71b01a2e5b7eb12cf0a9226015192e82253cec300a19f9841e7ad1b04210ee84532086bc8eb681ea1c4bd19fc0d38c17b365926a21fca4c2752f979759e8e5f -DIST cvsd-1.0.17.tar.gz 247026 BLAKE2B 82162d74bf63f8eae2141c07f97bbe31a51ee8aeabcf097b2a6aa33a1dfd65aaf6c48017bc11bd6494dac8e9f4f12d9905d1f27fe11361e14910925455ee06d4 SHA512 beea48a288ff580e6cc7fdcd1997b7af01e7ea1b1c185006c92cd7758e7e557d2b1b4fc820bd03b787ebc74b5fa9ef661584d2c523480cf6418f452f5f929c9d -EBUILD cvsd-1.0.17.ebuild 1021 BLAKE2B d84536eefd276babdd7dd9aa0520d8212008debb28239d29461ac57fc2d1321e26653f7cd00b418f1b2727b7ff75885f73fcff1fd914e4f5cb242ef6fc8ed0b6 SHA512 7261213d686acc64a5df60e00a3f4b86cfb0f8498ae488d65359fb05b740ea0181a5319423966cf0f4fa41f9efef0ccb3b1f668ef783353df3058ddee926b85c -MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-vcs/cvsd/cvsd-1.0.17.ebuild b/dev-vcs/cvsd/cvsd-1.0.17.ebuild deleted file mode 100644 index aeedfa65eedc..000000000000 --- a/dev-vcs/cvsd/cvsd-1.0.17.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils user - -DESCRIPTION="CVS pserver daemon" -HOMEPAGE="http://ch.tudelft.nl/~arthur/cvsd/" -SRC_URI="http://ch.tudelft.nl/~arthur/cvsd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="tcpd" - -DEPEND=">=dev-vcs/cvs-1.11.6 - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" -RDEPEND="${DEPEND} - >=dev-lang/perl-5.8.0" - -pkg_setup() { - enewgroup cvsd - enewuser cvsd -1 -1 /var/lib/cvsd cvsd -} - -src_compile() { - econf $(use_with tcpd libwrap) || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dosed 's:^Repos:# Repos:g' /etc/cvsd/cvsd.conf - keepdir /var/lib/cvsd - - dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO - - newinitd "${FILESDIR}/cvsd.rc6" ${PN} -} - -pkg_postinst() { - elog "To configure cvsd please read the README in " - elog "/usr/share/doc/${PF}/" -} diff --git a/dev-vcs/cvsd/files/cvsd.rc6 b/dev-vcs/cvsd/files/cvsd.rc6 deleted file mode 100644 index 63e0d2a085b0..000000000000 --- a/dev-vcs/cvsd/files/cvsd.rc6 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting cvsd" - start-stop-daemon --start --quiet --background --exec /usr/sbin/cvsd - eend $? -} - -stop() { - ebegin "Stopping cvsd" - start-stop-daemon --stop --quiet --pidfile /var/run/cvsd.pid - eend $? -} diff --git a/dev-vcs/cvsd/metadata.xml b/dev-vcs/cvsd/metadata.xml deleted file mode 100644 index 7a38bb900964..000000000000 --- a/dev-vcs/cvsd/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/dev-vcs/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest index 2200cc530b45..d7494208cf46 100644 --- a/dev-vcs/cvsgraph/Manifest +++ b/dev-vcs/cvsgraph/Manifest @@ -1,3 +1,3 @@ DIST cvsgraph-1.7.0.tar.gz 202678 BLAKE2B 589195f3642b0bc181a581a8f832eded3e6add44b2c9ee5c76a1a4f347384fbd59cd1f7f22c37d56810636dc13bad900bbe7973f9bfa061c37baa8becdaf35d5 SHA512 b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab -EBUILD cvsgraph-1.7.0.ebuild 996 BLAKE2B b8b1296b3b212f429cdf8986d03aef3a44870103d816f9a341862c9d812581e399c97639ef7c6167e4769f8a4ee0acd95492393a81194877bb1424ef9fcf077a SHA512 99f8bad8da445143ac4e54e875b04357413fa3013fe8f5a510d5a2b9039d32d56ea34d428971bda2bac4ffa62ad44cc50152da986985bb78dda95e867a2bd889 +EBUILD cvsgraph-1.7.0.ebuild 894 BLAKE2B 26ce2f01b973cd970b3ac474a1756dd94b0e483eecffce73a7c1675a28f8f8b40cf94ba5001763bb32e3f587b902bb55711855f30cd04e96ee3fec8c18d4668b SHA512 786e4bbb007acbd9cd88546ad02b9062a9aed7a62128566ce39eac969af96b1b274c97d7b9b187f7863d0fe1a9014739b22fa844866b3f0fc6690e6c7cf6c814 MISC metadata.xml 493 BLAKE2B 0e09276d91cc147bcb1b5eef8b13d9941cc1940a24e98413a9a5ba6d76bb98183fe55594bdfda4cb3787a73a32d893169a46924d61ea4b9030046005927d4a71 SHA512 8f12f7ce3e9039383476cb5802de8ab3e8ac01cb61ad25510e2c4e4ff3f075da0373197745365074c33fcafb33b680f121dc07a77499075e98896f8b4f5d26ba diff --git a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild index ada216280c8b..b844f9cff8ea 100644 --- a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild +++ b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 DESCRIPTION="CVS/RCS repository grapher" HOMEPAGE="http://www.akhphd.au.dk/~bertho/cvsgraph" SRC_URI="http://www.akhphd.au.dk/~bertho/cvsgraph/release/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="-alpha amd64 -ia64 ppc sparc x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="gif jpeg nls png truetype zlib" DEPEND="media-libs/gd @@ -20,16 +20,13 @@ DEPEND="media-libs/gd truetype? ( media-libs/freetype )" RDEPEND="${DEPEND}" -src_compile() { +src_configure() { econf \ $(use_enable nls) \ $(use_enable gif) \ $(use_enable png) \ $(use_enable jpeg) \ - $(use_enable truetype) \ - || die "econf failed" - - emake || die "emake failed" + $(use_enable truetype) } src_install () { @@ -38,5 +35,5 @@ src_install () { doins cvsgraph.conf doman cvsgraph.1 cvsgraph.conf.5 dodoc ChangeLog README AUTHORS contrib/*.php - docinto automatic_documentation ; dodoc contrib/automatic_documentation/* + dodoc -r contrib/automatic_documentation } diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest index a6f9d09126b6..8962cdc49866 100644 --- a/dev-vcs/cvsps/Manifest +++ b/dev-vcs/cvsps/Manifest @@ -1,11 +1,8 @@ AUX cvsps-2.1-build.patch 396 BLAKE2B d75a8c98b5ecaafbc03e49b6b975d9c9c493b17ecc7205e56188d9a1b7e79b45cdf5a56bab22807ea4018eb54e27b50be13a8dd718722adc727826449c26243b SHA512 bd4e9ea02a89038e9b3d16aa075649659836d36d76145aa643008cf017fde032d66273bc4148340b1b75bfaa83830ab1381c9f9295c54915e19386538b232991 -AUX cvsps-2.1-solaris.patch 3064 BLAKE2B 0a2a9e5652953505e6a3d99412ff0472a318a442edf8624c1b961b1506b1315525d0145df80bc4cb9db92b02f9310ece10f0bab1aae3cf650dd439e32dfaa687 SHA512 b42581865d988166dd9bb6a1685feb9786c1f424f778afd795aec94f734cfd2b06955d87505c52e7d48d117c8652c7bc51730fcd4f2598acc58c810c32f6af2f AUX cvsps-2.2_beta1-solaris.patch 3648 BLAKE2B 0e4471b476485f0202c458cb5505636d0730689083a0be39b245856ac9f6f5e9916c4f654b1597b1a6e727e3d2e5d88f64b617e2383caba6730a7752138b5eeb SHA512 a876362b082b3a877a5ee4da7c23eab24d6f00362cd7ea33d93a71e93a185d0c30421f502d3029e493e99ef2e2ef34f0d6092f98134c3e54480e892ccaddf591 AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a8253024f7c5b14db3d3be7d169b2e1bd487652dea56dc5bc9a963689660b7b4a059786e46dec3e6b4f48897ca SHA512 0ddc7115a0a66f418f81468230c92b17f3b7c6a38a82505de79c27764ee46ee5805ebf1d0a12360df77718cccf9bf2ac61f45b21c1cfecb7700e648ea1187e9e -DIST cvsps-2.1.tar.gz 61634 BLAKE2B 32bf53c574ac8e7937ff14aee5a229e1bb2b4f0ddd4360d0b8d57a5d0fd5c6f683897140e235cdd6ab85e94f3977298fd38e8187db08529f8a8d814a4a8070a8 SHA512 8ba703fc4dd1c7a8201f4cefec533a6e228943f53f5380d8d17107718d8cb607c861a733d7ad1d6ed9288c4dbeae9fd59ceaf52172f16885a00d000a667e0e38 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f -EBUILD cvsps-2.1-r1.ebuild 911 BLAKE2B 2636e26d0a4e7bc6ed5f9849759bac39c59bda984641855c4fee63d7e56c9a05ba64b4ad66a1fce9839c83e8111e4eba81b4278d31c270985114a82609d8122d SHA512 94306263cb7d40590e27949fa3294fd0130fc8585665c8c6e7ac9f5a1c2f051f7176f6bead4710b67ed735069666ad84e988777417dedd614bfd668f1816fd0c -EBUILD cvsps-2.2_beta1.ebuild 913 BLAKE2B 82741333511a4127495bf1372329df827b11ee438b07392df9bc1886dc011fc6a513f16d9966ceff02e234c6669c372e1aed672f4e7f0a02441c5393884c33b4 SHA512 27c5f0f7cef37a495ebcced989115969776377d118538741638e3bcb5ac0eac0c3ae09368bbf77061a9570660d91ccb32ed45a98c0c464ea184a9f35c2d8ef0c -EBUILD cvsps-3.13-r1.ebuild 1005 BLAKE2B 0b5ac6e71d5e79d1c7293e97b5285c46cae8851e9f6a9fddc110b3883f7ca5994f68120760e879cf27b2d791d64165670f4391812c313401118303d2cd00eac7 SHA512 9e7462d990facadac1c2f785412ff450d62dedee4cd162f4ba7a4c6d775a17838d6216847648d6932bbf459246246626343c8d76aa085ce819bfb43755dbe021 +EBUILD cvsps-2.2_beta1.ebuild 910 BLAKE2B dca2828b68f41be52836ab274808e60824fd33c52e3b3c4afab522206d02948855109bee646345500b370f7a786ebc1897a41c5e1c2ee06fac31c7e7d87ea203 SHA512 6905b434c4ada51daa52fb0208edd129a17e2170cfb5761548bdd815eeee9476e5eca5a5c10fac86f105ac5c36bb0c218496bd8da3ec0d89f5d557d5cb57633b +EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf diff --git a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.1-r1.ebuild deleted file mode 100644 index 7c99c5f0ec5e..000000000000 --- a/dev-vcs/cvsps/cvsps-2.1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs - -MY_P="${P/_/}" -DESCRIPTION="Generates patchset information from a CVS repository" -HOMEPAGE="http://www.cobite.com/cvsps/" -SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-solaris.patch - # no configure around - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e '/^LDLIBS+=/s/$/ -lsocket/' Makefile || die - fi - tc-export CC -} - -src_install() { - dobin cvsps || die - doman cvsps.1 - dodoc README CHANGELOG -} diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild index 4ba081d4be23..f3faa6accfc2 100644 --- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild +++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="sys-libs/zlib" diff --git a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild index 45e63d4b5dc4..1d9ca2cea5f5 100644 --- a/dev-vcs/cvsps/cvsps-3.13-r1.ebuild +++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit eutils toolchain-funcs @@ -20,10 +20,13 @@ DEPEND="${RDEPEND} RESTRICT=test # upstream does not ship tests +PATCHES=("${FILESDIR}"/${P}-make.patch) + src_prepare() { + default + local gentoo_name=${PN}-3 - epatch "${FILESDIR}"/${P}-make.patch mv ${PN}.asc ${gentoo_name}.asc || die sed -i "s/${PN}/${gentoo_name}/g" ${gentoo_name}.asc || die sed -i "s/PROG = cvsps/PROG = ${gentoo_name}/" Makefile || die @@ -34,5 +37,6 @@ src_prepare() { src_install() { default + dodoc README } diff --git a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch b/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch deleted file mode 100644 index 3e063fd9248b..000000000000 --- a/dev-vcs/cvsps/files/cvsps-2.1-solaris.patch +++ /dev/null @@ -1,131 +0,0 @@ -Modified version of -http://cvs.openpkg.org/fileview?f=openpkg-src/cvsps/cvsps.patch&v=1.13 - -Index: cache.c ---- cache.c.orig 2008-04-02 03:18:44 +0200 -+++ cache.c 2008-04-02 09:10:25 +0200 -@@ -361,7 +361,7 @@ - - strcpy(buff, p_buff); - -- while ((s = strsep(&p, ";"))) -+ while ((s = my_strsep(&p, ";"))) - { - char * c = strchr(s, ':'); - -Index: cvs_direct.c ---- cvs_direct.c.orig 2008-04-02 03:18:44 +0200 -+++ cvs_direct.c 2008-04-02 09:10:25 +0200 -@@ -92,12 +92,12 @@ - - strcpy_a(root, p_root, PATH_MAX); - -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - - /* if root string looks like :pserver:... then the first token will be empty */ - if (strlen(tok) == 0) - { -- char * method = strsep(&p, ":"); -+ char * method = my_strsep(&p, ":"); - if (strcmp(method, "pserver") == 0) - { - ctx = open_ctx_pserver(ctx, p); -@@ -185,14 +185,14 @@ - - strcpy_a(root, p_root, PATH_MAX); - -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - if (strlen(tok) == 0 || !p) - { - debug(DEBUG_APPERROR, "parse error on third token"); - goto out_free_err; - } - -- tok2 = strsep(&tok, "@"); -+ tok2 = my_strsep(&tok, "@"); - if (!strlen(tok2) || (!tok || !strlen(tok))) - { - debug(DEBUG_APPERROR, "parse error on user@server in pserver"); -@@ -272,7 +272,7 @@ - strcpy_a(root, p_root, PATH_MAX); - - /* if there's a ':', it's remote */ -- tok = strsep(&p, ":"); -+ tok = my_strsep(&p, ":"); - - if (p) - { -@@ -281,7 +281,7 @@ - if (!cvs_rsh) - cvs_rsh = "rsh"; - -- tok2 = strsep(&tok, "@"); -+ tok2 = my_strsep(&tok, "@"); - - if (tok) - snprintf(execcmd, PATH_MAX, "%s -l %s %s %s server", cvs_rsh, tok2, tok, cvs_server); -@@ -776,7 +776,7 @@ - static int parse_patch_arg(char * arg, char ** str) - { - char *tok, *tok2 = ""; -- tok = strsep(str, " "); -+ tok = my_strsep(str, " "); - if (!tok) - return 0; - -@@ -796,7 +796,7 @@ - /* see if command wants two args and they're separated by ' ' */ - if (tok[2] == 0 && strchr("BdDFgiorVxYz", tok[1])) - { -- tok2 = strsep(str, " "); -+ tok2 = my_strsep(str, " "); - if (!tok2) - { - debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires two arguments", tok); -Index: util.c ---- util.c.orig 2008-04-02 03:18:44 +0200 -+++ util.c 2008-04-02 09:10:25 +0200 -@@ -316,3 +316,31 @@ - exit(1); - } - } -+ -+char *my_strsep(char **stringp, const char *delim) -+{ -+ char *s; -+ const char *spanp; -+ int c, sc; -+ char *tok; -+ -+ if ((s = *stringp) == NULL) -+ return NULL; -+ for (tok = s;;) { -+ c = *s++; -+ spanp = delim; -+ do { -+ if ((sc = *spanp++) == c) { -+ if (c == 0) -+ s = NULL; -+ else -+ s[-1] = 0; -+ *stringp = s; -+ return tok; -+ } -+ } while (sc != 0); -+ } -+ /* NOTREACHED */ -+ return NULL; -+} -+ -Index: util.h ---- util.h.orig 2008-04-02 03:18:44 +0200 -+++ util.h 2008-04-02 09:15:35 +0200 -@@ -24,5 +24,6 @@ - void timing_stop(const char *); - int my_system(const char *); - int escape_filename(char *, int, const char *); -+char *my_strsep(char **, const char *); - - #endif /* UTIL_H */ diff --git a/dev-vcs/cvsq/Manifest b/dev-vcs/cvsq/Manifest deleted file mode 100644 index 444a56931444..000000000000 --- a/dev-vcs/cvsq/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST cvsq-0.4.4.tar.gz 3717 BLAKE2B d452c3435a839226ed148ba8ce3b3765b1174f19c3649cf69c02ffb9eaf7158c3e42382974f297ad7e8e567f2d280cd8cf6fd9414830a4ca474809b99e165d3c SHA512 137f09f42f5213853b327f23c3d23914116851b2d8d7f17752257f6ab0b2f62e4526f95b7d005fbf49746ea17591fbb38cfc58ccbe55a976b36339df13e44f8f -EBUILD cvsq-0.4.4.ebuild 556 BLAKE2B 64c414ce4c288b8923aad27c631ddb3b1b199dd4e17c87f77b067d5b6744dbe80c77bd96bb1739ad1a9b35da88c98d638862ebf885fb9c8d453342fc8d76f2b4 SHA512 1b21b10b89de2195f38b9911a5dfed8397bef61048b526e4bc9b716e94c1463113019e02bc4a67d2cea40438de8f39bc4d4098d378e9778d82e6fc8a4fd90343 -MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-vcs/cvsq/cvsq-0.4.4.ebuild b/dev-vcs/cvsq/cvsq-0.4.4.ebuild deleted file mode 100644 index ca20abaa3d63..000000000000 --- a/dev-vcs/cvsq/cvsq-0.4.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -IUSE="" - -DESCRIPTION="A tool to work offline with CVS by queuing the commits" -SRC_URI="http://metawire.org/~vslavik/sw/cvsq/download/${P}.tar.gz" -HOMEPAGE="http://metawire.org/~vslavik/sw/cvsq/" - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="~amd64 ~ppc x86" - -DEPEND="" # This is just a shell script. -RDEPEND="dev-vcs/cvs - app-shells/bash - sys-apps/coreutils" - -src_install () { - dodir /usr/bin - dobin cvsq - dodoc README AUTHORS ChangeLog -} diff --git a/dev-vcs/cvsq/metadata.xml b/dev-vcs/cvsq/metadata.xml deleted file mode 100644 index 7a38bb900964..000000000000 --- a/dev-vcs/cvsq/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index e4f85614c1a6..89e06122aa69 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -12,24 +12,20 @@ AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101a AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 -DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 -DIST git-2.24.0.rc2.tar.xz 5753364 BLAKE2B 8b9ce86c6625eb800e90149b8c8d4f75eb65326cb617748f99ace42eebc9571e741c3cc00a855ca05187f61cbbc3b884ca12379e82f1c1c831a7245571a031e8 SHA512 fd6776e1e045feeb461f014ee6cd42934cc10aec33eb12b0df4b1093aee3d83f1efd6f36b859f45c7136f4179e2559dba3f9da11fe33d5b4770d4a2d25a317b8 -DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634 +DIST git-2.24.0.tar.xz 5766056 BLAKE2B 85c7cdcae01a71cc6e5d3d5985f4c54439879273ba981b73b732d6db10e348c812d7817001242976b67f78537f7fdf9c9298173b7393ad7ab5237cd9e3d9b5a2 SHA512 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4 DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc -DIST git-htmldocs-2.24.0.rc2.tar.xz 1306552 BLAKE2B e4e211693daeb69ec06965a64fa1260363e9821f3ce1a564f62e3da892368973338ba05ddd60d63268dd551c2c9e918d29a7024b10a72d4ba49ba99d0a16b76b SHA512 a420b103b32d2e5c507cf1a2398e109e8186fdeb0cc598e33df24525b34f672d9ab06811ca83bfdd780934310b19ac9f5c3798cb7835a0a9e18e168fcb2533d4 -DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 +DIST git-htmldocs-2.24.0.tar.xz 1306680 BLAKE2B fe3c9f2f56e8e6073be449d19336873ee06d1101eff12d2c5690bbe38510e7f60c3805fca3a46ce85be79d78161aea669b0ee595599aea816f42093f7c6f1a49 SHA512 61b8fbbc55cd66561b76866933de4478a526dd9428e419b8a8c046c323b26c780421e771b1ed7aa890962c3b90f9f3832b4a880fe1f67b1edb764f6d58db00ad DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96 -DIST git-manpages-2.24.0.rc2.tar.xz 453672 BLAKE2B 6b7cc87e733b28e01cf242eb64fd7b99d4f0e8fa38818a766cb6546f46c068850318411f7ef6247108ca8ebbf2c384bf1917ac7ae0ca8ddf737fc7cc3a295d62 SHA512 2203993366710dbc4d710e748c8904b92595abdd7584081dfe355a479970113bc122a1cb571142fb373cd21cfe1ffb1fb7cf1453e81f736d85f27bfad2be05c3 -EBUILD git-2.19.2.ebuild 19002 BLAKE2B d76be3a033677c324b02bf8fe0859fef8c06c15060bcd74a54a136e34eed8e1ca9673cd78bc2b42cebea81ec5d74306d839fd818f35af29dd062cdbae6e41b87 SHA512 762db8ccb376c6e43f071e5f53d5735895f3a2a127fcca9130f52d421e25cd160b0fedc7bb7b682be8f4eb0c63f80698b0e0d20f6c29b2ba648d380bba85f1fc -EBUILD git-2.21.0.ebuild 19058 BLAKE2B bfe746207879f2d94ebd25659e893f8f7acacd43490a6bc01c87d433f0940c6356dbbfdcdbcdb2ca165eeed366b36a5dc469b5bd7a40267f596d0d0814252ecd SHA512 3e44530c1674c29bf4956bbabdbb8cb64ec7ed4a7bff045d4b43827c38c4ecd8188f33ec129b6b7e5cbd94f7bcf2606b6722efdd26d4ae9478488a1f98cf78dd -EBUILD git-2.23.0-r1.ebuild 19537 BLAKE2B a7a28fb2003239515da87ac609397c5bbf382664b174cef946869e1398bbbf68c913a447994f3df3211e066a424db1c424c973be897bcdef58e745e19ff4127f SHA512 5c2988de7a169026dacce82aa27532ffa7e9b6a2d7a3da48523ac0eb139ac812073d36778590aabe53d15f3fabae8f65497928ba277e2475223ad59e61df447f -EBUILD git-2.24.0_rc2.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 -EBUILD git-9999-r1.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 -EBUILD git-9999-r2.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 -EBUILD git-9999-r3.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 -EBUILD git-9999.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 +DIST git-manpages-2.24.0.tar.xz 453600 BLAKE2B 9ccbbe8e18689cac078ade0f55a1ca45a7c566ee5591df3442e3499fa1e4231f91e68922a54527fd2ce6102ac0148f9a360586a7c47922b39b383895f6742ba8 SHA512 18fff078b0ddf79aca216d9e2667e7a0b474eb8876739efd3928be2347bbb8db486e0367353b4e3d48f9d0e9c1dbd6f784e55ba535a009c1f3150405abdd02d2 +EBUILD git-2.21.0.ebuild 19086 BLAKE2B e811b477104e21925db97ba057900fabc6d077717e5c386fcdbc4fffc26328545d6abd779846a51a34871859042d6c7301c482fbc5bb488843e34bc46456e657 SHA512 a39951a450928f99f2e9799f3aa0ea3ada60c2ff6b666cb1a37db9e85d99728f4a0d91db4d373409bbb72ebf0670efe2c76613daf4cbfb2054a403875ebd8561 +EBUILD git-2.23.0-r1.ebuild 19564 BLAKE2B ae505eac193a443d2797fc9cdf6f00c211f9f1a0b970b04c7e53b080f10abf4bc7c0856eea4e7b573398b54d1afdea3b7a14d5e5254f8ef2da57fafd3aba0560 SHA512 550d190bf8b39dead6dd928062804170986541df8dfdb0d977de07581f183fac9eed8e3b4744e4f2ff681f1a47c42abe780729cbe1528f9b080deea6b2576564 +EBUILD git-2.24.0.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419 +EBUILD git-9999-r1.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419 +EBUILD git-9999-r2.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419 +EBUILD git-9999-r3.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419 +EBUILD git-9999.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419 MISC metadata.xml 2197 BLAKE2B b48502c8c414bcbceb6a917291e79d8b33c3f5d4c0e3e25e5a8c77720bd96b6bee120b177034c76d5ee00692951e71c721df3b8b8219dea13644e3af318fbd3f SHA512 6b39bc6d79605bd0a5ffe03599e6fad7da4e3cf2a8f0896be4c47b9a12be8eccc97849d022b3863626c2606274b6b718e00ce6646394302cc3f2468863a3d274 diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild deleted file mode 100644 index 6ec31b45ed73..000000000000 --- a/dev-vcs/git/git-2.19.2.ebuild +++ /dev/null @@ -1,709 +0,0 @@ -# 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=( python2_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 eutils 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="https://www.kernel.org/pub/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-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 -) - -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="$(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 - 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 - ) - 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 b1c57943db0a..6e6639362845 100644 --- a/dev-vcs/git/git-2.21.0.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -135,6 +135,8 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch diff --git a/dev-vcs/git/git-2.23.0-r1.ebuild b/dev-vcs/git/git-2.23.0-r1.ebuild index 152498a706f1..77207b05673b 100644 --- a/dev-vcs/git/git-2.23.0-r1.ebuild +++ b/dev-vcs/git/git-2.23.0-r1.ebuild @@ -46,7 +46,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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -136,6 +136,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch diff --git a/dev-vcs/git/git-2.24.0_rc2.ebuild b/dev-vcs/git/git-2.24.0.ebuild index c305c57e6449..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-2.24.0_rc2.ebuild +++ b/dev-vcs/git/git-2.24.0.ebuild @@ -54,7 +54,7 @@ SLOT="0" IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally @@ -139,6 +137,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch @@ -548,7 +548,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index c305c57e6449..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -54,7 +54,7 @@ SLOT="0" IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally @@ -139,6 +137,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch @@ -548,7 +548,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index c305c57e6449..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -54,7 +54,7 @@ SLOT="0" IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally @@ -139,6 +137,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch @@ -548,7 +548,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index c305c57e6449..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -54,7 +54,7 @@ SLOT="0" IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally @@ -139,6 +137,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch @@ -548,7 +548,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index c305c57e6449..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -54,7 +54,7 @@ SLOT="0" IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally @@ -139,6 +137,8 @@ REQUIRED_USE=" perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch @@ -548,7 +548,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest index cbab04e53f1f..11b053e6224b 100644 --- a/dev-vcs/hg-evolve/Manifest +++ b/dev-vcs/hg-evolve/Manifest @@ -1,5 +1,5 @@ DIST hg-evolve-8.5.1.tar.gz 755965 BLAKE2B c9d6ea06f91cc537e1ea9266a09cded59e3dfb69f0bb5300a40b971bda6f9ce680c81978c23806972ca88931d9f2d67eedce14ba1f56670fa3c18194b63e2999 SHA512 7c5d9608d03ab81fc7291edb3f0ddb016cd4b267997bf66fcb221c9c917fbd34bfb4637bbb0c60b460a32304ee45fd7e30db929312dfbaa94df17baf7947482e -DIST hg-evolve-9.1.0.tar.gz 761913 BLAKE2B 1439b6b0db8b43d306806751044d903f59de448f2f99f9ec405028813c3098dca3d7d20a0464262b3cccacc7d9391db7e11a4ecc7ecf7ca0a9a6b0dbfa526969 SHA512 da8d35dcfe9a83a2805ce420cd504179132b14973b4d42094558ac250b7f90f56641d2392bdb78136db1d8b16f4a993322720275210b3af5d1ed71d3c9bc6839 +DIST hg-evolve-9.2.1.tar.gz 775584 BLAKE2B 03b57b464cf3395c5206f14310e202d5bfe3046816d943d1fb2b304f8fe66226f2b5773dec9feae4c487b6efdbf9ff18416dc55679e658264236c65b3a76d26c SHA512 927ba873c583a4027d8c745ba8eb70e8768cd7c4c9a36f773d33d9a77807345cc9d2029c8cbe0d626984a963700399447f2bee01c6a0820a4a46894719f76869 EBUILD hg-evolve-8.5.1.ebuild 749 BLAKE2B 3d42920b21837708f764dbe4e012e11938c722802a22724bac8931c3e671b07ff389a9f8c920b555c27daa830b47bcab20e0aac3b037e83d9006775d21434b42 SHA512 f3b40e73c9ba525e53707ed0df74c9a3566b6ce5dcf986b16d67350a69664773019c27955343e261ad4bb28335a8ecaf6b00ca310a5d2bce590e3c7d34bcf127 -EBUILD hg-evolve-9.1.0.ebuild 749 BLAKE2B 4a63e25c569825030fd154abcd9aadcc6d348bbd182f5b76645bd9b012aeb67871ab561fda9a8e1866bae752c511ff44f0d4d85bc68c2f1c4ae7c9c9b23c6343 SHA512 1fda93e980dc30a073ab717c7a9acf464b365ff2ff14914fcf39f824ce08534bf3d6fcf4495dc51b11918bcfe185901788f01119f1371a9f50132dce78ed188e +EBUILD hg-evolve-9.2.1.ebuild 749 BLAKE2B 4a63e25c569825030fd154abcd9aadcc6d348bbd182f5b76645bd9b012aeb67871ab561fda9a8e1866bae752c511ff44f0d4d85bc68c2f1c4ae7c9c9b23c6343 SHA512 1fda93e980dc30a073ab717c7a9acf464b365ff2ff14914fcf39f824ce08534bf3d6fcf4495dc51b11918bcfe185901788f01119f1371a9f50132dce78ed188e MISC metadata.xml 395 BLAKE2B a61ed69918c8861a242c5add3e383902abb25cd10dc6f74b59a8e02fef50fa5a4da459494f3ac720989ada3ca730bbeeecb34d412129a191b210639b0473bcd9 SHA512 1676e93039dcb739017c0c119376b9c93e8cd1f7ae3a31c48e5eb6aa2ec92662bc7b5a834c00ecfe689408f27169559eb84e8e48a004e1f87e1eb59bfbbd7d16 diff --git a/dev-vcs/hg-evolve/hg-evolve-9.1.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild index 4f1db8db068d..4f1db8db068d 100644 --- a/dev-vcs/hg-evolve/hg-evolve-9.1.0.ebuild +++ b/dev-vcs/hg-evolve/hg-evolve-9.2.1.ebuild diff --git a/dev-vcs/svn2cl/Manifest b/dev-vcs/svn2cl/Manifest index 66529183ddf2..bb9d0058ac68 100644 --- a/dev-vcs/svn2cl/Manifest +++ b/dev-vcs/svn2cl/Manifest @@ -1,4 +1,4 @@ -AUX 0.9-wrapper.patch 531 BLAKE2B c4540c9768cfa687d39b1193d59e0426c238f7c9aa71b3b4e80113e31700e64cd3bd2c50f86f5d5825c2e668081e385502ca5973eb4a9a24d150fe67affc3208 SHA512 8e36433178d68e6e1c0f7d1259c8aecb1ee70f04fc47033f5e7c58b0aa273fcdf20aa425bce673bea3c36d8374da8ef35f4e0854fc6f62a3c0f36b414ff21610 +AUX 0.9-wrapper.patch 533 BLAKE2B 66eca8a65f6ee984613b2af0ef6ef00bf7bbe6ebd66946883b769e71172db1795718fcde4235c38dfcdb75295a19d23e6f468c957a9adef6f3da44ed6fa132f6 SHA512 060d5631a7ec86aebab454f7d1cc7c3fd08d11db993bedc883d7c04b96a412359c6c2c7479e0bbfdb82ac5f8ea366695f845e3e9fc19653108a564376268a7c8 DIST svn2cl-0.12.tar.gz 18171 BLAKE2B 88e66d4bcc3e05132462d1c9794846a644f121876d36dc1b42ef0cb7bf8481536d62a6d764e92edc670c149fbe5702a46b02d875ad1cd477a05b497780232296 SHA512 c84f0f67b34d615b1732cd03ecbdb6d3bb082677145acf2f32f74518306347eb984d65d4837f2463b369cd7a8a7443d2cfba589c531b46f423870c55b0b48aa2 -EBUILD svn2cl-0.12.ebuild 968 BLAKE2B a48d2df2292210fbd4b94424d4818912f0aad5137f59cfd8476cfba5d905061de629947e3e3ca2a43e846d7cde9619fb0c2084e15a43d035b1b5f7d8fc2e8f17 SHA512 959120933c895f6a99ca6db51de2763cc94a7f5abd7bc2128bd093dce788acc0331ed74131ea701b227c746efcc589ecdc265eafbe8ca7a7db3feb805f53bf10 +EBUILD svn2cl-0.12.ebuild 779 BLAKE2B ff44f25a86e56ed04375e532b5ea368f78a0443f1c166f12975673ed49ed3ef058c5d0bbb354e7d576cb4b7aa70432cd050bb05e6e79b8a47f5227a5a6ec6f45 SHA512 4c6820c7feb49874deb2441376466e0c9ad7803ae3739074c1bcb703626ced7fdd4b81cc15548c26ed1c08e5ec2d2cb5f38c3f7543eb90fcf5d75c3a3715350c MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-vcs/svn2cl/files/0.9-wrapper.patch b/dev-vcs/svn2cl/files/0.9-wrapper.patch index 478b2a032d2a..3b06c36b6a09 100644 --- a/dev-vcs/svn2cl/files/0.9-wrapper.patch +++ b/dev-vcs/svn2cl/files/0.9-wrapper.patch @@ -1,5 +1,5 @@ ---- svn2cl.sh 2006-10-18 23:38:06.000000000 +0200 -+++ svn2cl.sh.1 2006-11-12 01:41:05.000000000 +0100 +--- a/svn2cl.sh 2006-10-18 23:38:06.000000000 +0200 ++++ b/svn2cl.sh 2006-11-12 01:41:05.000000000 +0100 @@ -234,16 +234,7 @@ esac done diff --git a/dev-vcs/svn2cl/svn2cl-0.12.ebuild b/dev-vcs/svn2cl/svn2cl-0.12.ebuild index 1591242a7069..d788d5b194c9 100644 --- a/dev-vcs/svn2cl/svn2cl-0.12.ebuild +++ b/dev-vcs/svn2cl/svn2cl-0.12.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 - -inherit eutils +EAPI=7 DESCRIPTION="Create a GNU-style ChangeLog from subversion's svn log --xml output" -HOMEPAGE="http://ch.tudelft.nl/~arthur/svn2cl/" -SRC_URI="${HOMEPAGE}/${P}.tar.gz" +HOMEPAGE="https://arthurdejong.org/svn2cl/" +SRC_URI="https://arthurdejong.org/svn2cl/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -17,20 +15,14 @@ IUSE="" RDEPEND="dev-libs/libxslt dev-vcs/subversion" -src_unpack() { - unpack ${A} - cd "${S}" - # the wrapper script looks for the xsl files in the - # same directory as the script. - epatch "${FILESDIR}"/0.9-wrapper.patch -} +PATCHES=( "${FILESDIR}/0.9-wrapper.patch" ) src_install() { - newbin svn2cl.sh svn2cl || die "failed to install wrapper script" + newbin svn2cl.sh svn2cl insinto /usr/share/svn2cl - doins svn2cl.xsl svn2html.xsl || die - dodoc README NEWS TODO ChangeLog authors.xml svn2html.css || die - doman svn2cl.1 || die + doins svn2cl.xsl svn2html.xsl + dodoc README NEWS TODO ChangeLog authors.xml svn2html.css + doman svn2cl.1 } pkg_postinst() { |