summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-09-05 15:19:28 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-09-05 15:19:28 +0200
commit0ad05206d5bfac7430a84973a7051b0416309403 (patch)
tree332083b50a5bcf75337d897607908c21d7e04645 /dev-vcs
parentdev-libs/ell: Removed old. (diff)
downloadgentoo-0ad05206d5bfac7430a84973a7051b0416309403.tar.gz
gentoo-0ad05206d5bfac7430a84973a7051b0416309403.tar.bz2
gentoo-0ad05206d5bfac7430a84973a7051b0416309403.zip
dev-vcs/git: Bump to version 2.19.0_rc2. Removed old.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/Manifest6
-rw-r--r--dev-vcs/git/git-2.19.0_rc2.ebuild (renamed from dev-vcs/git/git-2.19.0_rc1.ebuild)9
2 files changed, 3 insertions, 12 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1bdf20d7768..b38edd1a7f8 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,9 +1,9 @@
DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
-DIST git-2.19.0.rc1.tar.xz 5182228 BLAKE2B 48249229d5932c891bb201aed224584b6be05c1658128305614028bec182cc456e714a0285acf601ce02d65ef0bd947ea7a1ab1edf6b63cb930bd0afa8d51b1f SHA512 d628387d78a34ee5b182c0f34ae9e0f2ecf63ce6c969400ad0d472b86eef90577046a137261c4ce504ad970a86e46d73302e2cce665f69f35a2e9715cd2cd459
+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.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324
-DIST git-htmldocs-2.19.0.rc1.tar.xz 1221080 BLAKE2B 68e6f4848f80f26dad5f8b422a361c641a21ae88f92a29cc9fd40c0d3644267bf0c72664fbac3a72a9c7ecac4c469508f8907d9bac85b1697c272b2a9df2c441 SHA512 2254d22b9279fca4659c0dbd8b9d1e2c5ac9a28ddfaf1b0c94dcf4a56126967bc6bfc424af6ffc5ca718d07ca008720b7ff4cb66e8ce28935fb9c32d4fc8ad75
+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.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15
-DIST git-manpages-2.19.0.rc1.tar.xz 431844 BLAKE2B 3a5477dbf9e5b8b11c347a93cd8f1ed3c9e28c8317d56b909dcb77c2b25c140aaf3bf897a9c65e1d55e5581c755a679051249d2684a8532e1ccfa0bfcb068fd8 SHA512 82dd782f7fbc5a7d7ae5f8caa201ca48b04d279683671f790db9a777723c50d9fa4d2be239e273af99cd0f72f2c9d9da763dff54934b94564aad05e9a8502e1e
+DIST git-manpages-2.19.0.rc2.tar.xz 431812 BLAKE2B 8c033585010648db139c8a4448227647efa615103e78341438ace1d010eba42635f6a00918d6705a674d08daebdba68d0548aae1c32f6a3633114e49240caa4f SHA512 003d0c588e62e1206940c872f5562ad93dd5098962f88e89d7b2f0740675fc5adb33bbe9634a288ef9f7a15b14db50b0c12f051a2d192ca8f937777453b651f9
diff --git a/dev-vcs/git/git-2.19.0_rc1.ebuild b/dev-vcs/git/git-2.19.0_rc2.ebuild
index 186cdcff1c8..f26b6776b94 100644
--- a/dev-vcs/git/git-2.19.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.19.0_rc2.ebuild
@@ -140,9 +140,6 @@ PATCHES=(
"${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
"${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() {
@@ -294,12 +291,6 @@ src_prepare() {
# 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() {