From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- dev-vcs/Manifest.gz | Bin 13636 -> 13626 bytes dev-vcs/bzr/Manifest | 8 +- dev-vcs/bzr/bzr-2.5.1-r1.ebuild | 2 +- dev-vcs/bzr/bzr-2.6.0.ebuild | 2 +- dev-vcs/bzr/bzr-2.7.0.ebuild | 2 +- dev-vcs/bzr/bzr-2.7.1_pre.ebuild | 2 +- dev-vcs/cvs/Manifest | 4 +- dev-vcs/cvs/cvs-1.12.12-r11.ebuild | 2 +- dev-vcs/cvs/cvs-1.12.12-r12.ebuild | 2 +- dev-vcs/git-tools/Manifest | 8 +- .../git-tools/git-tools-2015_p20151225-r2.ebuild | 2 +- .../git-tools/git-tools-2015_p20160201-r1.ebuild | 2 +- dev-vcs/git-tools/git-tools-2015_p20160201.ebuild | 2 +- dev-vcs/git-tools/git-tools-2017.10.ebuild | 2 +- dev-vcs/git/Manifest | 21 +- .../git/files/git-2.17.0-mw_install_path_fix.patch | 48 -- dev-vcs/git/git-2.16.4.ebuild | 2 +- dev-vcs/git/git-2.17.1-r1.ebuild | 717 --------------------- dev-vcs/git/git-2.18.0.ebuild | 2 +- dev-vcs/git/git-2.19.0_rc2.ebuild | 706 ++++++++++++++++++++ dev-vcs/git/git-9999-r1.ebuild | 2 +- dev-vcs/git/git-9999-r2.ebuild | 2 +- dev-vcs/git/git-9999-r3.ebuild | 2 +- dev-vcs/git/git-9999.ebuild | 2 +- dev-vcs/mercurial/Manifest | 8 +- dev-vcs/mercurial/mercurial-4.5.2.ebuild | 2 +- dev-vcs/mercurial/mercurial-4.6.2.ebuild | 2 +- dev-vcs/mercurial/mercurial-4.7.1.ebuild | 133 ++++ dev-vcs/mercurial/mercurial-4.7.ebuild | 2 +- dev-vcs/subversion/Manifest | 2 +- dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 2 +- dev-vcs/svn2git/Manifest | 2 + dev-vcs/svn2git/svn2git-1.0.13.ebuild | 47 ++ 33 files changed, 934 insertions(+), 810 deletions(-) delete mode 100644 dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch delete mode 100644 dev-vcs/git/git-2.17.1-r1.ebuild create mode 100644 dev-vcs/git/git-2.19.0_rc2.ebuild create mode 100644 dev-vcs/mercurial/mercurial-4.7.1.ebuild create mode 100644 dev-vcs/svn2git/svn2git-1.0.13.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index a153830d5880..3fb5e6006a5d 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest index 131226be6f2e..0632d8113774 100644 --- a/dev-vcs/bzr/Manifest +++ b/dev-vcs/bzr/Manifest @@ -4,8 +4,8 @@ DIST bzr-2.5.1.tar.gz 10451513 BLAKE2B 00025c5db2d9ad94b39fb450c83c917b532c48048 DIST bzr-2.6.0.tar.gz 11301124 BLAKE2B 63a45634e3da53b06208c96726a399edd08c5a4c43ae3e431501aa15dc8060096fb13a390d5f1a6c7cc5cf5a9dbd5245760c21ba29a060a53f74c886fd69424c SHA512 f40d4380a837321c2ed168d15b0b5d31e9de6df93c0f8f2fd9b16c9351524b0afac5b8744740f587e9704efeb4cc004cae7f35aed47f73b5c796cbe2526af980 DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3 -EBUILD bzr-2.5.1-r1.ebuild 2470 BLAKE2B b3754ea550a6c170983d6b06a4dda66996e20c1a7608b950d3b41a697990a2ad7ff36da43aa34abf4f5f1e9d4116a83ce92c767bab5eae4838eb7c3b9b7eb4c9 SHA512 5e7cca64bd3a9db51c0ed5356512dff59e42826bca40c0dac474d18f70297d68acee3b418ba645d500b68e7ecf5188d60b4b67d91d4f6ffb55d8cdef9598f578 -EBUILD bzr-2.6.0.ebuild 2631 BLAKE2B 807b7646d46612b14b25daa1a69ed9028c2951c1e5571b09877e52e86a029786ba615421af2f03b325ee9f4e7e5d7dfc6652662f60052c453a7934877a8f3699 SHA512 14f83b1bea6fe57900da6477f4b424868175a87fd52d821e59b92bd51fd8254b7afac26f8777a943592433d7249d98c7f44d20c733ba6bc6dfb58d1ff7b16deb -EBUILD bzr-2.7.0.ebuild 2622 BLAKE2B 5befa88570b89bcdcef30d49fb91b5568f9eb1f83d9f88ea358e811bcd2a16bb956614c5a87f1c9542ac1789ec06df6f910e107ae05dfbc48d67b662e758b8de SHA512 f449346f2f2d04005385c274cf83c30b16cb6df27a9d020c91458f79d556811884036ca9888665808ca1b11e79c7045c0b359c848be1a1743592e0e0052fdc74 -EBUILD bzr-2.7.1_pre.ebuild 2607 BLAKE2B a42a111d51b1dddda9bf2a40c8f618efe08c9696ed342684d4434719ae6c7a75047c45ea94292cdbccb9ea776fb6305ed6a61fe670f2903fe55a5e1b42e2bcb1 SHA512 e9a62929e213075dd564dee6a399b480da1f422998cfee2ef37057575b8014f5ec0839728c37f97f604aa693040584713d09981f376148855c33131cfd791e1a +EBUILD bzr-2.5.1-r1.ebuild 2459 BLAKE2B 45d564c149ed3d5cf18c8a851c83867ba23f12b030664b261c3de2fe035316b1a8e1c94956929f0f9705bed95f3c13f7799da0a0856242e83462df051739258a SHA512 e06a318b5c742cfaa96f43ca161b80c4a8ea8d1597f85511f29882799f187c7a0e2853bcb5427f882b3274c4b2d9d58b035db772827ad257e41f2d8518937971 +EBUILD bzr-2.6.0.ebuild 2620 BLAKE2B a657288486403d51dedbc38c84160964e28259a83e3024e0e1929a81180a04ffa20cf3f5c6c9cbbcaec996711db1ec11b895c19918893371a33d632e13d63283 SHA512 10b98ec974074a78ca19ba62c1028becdf4370b86565855d8dbaaec97a2c7f1b54baa4971bfc8c8c0593f089b6b8b5e4cb7bfb978ac871d105c185ec1fbbdb6d +EBUILD bzr-2.7.0.ebuild 2611 BLAKE2B 8a05b594dad05f945eec856e496109cbbf76de7a0597aa377c21ba0885312a59cbf689a115bfa7205e5354d5b16ee1f217c5b17b9d8aed058fda0782c197ebfa SHA512 3f60cd5bdaba84b1003ffee1b69061bb372c379befebdfdfc77ea739f40792bd1d35d4f6b3be79c46dbb8e9881de5ea27a3ecd8f566a5a2d803db43746ba01b2 +EBUILD bzr-2.7.1_pre.ebuild 2596 BLAKE2B d3a44f37fa78c3dc7d0aeb4303577e23af17fd23180f22e1997171cb689cbce5b8cab58cb99cdaae99ad992918c6eea71d0c4cc7bbfe634ad6f746ba6725b93a SHA512 aacd53a54c4a9427bb458f177dd93d1b4abe0b533e382a207eede33b9e88576c7fc5545092586a16f95ed6f0ac612de22f579c04e41dc05cac52bd8227718369 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild index 301f430763ac..7aaa0aa22229 100644 --- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild +++ b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="curl doc +sftp test" RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] ) diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild index 842b139b132e..9ddf9d73ddf5 100644 --- a/dev-vcs/bzr/bzr-2.6.0.ebuild +++ b/dev-vcs/bzr/bzr-2.6.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="curl doc +sftp test" PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN" diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild index 978345cd4861..1e824712f047 100644 --- a/dev-vcs/bzr/bzr-2.7.0.ebuild +++ b/dev-vcs/bzr/bzr-2.7.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar-vcs.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="curl doc +sftp test" PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN" diff --git a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild index 530fa338ff01..535c71119fbc 100644 --- a/dev-vcs/bzr/bzr-2.7.1_pre.ebuild +++ b/dev-vcs/bzr/bzr-2.7.1_pre.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://bazaar-vcs.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="curl doc +sftp test" PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN" diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest index c0eea13359d8..3831790e8c94 100644 --- a/dev-vcs/cvs/Manifest +++ b/dev-vcs/cvs/Manifest @@ -21,6 +21,6 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb -EBUILD cvs-1.12.12-r11.ebuild 2995 BLAKE2B ad5bf94a3039b07f6c32a14e8ff99feb209c1e4ccaa6ad922cd8f93ec705594b1fdd7e18d697897ea994898acda877b63c38dea149d7f919f7a1416621d3257a SHA512 51ac321b9d9d1cbb4a7ee8fd46e36c1f5a13559e3f9fe0a42310748fc6c4f5c1348caef72a45d6ac1fafff468fcb9ff6aa13bb2283a6ac07afeac891b8e2d09f -EBUILD cvs-1.12.12-r12.ebuild 2990 BLAKE2B 2faab14655d239f863e83edd22bf2d1d0c83954f6fdca7a0032edb89c0ee3c531e4623fc612f83f1e66ce71fbf9b3eb28cb27b4c9f213d8ad8ce2d938cff0ed1 SHA512 2dae2c584e5923334dffc3c7b7b4b101de1995e8c05ded5de4d627570d79f2b06b59bcae01e3a92dcbb9ea5426991d1e78bee536cb20c59a5e353c175836531d +EBUILD cvs-1.12.12-r11.ebuild 2984 BLAKE2B 722d554d0c47634755f07c7931a7397d07bda684eb301134c6257c76e7412e85a37e8c3a4e16aa1d5ba792711b057418b9d2ee87c7fbd4b253c4211ed579efaa SHA512 af3615d49bdc9cca776efaf8e05cb682710ef815a8dd319fac74964e7d5aa25e59814dbb962882a2acf0adec671e387012455edb340b9f4cfdceb3314a1773a3 +EBUILD cvs-1.12.12-r12.ebuild 2979 BLAKE2B 963559a287c19354b0b0f050fac6c04480e97e58e7a8b896447eed70918be2789133a3b4c9e5d68eca9b733fbe7d45b5ab04f81cfb8201bdb69f16ffd17d7307 SHA512 3406b3b1edf52d8b481fd5c3f43445a0d9221480e9c18e2f3b29a75f5afcd9b56c0743f18378333c402ea5ad79a671625f4f60c12e8d14e5ffac353ea2110dc5 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild index 0688f5bfeeef..79106939bf1a 100644 --- a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild +++ b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="crypt doc kerberos nls pam server" RESTRICT="test" diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild index 4fd2e77144a9..6506d0b9b5c1 100644 --- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild +++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="crypt doc kerberos nls pam server" RESTRICT="test" diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest index 079803b070a0..fa626aa92538 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 1425 BLAKE2B 7d7f36d88a6197b8a7bbd122ee48fab05d8bf19a96b8c6218567ebf61ff4858683d3a6d6a63501f92b5b8691b6ab9d0557121bc923ab2d19349b7537472d7f2c SHA512 cfecf4797c7cef63909a73d0d9882f77093841146b43d3dc8562ff13ceae1a307deb421452ea6cb2de16dcba4aee9af738bea62e64e9ae58f5daaa4ddecaec69 -EBUILD git-tools-2015_p20160201-r1.ebuild 1483 BLAKE2B 0880c63cb63d1cb998078664f6e429564489a5e4e8e955d5b184a4691caf792dd4a2f5877dd8bdfe4af52a44a06d45ea8cee1938abd49a940cefb89e2c327d17 SHA512 9a82bd81eabd0b321a7e6f9e50d7d4c118c2ae3d4f0889ae47d28799c9eac6268ccc958047609c89f36190040c163511d1145255ac99cd9e52ce65f8f36bdfa9 -EBUILD git-tools-2015_p20160201.ebuild 1426 BLAKE2B 6a61da4cd5cd83b632d48544f6c1a73a1e9a3ea159ef66cad1b5c0e00694d7152300d9cb1b91e186f2b5d61631904ba9ea0432026e2c77bfb430e28bdeb7a316 SHA512 e2c5983254f9c4b25924fc57c7b5de44acb51d787fb913fd2b97ec7c9c42857a67ab3b5fe79da26697cc990e9c311b59c8121b83ae97895d750bbc887a28f2a4 -EBUILD git-tools-2017.10.ebuild 990 BLAKE2B 5a79acf90c49ced38457e3da6cc6fa02176121e92570865276484f2016823511eee32f32d5df9d4e4b4ec538ade31041291c9e026b8ff97b63f55b7e5f81372d SHA512 da803ca684574a8c4ed7897b8cc848fc3ea521d97a5074dc48644d79dfb20da52d9d923f7ce5ce312d58a6300be3c7c76354b53950ff8da37b259a7b4195186a +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 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 f99994408b46..289119ac2b71 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" 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 9eab3cbf380e..959b36715ce2 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild index da7ffa5eede6..6e0a9d41a102 100644 --- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild +++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-vcs/git-tools/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild index 22bb3d5f5880..562b1cd8ec19 100644 --- a/dev-vcs/git-tools/git-tools-2017.10.ebuild +++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/MestreLion/git-tools/archive/v${PV}.tar.gz -> ${P}.t LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 9832cdb6b38c..71b43a6e1b1b 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,7 +1,6 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a181ec9af6740033b0446f76b9620c97db582e85eff9aee0e3f88749981a135382c7a8d3187da921a5 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 AUX git-1.8.5-mw-vendor.patch 1160 BLAKE2B 37149c1ac222da71b38525ef6abeec21bc5926859725ec6c5282c5e5bee28e2f5c3e94f7bb9a0412e332c4f807ba8b4ed8544475524e857dc5b87be4128a3b44 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b AUX git-2.12.0-optional-cvs.patch 14388 BLAKE2B 146bb74bbf6abd2de767b6bf54f9e55fc1bd62fb52ea59800331c169b598853324b5bc3e168dbf344042c087d04436c9a71a2ba768ec21c730db5771067dba88 SHA512 fb44d17628e0c6d39053c8221296a8d81ccc84cf8cb49a0be13ecffcf79c69902f01c43c3b0ce45d2cb2c880116e2fb6d78d95e9c8d2fe5f19ff37bc4a6f8761 -AUX git-2.17.0-mw_install_path_fix.patch 1642 BLAKE2B 15a2b91abd9be5897d881d3fa09cdd5e7f54cf75846dc62301bf52f30e9de1367b13d00c7761372a5112b5db6719582afe4354468074223e9a0cc9c015ccf135 SHA512 082cbe10574c46c5658b731ca636d4d8663e3466819c423f62634576ebacfa0f4336947284e25e0e393a080016d20ccd9032def60cf251dda7341d9a24ff5ac1 AUX git-2.17.0_rc1-optional-cvs.patch 14142 BLAKE2B 7ecff90fd346bca0eb40faa704a621f5a4d6de4e15bfcd9f43d34cd27f4844dc05771cd8ec16af7f43346900efbeb63e4611579a7eebe2923fab10c50d7e1bce SHA512 3dcf56252f0ea27f8d5fcdfa87e3637fedafcd08f92ae800b2de22276215904916c5f687f931ced74a678717a1199ea8de3ef1587720899bc51b0ced1fce3549 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 @@ -15,19 +14,19 @@ AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fe AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac -DIST git-2.17.1.tar.xz 5015484 BLAKE2B d3a61023872a15e3176e4dae6df83d4c2369a377244d44dfd7a63a15ecc3a7b145093afd5d6fa72e4eca98ba4f81f7ccd89ac2400c9cf8107ac04fd35d8bf6e4 SHA512 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 +DIST git-2.19.0.rc2.tar.xz 5183256 BLAKE2B 2bc84d8c4f118715384837f4bdcbdbc242af8bad7bc6ead9ff0af255a4bc4eb82d3e0fe17efa91044ad4561d028d76a65466b9156ce36c9cefba37b93a0cb230 SHA512 81b9be3c858dea68808ff740afec6185eb84d097960abd8055b030e62a2d6c2d4b43026a3b715034a60ed0434dbdebcf8eb58db66c0bcdc2ee82ca37275588e0 DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049 -DIST git-htmldocs-2.17.1.tar.xz 1173296 BLAKE2B 5133a86fb73cd58d6a9d4ed05d32949f642c9a670a49ea67c7170dfb39c4ff3f63d5f220abebcc979f87a360ec2990ccf5a9e3c18e8fcb07082bac111ecb12c7 SHA512 69054b087ffd1c88532672c6edea3cd27e08421f25c09a1a304420ec6aa20806888f71e4ef21aac1bc2fed81a045a64ae164a9dc377eb48d61887bf8d787782c DIST git-htmldocs-2.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324 +DIST git-htmldocs-2.19.0.rc2.tar.xz 1221788 BLAKE2B e59dd6ff7c6bd644999dafec4e8029d467a910e704f38ab8cde34d73b50f6169a9c6eb68358b43a77ea47a955c8cea724863a30b675c4e02d24ed8c74107e484 SHA512 b79159e8931c2d327a5af60283281241b4b26b629c5424c165a2ef79eafb1c37616a8b69bbca090a3a7aac257efa4359ee2fae55dd418f7ac9f84cd94c17e60b DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d -DIST git-manpages-2.17.1.tar.xz 419400 BLAKE2B af8cef1ac43c6b5ee073c7e18c161ba3ebe0669e474833211c95e72b33524050c30ca133ada98e07c8b481ffc4a5cbce1e7d68427b7aeb9bb80534c2ef3623f0 SHA512 fbdd4ef99419d244bc7c03b10cf09e92d1f0894879fe159ee1f53262daebdc7fe72d6c2bbe9e21fe354f8afb26fa06b35788e54b0c078b686706b511bf7c33ee DIST git-manpages-2.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15 -EBUILD git-2.16.4.ebuild 19319 BLAKE2B 599efe2f0e2531a3e41de929aaa0cce0ab28b67fd2938153c8e0f9595c58183bf2676f85ca1d61c387df597f328c1d0d2ea09f2ab07f3dc9d8a6a37716347981 SHA512 f25f7b531fcdaf60709292f3e5686e857c5868bc1b8123cbfc37d29897dc6e2312afaa365a158777c4f3df2dcd01f7dd34d002fc86be2310807f33a4d58413e2 -EBUILD git-2.17.1-r1.ebuild 19367 BLAKE2B 982cdfe822750704332e2aae05507711df16b56a4d95de393b3f6e89a288d9f79d48f73bc94c29d6886343c721155e245b04489cda2638747d08a71c858bb98d SHA512 9db3855d8b1112089ffd148623ddf07d2f2e52488dca86f8d1f1fb9b0f571366a67d36338bacc7687df68dc68b78a5e21afd62a5f9512db51fdfbde042686fb3 -EBUILD git-2.18.0.ebuild 19306 BLAKE2B 07251cfe7c81181e5ac2063161d025c868204614096305c0cac4d74b7fda6b90b06f25af9edd5a8e0ba1ddcced553999d4eea1c310d8ba2ed2d12f8268113615 SHA512 123982ccd4fc8d7693eadd19a9e3c26ade6a0d56a72d7db8486132839d5a4828c8e0a316c252ec120a76f6d7ed31dd02e7d06f0eb8def3fe0aad9b0bee92a6f6 -EBUILD git-9999-r1.ebuild 19306 BLAKE2B ec701eb40465c2f17f19146095956492468acc9398b359740772573afe57683e2e23cca6413cd205142813792af3cd4861c024649acb6c7963f5168ab801fba3 SHA512 19bd57b714753a6d4cbf6a3da4cccbc2c42dd002af3743a047c3ee9562cc89e2dc8c59780bb42cde958d9d25b9f60bd68b80493d58d3988614d6b39bf9d395db -EBUILD git-9999-r2.ebuild 19306 BLAKE2B ec701eb40465c2f17f19146095956492468acc9398b359740772573afe57683e2e23cca6413cd205142813792af3cd4861c024649acb6c7963f5168ab801fba3 SHA512 19bd57b714753a6d4cbf6a3da4cccbc2c42dd002af3743a047c3ee9562cc89e2dc8c59780bb42cde958d9d25b9f60bd68b80493d58d3988614d6b39bf9d395db -EBUILD git-9999-r3.ebuild 19308 BLAKE2B fd52b1bbe955dc1906fc598261ba6507def9881d0709b287ad36f1cd3e00330e79f8f34ae75452e298dbeb997d1df899f0b89e1f9fb8f5c5fe313860a5bff39a SHA512 195e102692f3b229dffe7ecbc9736091d6ab16061abbc9e2ed208f2abdf4bf1ae1171582355a1d8ecd04c07528e8e9cf113e4bd3c827a225e54e35af5a492496 -EBUILD git-9999.ebuild 19306 BLAKE2B 8df30299ed6167a9f1055e229ff5b263d2034367b5385395c4f37188c0add36998b572ed7bd8df51af15eb70f851895cae4c0843d172867f593c626ea5a34862 SHA512 c7f14472ec2326fe726009fd82fdc952de19813c600cb2e649faa78847448fcfd2b8f3ea195277985f86ca4cbe144ab4b1f04e014e3a927c2febb3d30b02aab8 +DIST git-manpages-2.19.0.rc2.tar.xz 431812 BLAKE2B 8c033585010648db139c8a4448227647efa615103e78341438ace1d010eba42635f6a00918d6705a674d08daebdba68d0548aae1c32f6a3633114e49240caa4f SHA512 003d0c588e62e1206940c872f5562ad93dd5098962f88e89d7b2f0740675fc5adb33bbe9634a288ef9f7a15b14db50b0c12f051a2d192ca8f937777453b651f9 +EBUILD git-2.16.4.ebuild 19308 BLAKE2B c9b9a129e60c18afca00af335bc8098ee24c7ab767d69b75453d5dc223c1d885f6b199868b0155a961eacb39b79bc7d0d9d918f17c581923fec0a352d3e83004 SHA512 b333154f1ed1d0f568f9ca2de3b2ff27210c14ab7e5a6bcf5893eefd1da22578a75b88b18226fd099a21b7768d629f7f08fe3cda49283c5f3ff99d63c9352019 +EBUILD git-2.18.0.ebuild 19295 BLAKE2B 645bd7437bdca23956039e0d5a3976c3c67b862694de8b4f6adecbf72dfc734665709334aa170ccf828d2572a3f3420b4e796a085f8e6ae6ebc8d74525af94cb SHA512 51c128adf0503fd6073b85666f9e1fdc26483434086a170941c572e142975a22914e28fab6f46c37623e3b57689994503d4483ecf4543992741516a09a5f7ec3 +EBUILD git-2.19.0_rc2.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79 +EBUILD git-9999-r1.ebuild 19295 BLAKE2B 645bd7437bdca23956039e0d5a3976c3c67b862694de8b4f6adecbf72dfc734665709334aa170ccf828d2572a3f3420b4e796a085f8e6ae6ebc8d74525af94cb SHA512 51c128adf0503fd6073b85666f9e1fdc26483434086a170941c572e142975a22914e28fab6f46c37623e3b57689994503d4483ecf4543992741516a09a5f7ec3 +EBUILD git-9999-r2.ebuild 19295 BLAKE2B 645bd7437bdca23956039e0d5a3976c3c67b862694de8b4f6adecbf72dfc734665709334aa170ccf828d2572a3f3420b4e796a085f8e6ae6ebc8d74525af94cb SHA512 51c128adf0503fd6073b85666f9e1fdc26483434086a170941c572e142975a22914e28fab6f46c37623e3b57689994503d4483ecf4543992741516a09a5f7ec3 +EBUILD git-9999-r3.ebuild 19297 BLAKE2B 979703ae8f963a426d6a4497a913be1293746ea82f36f5c97f5c9c5706a2c9a5e732c9200dce6ede8f0e37f60ae93969343f42414bf90b2d5e12dddfd8ca5e5c SHA512 a8644b7d98660992cf3395bc136159333e2c228d7c1e10fae38e1b4df0a255e218dc0599245b17a08a54c4aac4e2dcbf1ab66bd759c940632514bee68c0b890e +EBUILD git-9999.ebuild 19295 BLAKE2B 89ea9758f2c84910d60363d34264e38d02c2e746beadae753d642d6de89e73335a39001312546b2665a3db913be880ed2036b992d8881a534ff86505467b0f6d SHA512 3ec3ea943d82872139f8d0ac95b06b6f6ae2f2166d09b7853c7bb2efda3313e6527838c080f728d89b794f2de4b789a3ae482ec900eca06e65f245ed5722d3af MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd diff --git a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch deleted file mode 100644 index 5a66a4c89be0..000000000000 --- a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Tue, 10 Apr 2018 15:36:41 +0200 -Subject: [PATCH] perl: fix installing modules from contrib - -Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) -removed a target that allowed Makefiles from contrib/ to get the correct -install path. This introduces a new target for main Makefile and fixes -installation for Mediawiki module. - -v2: Pass prefix as that can have influence as well, add single quotes - for _SQ variant. - -Signed-off-by: Christian Hesse ---- - Makefile | 2 ++ - contrib/mw-to-git/Makefile | 5 +++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2091f5f892cc8..75b9ad3b480cb 100644 ---- a/Makefile -+++ b/Makefile -@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE - echo "$$FLAGS" >$@; \ - fi - -+perllibdir: -+ @echo '$(perllibdir_SQ)' - - .PHONY: gitweb - gitweb: -diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile -index a4b6f7a2cd412..4e603512a39fe 100644 ---- a/contrib/mw-to-git/Makefile -+++ b/contrib/mw-to-git/Makefile -@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/ - INSTALL = install - - SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) --INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ -- -s --no-print-directory instlibdir) -+INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \ -+ -s --no-print-directory prefix=$(prefix) \ -+ perllibdir=$(perllibdir) perllibdir) - DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) - INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) - diff --git a/dev-vcs/git/git-2.16.4.ebuild b/dev-vcs/git/git-2.16.4.ebuild index 08622375f75b..87acf90bc20e 100644 --- a/dev-vcs/git/git-2.16.4.ebuild +++ b/dev-vcs/git/git-2.16.4.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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" diff --git a/dev-vcs/git/git-2.17.1-r1.ebuild b/dev-vcs/git/git-2.17.1-r1.ebuild deleted file mode 100644 index b4228e2fa4e5..000000000000 --- a/dev-vcs/git/git-2.17.1-r1.ebuild +++ /dev/null @@ -1,717 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd" -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 ) -" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Net-SMTP-SSL - 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.17.0_rc1-optional-cvs.patch - - "${FILESDIR}"/git-2.17.0-mw_install_path_fix.patch #655960 - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 THREADED_DELTA_SEARCH=YesPlease 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' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=( NO_NSEC=YesPlease ) - - 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 - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/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/git for Git bash command 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.18.0.ebuild b/dev-vcs/git/git-2.18.0.ebuild index 0581d3949ccd..186cdcff1c84 100644 --- a/dev-vcs/git/git-2.18.0.ebuild +++ b/dev-vcs/git/git-2.18.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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd" + 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" diff --git a/dev-vcs/git/git-2.19.0_rc2.ebuild b/dev-vcs/git/git-2.19.0_rc2.ebuild new file mode 100644 index 000000000000..f26b6776b942 --- /dev/null +++ b/dev-vcs/git/git-2.19.0_rc2.ebuild @@ -0,0 +1,706 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="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 ) +" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( + dev-perl/Error + dev-perl/MailTools + dev-perl/Net-SMTP-SSL + 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 THREADED_DELTA_SEARCH=YesPlease 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' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=( NO_NSEC=YesPlease ) + + 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/git for Git bash command 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-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 5668d84a1bd2..186cdcff1c84 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.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 ~arm-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" diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 5668d84a1bd2..186cdcff1c84 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.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 ~arm-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" diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 2cab4c88875b..a1219aeea6ef 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.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 ~arm-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" diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 0622a00bd6dc..b6ac61a6a24b 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.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 ~arm-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" diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 7c060980c636..dbd8436d0ee7 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -3,9 +3,11 @@ AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb40 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 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.7.tar.gz 6476268 BLAKE2B e13458729f06a2516e885abf767989e8df7f3cc743f7f57aa44ca41c6c2c4542a28e6172a7e109395fb76057afc04c2318b10f8b21ae90cb5c9efe6188da0483 SHA512 a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8 -EBUILD mercurial-4.5.2.ebuild 3547 BLAKE2B f472141575aef5f6091625beeb30674e29b3d18e72887045c0e1f70914f285613317f6549679a695f13eda3f8b9af51a0b1270108355394f0ac49de4e76bdbc0 SHA512 04604379d7d11c530bf178f0b316160f0fbfd76ea0aeca5a806482c780a8142109fa23d43383f25f195421f3eacc9217a2dd58128ed2cad45deb1d730cbeb585 -EBUILD mercurial-4.6.2.ebuild 3551 BLAKE2B 0d19507fb765cd391ccb19b2a7aab6715ad900de92dd2dfcf2b0788a32ebe3fa5081230b77fcd35eb8980ba8c898f60275dcd6a479f1fb965d0cbbcd5fff2ba0 SHA512 7967f72dd65ef28e49939cb99bcd696c5e6a373cec68e185fabcb8d6b34dd839a793b8718d65f5348efcff60ad0bdcf3eeba451fc5de9226282ec4a18dd2415a -EBUILD mercurial-4.7.ebuild 3504 BLAKE2B 0033386d6a0fbc5f0221b58ccd6389d58f852a2ef2a4d30008898cac30911ff120603c6afbcf28b30a42127c46c254c4a265f4b125ab6b9234d2a61351ebb392 SHA512 df17c9707c561fb6cb8174c2aa2a6921660db1b61a169da739f5e5f975e63c0c3c3d3d1157e23046288b0f3417f497bb32c8efa7313f262236a02ed14b748120 +EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c980435363597625402a0e67afdc10d55cc4477ca85dea764d860cecdb8bd68ee13afc66cf6203ae96f1a3b5363b93e0e74 SHA512 766576864da5700f107a530f1a06fbf33d1d593597ad236ad841d3ba59774c4aedf3e43dda00a86b1894f99c03f7af228d8026363d81a2c3b0b8ab98f22c246a +EBUILD mercurial-4.6.2.ebuild 3539 BLAKE2B c1a300e7dd1864d7b922e141dc46d42c49839391f9b7a5b783280ba80e71864a51b26aee82c94a1f46f3191532033e3b6e5a8dd382ff55c3c923ea6d08a988d3 SHA512 c9efa9d6dedcac8bc81a401aa4def8e9a35cc217cf8a4a66981e0562541404f9790cbb8611989275b3086cc6fdef92c183c0e5a2a51a235cc91f757cad6aeff1 +EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 +EBUILD mercurial-4.7.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 diff --git a/dev-vcs/mercurial/mercurial-4.5.2.ebuild b/dev-vcs/mercurial/mercurial-4.5.2.ebuild index 1a3926395a4d..e78fab88efa6 100644 --- a/dev-vcs/mercurial/mercurial-4.5.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.5.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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}] ) diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild index cb567c14f46d..a2bdd5c7ada9 100644 --- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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}] ) diff --git a/dev-vcs/mercurial/mercurial-4.7.1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1.ebuild new file mode 100644 index 000000000000..9446c0956cd6 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-4.7.1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" + +inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic + +DESCRIPTION="Scalable distributed SCM" +HOMEPAGE="https://www.mercurial-scm.org/" +SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bugzilla emacs gpg test tk" + +RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk ) + app-misc/ca-certificates" +DEPEND="emacs? ( virtual/emacs ) + test? ( app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] )" + +SITEFILE="70${PN}-gentoo.el" + +PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) + +python_prepare_all() { + # fix up logic that won't work in Gentoo Prefix (also won't outside in + # certain cases), bug #362891 + sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + strip-flags -ftracer -ftree-vectorize + # Note: make it impl-conditional if py3 is supported + append-flags -fno-strict-aliasing + + "${PYTHON}" setup.py build_mo || die +} + +python_compile_all() { + rm -r contrib/win32 || 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.7.ebuild b/dev-vcs/mercurial/mercurial-4.7.ebuild index 472f7fbf0c79..9446c0956cd6 100644 --- a/dev-vcs/mercurial/mercurial-4.7.ebuild +++ b/dev-vcs/mercurial/mercurial-4.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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}] ) diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index d69321d7d442..b884778151ee 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -10,5 +10,5 @@ DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8c DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b EBUILD subversion-1.10.0.ebuild 15267 BLAKE2B 75507211a3abba7e806d8d4c5a0a0f150f4b9278b04cb695b5eee26df59b36cddbac29f0a3b8b386195a33f9dcdce680b909e9ebc2925aa3836a5714e2448a20 SHA512 4b6e1997e414beb1ddf6359b7fe30eb7e7d45ba44c7d42fe5fb7d5498d73416927ab78d387b45749122013054687dc6906c3cfd1788e0609f04162c02e6412ef EBUILD subversion-1.10.2.ebuild 15344 BLAKE2B 568bff7d345423cc0ce9facb859e0bd100f7438e857a920c084ae51561cd433db8459071dbd80a1873f22603d5cdc306a505a53827d7fb6c0ddc5c0a4e21d434 SHA512 841fe3ca4be18b5a7670e6006c209a51161c9feddae3a95761289ebadbbff5dc9b9e3e709d619857d6758d12d75a486e04f23cbab32042c3e3563a0f83352225 -EBUILD subversion-1.9.7-r1.ebuild 15815 BLAKE2B 22d899a6f52135775822749a9b2ffbf1cfe02bc80e3565265d1b4afc8bec0c57d7c956b75ed404ced7a6726daa77b1be2c2889c8b01407aec31ee52cb91c5573 SHA512 00c23e222b0a27e9a0239be4eeaa87706402c6bad5c4d8b5202bf21e4d7ff5c564848fffbcf2cea827b16e7b319215b2d2bf420e0c793ad607c81b040f75a2dd +EBUILD subversion-1.9.7-r1.ebuild 15804 BLAKE2B 1231e2ab2ba1b776ef43f3b543b57ff127cf59c52a3eb42e131789b2493388aa93f17f2d9760f110081c86a464dc559cce580ffd1641c146086a426bfe09b623 SHA512 bf0969059cb64b5ddea51c7423e5a8177b5e7ba4a821014799b933eb01f0d10f84d498cb11affd218009fc4e4721aa10f69a8e03dc61aabbfda373511bd143a3 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313 diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild index 6f65e8a0b77d..c135b20995f5 100644 --- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild +++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild @@ -20,7 +20,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~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=" diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest index 961a61728733..ea81104cd1c4 100644 --- a/dev-vcs/svn2git/Manifest +++ b/dev-vcs/svn2git/Manifest @@ -2,7 +2,9 @@ AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d 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.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/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild new file mode 100644 index 000000000000..ab7c62035ef9 --- /dev/null +++ b/dev-vcs/svn2git/svn2git-1.0.13.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop qmake-utils +[[ "${PV}" == "9999" ]] && inherit git-r3 + +DESCRIPTION="Tool for one-time conversion from svn to git" +HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" +else + SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="" +# KEYWORDS way up + +DEPEND=" + dev-qt/qtcore:5 + dev-vcs/subversion" +RDEPEND="${DEPEND} + dev-vcs/git" + +DOCS=( README.md ) + +src_configure() { + local qmake_args=( + APR_INCLUDE=/usr/include/apr-1 + PREFIX=/usr + SVN_INCLUDE=/usr/include/subversion-1 + VERSION=${PV} + ) + eqmake5 "${qmake_args[@]}" fast-export2.pro +} + +src_install() { + einstalldocs + insinto /usr/share/${PN}/samples + doins samples/*.rules || die 'doins failed' + dobin svn-all-fast-export || die 'dobin failed' + dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' +} -- cgit v1.2.3