From 71f90788ea25daefaec5109da1c936bea75a9cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sat, 17 Sep 2016 21:04:41 +0200 Subject: [PATCH] [dev-vcs/git*,www-apps/gitweb] version bump to 2.10.0 --- dev-vcs/git-cvs/Manifest | 8 ++-- ...cvs-2.7.4.ebuild => git-cvs-2.10.0.ebuild} | 8 ++-- dev-vcs/git-gui-tools/Manifest | 4 +- ...7.4.ebuild => git-gui-tools-2.10.0.ebuild} | 8 ++-- dev-vcs/git-subversion/Manifest | 8 ++-- ....4.ebuild => git-subversion-2.10.0.ebuild} | 10 ++--- dev-vcs/git/Manifest | 8 ++-- dev-vcs/git/files/git-daemon_at.service | 13 ------ .../{git-2.7.4.ebuild => git-2.10.0.ebuild} | 43 ++++++++++++++----- www-apps/gitweb/Manifest | 2 +- ...tweb-2.7.4.ebuild => gitweb-2.10.0.ebuild} | 6 +-- 11 files changed, 63 insertions(+), 55 deletions(-) rename dev-vcs/git-cvs/{git-cvs-2.7.4.ebuild => git-cvs-2.10.0.ebuild} (96%) rename dev-vcs/git-gui-tools/{git-gui-tools-2.7.4.ebuild => git-gui-tools-2.10.0.ebuild} (96%) rename dev-vcs/git-subversion/{git-subversion-2.7.4.ebuild => git-subversion-2.10.0.ebuild} (96%) delete mode 100644 dev-vcs/git/files/git-daemon_at.service rename dev-vcs/git/{git-2.7.4.ebuild => git-2.10.0.ebuild} (93%) rename www-apps/gitweb/{gitweb-2.7.4.ebuild => gitweb-2.10.0.ebuild} (98%) diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest index 4bdfb9cc9..ca9acc29d 100644 --- a/dev-vcs/git-cvs/Manifest +++ b/dev-vcs/git-cvs/Manifest @@ -1,8 +1,8 @@ -DIST git-2.7.4-Gentoo-patches.tar.gz 5021 SHA256 63f93baa2d61b923a09689312981dcfc3fc4c82b82804a91444c6495c8c8fbe5 SHA512 fc2e2e05f5a7a9a09a79f478b39a7fb0577a88c7722dcc71052933fd4912a43798d2734e79ffa52d7d88127b2549c47c4b9142132308bdca43a3e79726418944 WHIRLPOOL 5ef4257ed3cc3b4306145e8928645385a67d595d77e1b3ee5438c3a1368f6d79776688e803c8880c71fc0416d843f14d134a66d448730ee7a3caa140d182b610 -DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3 +DIST git-2.10.0-Gentoo-patches.tar.gz 5012 SHA256 9573d8955ee32b465d11a020d0ede92dfe675a02734e8895d55ac55b87a986a3 SHA512 f8da3e3e74de323b2580d7178db2e72b0c4e9375d606422cc4f2e7b4abe600a623bffa1566ce2d5aded1036f9b8d9c4383e44583287202a7c7a4e3126590144d WHIRLPOOL fb3ad536f7afb1d0efa1054589fee2a9e68bde17c1dc11b39dbf1ab1dc64391940ff093c9a4d1be4e0d2da7e468abd686e9d69a85e5d3fbc67dd05678543eba1 +DIST git-2.10.0.tar.xz 4096264 SHA256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 SHA512 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e WHIRLPOOL 7d5aaa0cef6df32941ed05959816dd66613ec100f534dbc877d4a9000813d2c9880634922bf1b4ace3a7a0e1ad09337fc7612caa8b582f75474eb79b4d4d9127 DIST git-2.9.2-Gentoo-patches.tar.gz 5084 SHA256 197b1e92b095824b41fce7dee38aac4d6cd3568ee14a7393d77232e6ea9ae4b8 SHA512 ba3a860479ca229c157ddd96064957b18bbd5e87ad26d80f1e67db40312a0979336c89927a532dd761c2319680a4146ea1c3bdffbe96202990fbd781f1b35544 WHIRLPOOL ef356a038c384f04795c74c5d23fb117a4868e599103b96d7a6f8273b14ee372671da2f515bea0a765e71dda9f72c1330d00a3efc4289005d7701b1bc9bda8af DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878 -DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869 +DIST git-htmldocs-2.10.0.tar.xz 1064292 SHA256 b51b7c51c9c50450b233c6461f1987424e8096f05261fc1284bc3c0a8f8da559 SHA512 035de46a751641e5c533d506905951d162b6170c4b0a6361ead49b106c40190520539ed64e44d98236ee70b464b2bfa0239af9fc3c6c75c92b5f287c9d932308 WHIRLPOOL fa2f516504ae79dbbc7fbe962877bbbf5dea8d2ab846dc5d06bd1e6f13fc8ea09d6d523f80c340e164207eaaf7d52f926330be6ac723323311a6fc638f91e53e DIST git-htmldocs-2.9.2.tar.xz 1053284 SHA256 6dddb003184f2ab68aa6b54e02e1e55c82c774fe6e74602e9dbefdf06826fb1c SHA512 ab13c3d8339de894084aab1a3db08f4571c22b052f7792235dfcb4ed55ff98ecad84125ec2a083bb0a3df9b8eca0e40fb7085951fbdf10d888eebc0bfbf91a17 WHIRLPOOL 6350a8867aa7f14c0ea70c71c099d8880fc3494152a9bb708a608dd969cb526e1ce015a197a5bc9f27604ad4da7ed035ca9a80381e2c9bfda932ac42c49585dd -DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5 +DIST git-manpages-2.10.0.tar.xz 394924 SHA256 3e17997d10ba18f4ad4dcddf58f7175ee78da1514b5afca3a6f198d957d822f9 SHA512 76529a4e14d92f3e80072af38335d7304a57ae42367bd99dc807231538ea67cef242546025176b3174e5b6a5e29a0da6fd598e6ec0f1c35a52b44ef0f296045e WHIRLPOOL 1da8c6fbfa801e280c0d7cb45055ed8a41619d102155d503565a9ed75249cfb18274f94c26e0992433a01b37d6e77873ab006b7ca4727401e89b2dca3f2831b0 DIST git-manpages-2.9.2.tar.xz 392552 SHA256 4c5c516ee4c0412b9475739e2125a257f6022e7c7bd006827c376fe70d47c323 SHA512 0bfbe862ba3b735e38f0fef28f1491bdbd6aa60e7402a0bc4f9aea5f9774103aa2b20a880fabd7956aa1b87e6bbf13359aa37e7af0451c8d816aeb41e0610d60 WHIRLPOOL 28e9db9c4930bce124c89cac16c9285b2211888658f1445fa2e9a18fdd2d7b8c6ea68f8d65b2c54c34d271567626e8ad7714daefdf18f9a75a1979758301f2d0 diff --git a/dev-vcs/git-cvs/git-cvs-2.7.4.ebuild b/dev-vcs/git-cvs/git-cvs-2.10.0.ebuild similarity index 96% rename from dev-vcs/git-cvs/git-cvs-2.7.4.ebuild rename to dev-vcs/git-cvs/git-cvs-2.10.0.ebuild index fe545783c..da843a496 100644 --- a/dev-vcs/git-cvs/git-cvs-2.7.4.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.10.0.ebuild @@ -7,11 +7,11 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" +[[ ${PV} == *9999 ]] && SCM="git-r3" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu -SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.7.4-Gentoo-patches.tar.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.10.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -20,7 +20,7 @@ MY_P="${MY_PN}-${MY_PV}" DOC_VER=${MY_PV} -DESCRIPTION="CVS module for GIT, the stupid content tracker" +DESCRIPTION="CVS module for git" HOMEPAGE="http://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" @@ -113,7 +113,7 @@ src_unpack() { unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} cd "${S}" else - git-2_src_unpack + git-r3_src_unpack fi sab-patches_unpack diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest index df6402797..cce46a388 100644 --- a/dev-vcs/git-gui-tools/Manifest +++ b/dev-vcs/git-gui-tools/Manifest @@ -1,4 +1,4 @@ -DIST git-2.7.4-Gentoo-patches.tar.gz 5021 SHA256 63f93baa2d61b923a09689312981dcfc3fc4c82b82804a91444c6495c8c8fbe5 SHA512 fc2e2e05f5a7a9a09a79f478b39a7fb0577a88c7722dcc71052933fd4912a43798d2734e79ffa52d7d88127b2549c47c4b9142132308bdca43a3e79726418944 WHIRLPOOL 5ef4257ed3cc3b4306145e8928645385a67d595d77e1b3ee5438c3a1368f6d79776688e803c8880c71fc0416d843f14d134a66d448730ee7a3caa140d182b610 -DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3 +DIST git-2.10.0-Gentoo-patches.tar.gz 5012 SHA256 9573d8955ee32b465d11a020d0ede92dfe675a02734e8895d55ac55b87a986a3 SHA512 f8da3e3e74de323b2580d7178db2e72b0c4e9375d606422cc4f2e7b4abe600a623bffa1566ce2d5aded1036f9b8d9c4383e44583287202a7c7a4e3126590144d WHIRLPOOL fb3ad536f7afb1d0efa1054589fee2a9e68bde17c1dc11b39dbf1ab1dc64391940ff093c9a4d1be4e0d2da7e468abd686e9d69a85e5d3fbc67dd05678543eba1 +DIST git-2.10.0.tar.xz 4096264 SHA256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 SHA512 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e WHIRLPOOL 7d5aaa0cef6df32941ed05959816dd66613ec100f534dbc877d4a9000813d2c9880634922bf1b4ace3a7a0e1ad09337fc7612caa8b582f75474eb79b4d4d9127 DIST git-2.9.2-Gentoo-patches.tar.gz 5084 SHA256 197b1e92b095824b41fce7dee38aac4d6cd3568ee14a7393d77232e6ea9ae4b8 SHA512 ba3a860479ca229c157ddd96064957b18bbd5e87ad26d80f1e67db40312a0979336c89927a532dd761c2319680a4146ea1c3bdffbe96202990fbd781f1b35544 WHIRLPOOL ef356a038c384f04795c74c5d23fb117a4868e599103b96d7a6f8273b14ee372671da2f515bea0a765e71dda9f72c1330d00a3efc4289005d7701b1bc9bda8af DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878 diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.7.4.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.10.0.ebuild similarity index 96% rename from dev-vcs/git-gui-tools/git-gui-tools-2.7.4.ebuild rename to dev-vcs/git-gui-tools/git-gui-tools-2.10.0.ebuild index 4f09a7caf..6cc20eb04 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.7.4.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.10.0.ebuild @@ -10,11 +10,11 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" +[[ ${PV} == *9999 ]] && SCM="git-r3" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu +EGIT_BRANCH=pu -SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.7.4-Gentoo-patches.tar.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.10.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -104,7 +104,7 @@ src_unpack() { unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" else - git-2_src_unpack + git-r3_src_unpack cd "${S}" #cp "${FILESDIR}"/GIT-VERSION-GEN . fi diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest index 4bdfb9cc9..ca9acc29d 100644 --- a/dev-vcs/git-subversion/Manifest +++ b/dev-vcs/git-subversion/Manifest @@ -1,8 +1,8 @@ -DIST git-2.7.4-Gentoo-patches.tar.gz 5021 SHA256 63f93baa2d61b923a09689312981dcfc3fc4c82b82804a91444c6495c8c8fbe5 SHA512 fc2e2e05f5a7a9a09a79f478b39a7fb0577a88c7722dcc71052933fd4912a43798d2734e79ffa52d7d88127b2549c47c4b9142132308bdca43a3e79726418944 WHIRLPOOL 5ef4257ed3cc3b4306145e8928645385a67d595d77e1b3ee5438c3a1368f6d79776688e803c8880c71fc0416d843f14d134a66d448730ee7a3caa140d182b610 -DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3 +DIST git-2.10.0-Gentoo-patches.tar.gz 5012 SHA256 9573d8955ee32b465d11a020d0ede92dfe675a02734e8895d55ac55b87a986a3 SHA512 f8da3e3e74de323b2580d7178db2e72b0c4e9375d606422cc4f2e7b4abe600a623bffa1566ce2d5aded1036f9b8d9c4383e44583287202a7c7a4e3126590144d WHIRLPOOL fb3ad536f7afb1d0efa1054589fee2a9e68bde17c1dc11b39dbf1ab1dc64391940ff093c9a4d1be4e0d2da7e468abd686e9d69a85e5d3fbc67dd05678543eba1 +DIST git-2.10.0.tar.xz 4096264 SHA256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 SHA512 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e WHIRLPOOL 7d5aaa0cef6df32941ed05959816dd66613ec100f534dbc877d4a9000813d2c9880634922bf1b4ace3a7a0e1ad09337fc7612caa8b582f75474eb79b4d4d9127 DIST git-2.9.2-Gentoo-patches.tar.gz 5084 SHA256 197b1e92b095824b41fce7dee38aac4d6cd3568ee14a7393d77232e6ea9ae4b8 SHA512 ba3a860479ca229c157ddd96064957b18bbd5e87ad26d80f1e67db40312a0979336c89927a532dd761c2319680a4146ea1c3bdffbe96202990fbd781f1b35544 WHIRLPOOL ef356a038c384f04795c74c5d23fb117a4868e599103b96d7a6f8273b14ee372671da2f515bea0a765e71dda9f72c1330d00a3efc4289005d7701b1bc9bda8af DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878 -DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869 +DIST git-htmldocs-2.10.0.tar.xz 1064292 SHA256 b51b7c51c9c50450b233c6461f1987424e8096f05261fc1284bc3c0a8f8da559 SHA512 035de46a751641e5c533d506905951d162b6170c4b0a6361ead49b106c40190520539ed64e44d98236ee70b464b2bfa0239af9fc3c6c75c92b5f287c9d932308 WHIRLPOOL fa2f516504ae79dbbc7fbe962877bbbf5dea8d2ab846dc5d06bd1e6f13fc8ea09d6d523f80c340e164207eaaf7d52f926330be6ac723323311a6fc638f91e53e DIST git-htmldocs-2.9.2.tar.xz 1053284 SHA256 6dddb003184f2ab68aa6b54e02e1e55c82c774fe6e74602e9dbefdf06826fb1c SHA512 ab13c3d8339de894084aab1a3db08f4571c22b052f7792235dfcb4ed55ff98ecad84125ec2a083bb0a3df9b8eca0e40fb7085951fbdf10d888eebc0bfbf91a17 WHIRLPOOL 6350a8867aa7f14c0ea70c71c099d8880fc3494152a9bb708a608dd969cb526e1ce015a197a5bc9f27604ad4da7ed035ca9a80381e2c9bfda932ac42c49585dd -DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5 +DIST git-manpages-2.10.0.tar.xz 394924 SHA256 3e17997d10ba18f4ad4dcddf58f7175ee78da1514b5afca3a6f198d957d822f9 SHA512 76529a4e14d92f3e80072af38335d7304a57ae42367bd99dc807231538ea67cef242546025176b3174e5b6a5e29a0da6fd598e6ec0f1c35a52b44ef0f296045e WHIRLPOOL 1da8c6fbfa801e280c0d7cb45055ed8a41619d102155d503565a9ed75249cfb18274f94c26e0992433a01b37d6e77873ab006b7ca4727401e89b2dca3f2831b0 DIST git-manpages-2.9.2.tar.xz 392552 SHA256 4c5c516ee4c0412b9475739e2125a257f6022e7c7bd006827c376fe70d47c323 SHA512 0bfbe862ba3b735e38f0fef28f1491bdbd6aa60e7402a0bc4f9aea5f9774103aa2b20a880fabd7956aa1b87e6bbf13359aa37e7af0451c8d816aeb41e0610d60 WHIRLPOOL 28e9db9c4930bce124c89cac16c9285b2211888658f1445fa2e9a18fdd2d7b8c6ea68f8d65b2c54c34d271567626e8ad7714daefdf18f9a75a1979758301f2d0 diff --git a/dev-vcs/git-subversion/git-subversion-2.7.4.ebuild b/dev-vcs/git-subversion/git-subversion-2.10.0.ebuild similarity index 96% rename from dev-vcs/git-subversion/git-subversion-2.7.4.ebuild rename to dev-vcs/git-subversion/git-subversion-2.10.0.ebuild index 67700cc62..17de0b29c 100644 --- a/dev-vcs/git-subversion/git-subversion-2.7.4.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.10.0.ebuild @@ -7,11 +7,11 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" +[[ ${PV} == *9999 ]] && SCM="git-r3" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu +EGIT_BRANCH=pu -SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.7.4-Gentoo-patches.tar.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.10.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -20,7 +20,7 @@ MY_P="${MY_PN}-${MY_PV}" DOC_VER=${MY_PV} -DESCRIPTION="Subversion module for GIT, the stupid content tracker" +DESCRIPTION="Subversion module for git" HOMEPAGE="http://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" @@ -119,7 +119,7 @@ src_unpack() { unpack ${MY_PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} cd "${S}" else - git-2_src_unpack + git-r3_src_unpack fi sab-patches_unpack diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 4bdfb9cc9..ca9acc29d 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,8 +1,8 @@ -DIST git-2.7.4-Gentoo-patches.tar.gz 5021 SHA256 63f93baa2d61b923a09689312981dcfc3fc4c82b82804a91444c6495c8c8fbe5 SHA512 fc2e2e05f5a7a9a09a79f478b39a7fb0577a88c7722dcc71052933fd4912a43798d2734e79ffa52d7d88127b2549c47c4b9142132308bdca43a3e79726418944 WHIRLPOOL 5ef4257ed3cc3b4306145e8928645385a67d595d77e1b3ee5438c3a1368f6d79776688e803c8880c71fc0416d843f14d134a66d448730ee7a3caa140d182b610 -DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3 +DIST git-2.10.0-Gentoo-patches.tar.gz 5012 SHA256 9573d8955ee32b465d11a020d0ede92dfe675a02734e8895d55ac55b87a986a3 SHA512 f8da3e3e74de323b2580d7178db2e72b0c4e9375d606422cc4f2e7b4abe600a623bffa1566ce2d5aded1036f9b8d9c4383e44583287202a7c7a4e3126590144d WHIRLPOOL fb3ad536f7afb1d0efa1054589fee2a9e68bde17c1dc11b39dbf1ab1dc64391940ff093c9a4d1be4e0d2da7e468abd686e9d69a85e5d3fbc67dd05678543eba1 +DIST git-2.10.0.tar.xz 4096264 SHA256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 SHA512 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e WHIRLPOOL 7d5aaa0cef6df32941ed05959816dd66613ec100f534dbc877d4a9000813d2c9880634922bf1b4ace3a7a0e1ad09337fc7612caa8b582f75474eb79b4d4d9127 DIST git-2.9.2-Gentoo-patches.tar.gz 5084 SHA256 197b1e92b095824b41fce7dee38aac4d6cd3568ee14a7393d77232e6ea9ae4b8 SHA512 ba3a860479ca229c157ddd96064957b18bbd5e87ad26d80f1e67db40312a0979336c89927a532dd761c2319680a4146ea1c3bdffbe96202990fbd781f1b35544 WHIRLPOOL ef356a038c384f04795c74c5d23fb117a4868e599103b96d7a6f8273b14ee372671da2f515bea0a765e71dda9f72c1330d00a3efc4289005d7701b1bc9bda8af DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878 -DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869 +DIST git-htmldocs-2.10.0.tar.xz 1064292 SHA256 b51b7c51c9c50450b233c6461f1987424e8096f05261fc1284bc3c0a8f8da559 SHA512 035de46a751641e5c533d506905951d162b6170c4b0a6361ead49b106c40190520539ed64e44d98236ee70b464b2bfa0239af9fc3c6c75c92b5f287c9d932308 WHIRLPOOL fa2f516504ae79dbbc7fbe962877bbbf5dea8d2ab846dc5d06bd1e6f13fc8ea09d6d523f80c340e164207eaaf7d52f926330be6ac723323311a6fc638f91e53e DIST git-htmldocs-2.9.2.tar.xz 1053284 SHA256 6dddb003184f2ab68aa6b54e02e1e55c82c774fe6e74602e9dbefdf06826fb1c SHA512 ab13c3d8339de894084aab1a3db08f4571c22b052f7792235dfcb4ed55ff98ecad84125ec2a083bb0a3df9b8eca0e40fb7085951fbdf10d888eebc0bfbf91a17 WHIRLPOOL 6350a8867aa7f14c0ea70c71c099d8880fc3494152a9bb708a608dd969cb526e1ce015a197a5bc9f27604ad4da7ed035ca9a80381e2c9bfda932ac42c49585dd -DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5 +DIST git-manpages-2.10.0.tar.xz 394924 SHA256 3e17997d10ba18f4ad4dcddf58f7175ee78da1514b5afca3a6f198d957d822f9 SHA512 76529a4e14d92f3e80072af38335d7304a57ae42367bd99dc807231538ea67cef242546025176b3174e5b6a5e29a0da6fd598e6ec0f1c35a52b44ef0f296045e WHIRLPOOL 1da8c6fbfa801e280c0d7cb45055ed8a41619d102155d503565a9ed75249cfb18274f94c26e0992433a01b37d6e77873ab006b7ca4727401e89b2dca3f2831b0 DIST git-manpages-2.9.2.tar.xz 392552 SHA256 4c5c516ee4c0412b9475739e2125a257f6022e7c7bd006827c376fe70d47c323 SHA512 0bfbe862ba3b735e38f0fef28f1491bdbd6aa60e7402a0bc4f9aea5f9774103aa2b20a880fabd7956aa1b87e6bbf13359aa37e7af0451c8d816aeb41e0610d60 WHIRLPOOL 28e9db9c4930bce124c89cac16c9285b2211888658f1445fa2e9a18fdd2d7b8c6ea68f8d65b2c54c34d271567626e8ad7714daefdf18f9a75a1979758301f2d0 diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service deleted file mode 100644 index 2a080d4e7..000000000 --- a/dev-vcs/git/files/git-daemon_at.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Git Repositories Server Daemon -Documentation=man:git-daemon(1) - -[Service] -User=nobody -Group=nobody -EnvironmentFile=/etc/conf.d/git-daemon -# Ignore non-zero exit status, access error makes git-daemon return them -ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS -StandardInput=socket -StandardOutput=inherit -StandardError=journal diff --git a/dev-vcs/git/git-2.7.4.ebuild b/dev-vcs/git/git-2.10.0.ebuild similarity index 93% rename from dev-vcs/git/git-2.7.4.ebuild rename to dev-vcs/git/git-2.10.0.ebuild index 1cce6b206..9f1169a9b 100644 --- a/dev-vcs/git/git-2.7.4.ebuild +++ b/dev-vcs/git/git-2.10.0.ebuild @@ -8,19 +8,27 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" +[[ ${PV} == *9999 ]] && SCM="git-r3" +# 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 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu +EGIT_BRANCH=pu +PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" -SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.7.4-Gentoo-patches.tar.gz" ) -inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.10.0-Gentoo-patches.tar.gz" ) +inherit sab-patches 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="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="http://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" @@ -195,6 +203,8 @@ exportmakeopts() { fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=" NEEDS_LIBICONV=YesPlease" + myopts+=" HAVE_CLOCK_MONOTONIC=1" + myopts+=" HAVE_GETDELIM=1" fi has_version '>=app-text/asciidoc-8.0' \ @@ -220,7 +230,7 @@ src_unpack() { unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} cd "${S}" else - git-2_src_unpack + git-r3_src_unpack cd "${S}" #cp "${FILESDIR}"/GIT-VERSION-GEN . fi @@ -310,8 +320,9 @@ src_compile() { fi if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" + cd "${S}"/contrib/credential/osxkeychain || die + git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ + || die "emake credential-osxkeychain" fi cd "${S}"/Documentation @@ -375,7 +386,7 @@ src_install() { 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} + dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html for d in / /howto/ /technical/ ; do docinto ${d} @@ -523,12 +534,22 @@ src_install() { 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.service" "git-daemon@.service" + 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 + # burn CVS with fire, see #373439 if ! use cvs; then rm -r "${ED}"/usr/bin/git-cvsserver \ @@ -537,7 +558,7 @@ src_install() { } src_test() { - local disabled="t8005-blame-i18n.sh" #520270 + local disabled="" local tests_cvs="t9200-git-cvsexportcommit.sh \ t9400-git-cvsserver-server.sh \ t9401-git-cvsserver-crlf.sh \ diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest index f584bb039..027cc25fc 100644 --- a/www-apps/gitweb/Manifest +++ b/www-apps/gitweb/Manifest @@ -1,2 +1,2 @@ -DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3 +DIST git-2.10.0.tar.xz 4096264 SHA256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 SHA512 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e WHIRLPOOL 7d5aaa0cef6df32941ed05959816dd66613ec100f534dbc877d4a9000813d2c9880634922bf1b4ace3a7a0e1ad09337fc7612caa8b582f75474eb79b4d4d9127 DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878 diff --git a/www-apps/gitweb/gitweb-2.7.4.ebuild b/www-apps/gitweb/gitweb-2.10.0.ebuild similarity index 98% rename from www-apps/gitweb/gitweb-2.7.4.ebuild rename to www-apps/gitweb/gitweb-2.10.0.ebuild index c4e800f18..c6d10172e 100644 --- a/www-apps/gitweb/gitweb-2.7.4.ebuild +++ b/www-apps/gitweb/gitweb-2.10.0.ebuild @@ -6,9 +6,9 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no -[[ ${PV} == *9999 ]] && SCM="git-2" +[[ ${PV} == *9999 ]] && SCM="git-r3" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu +EGIT_BRANCH=pu inherit toolchain-funcs eutils ${SCM} @@ -57,7 +57,7 @@ src_unpack() { unpack ${MY_P}.tar.${SRC_URI_SUFFIX} cd "${S}" else - git-2_src_unpack + git-r3_src_unpack cd "${S}" #cp "${FILESDIR}"/GIT-VERSION-GEN . fi