diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest index b81f15ccf..2b4009569 100644 --- a/dev-vcs/git-cvs/Manifest +++ b/dev-vcs/git-cvs/Manifest @@ -1,7 +1,8 @@ DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38 -DIST git-2.1.2.tar.xz 3541584 SHA256 7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b SHA512 20775b6d146faf2e139d47c31c4bb4465d7838e4450ac9d0e5bc0c40498b204303fae4619126e9c1694d7301a1e0d057a35f3fa6a29d9726f838d7c2679a5735 WHIRLPOOL 89d855601ad6d06fd3c448da648e414383d0806e135722a238638e597b077554a5b8f054fbacf000fd2d185f684e6ca61bf7edcef095594d6639a03cd69d4166 DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 -DIST git-htmldocs-2.1.2.tar.xz 957744 SHA256 eaf3f92a4fca0babc284d1a928d85d2f5313586ce7f72f71c2684adb304bbfde SHA512 ebffb2772570ada1732172b1c12000d0c2e5335a733d3688d6ec89ff01f4ee0c5c71f81336a49236f84f9841bb3c6909512f1269b3b2c23f4de4483e371bb7ef WHIRLPOOL 2fe595cd666385741d8efc05594134b4ef9b484b21dfcb15f68ab2feb20a1266a6ba7aee6ab7ee73d79323cb5e3d03048d9eabfd8e43f6c51abe67c39c04f52b +DIST git-2.2.1-Gentoo-patches.tar.gz 3808 SHA256 170d06c861e8ab18d8c25743291dec60afcd0abea6e2b3b32563dba98134d874 SHA512 50941f35b0aa85b3bdded2367fb71113525280b137d8bfd25bd7a04986237136ee50ade5fa61b747937a3d7f7689d38998c215ca2a17c84232bfacca0aec6696 WHIRLPOOL 7224129460a2b98a0fd3c9cc4e38737d2d53f47e590fc688f77f4b19cd46b2dd8c2aeffa65a0df664eb677ec4b95d503d472cbb20c2306cbd0986cf2a09173bd +DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 DIST git-htmldocs-2.1.3.tar.xz 958212 SHA256 1bb7e90de93b5b986a5a9a12eef85b92ba4961af65fb0bbde6632fca2a68b404 SHA512 da8a706446ef3ac2c297c1f6cd648d217ccce8505c9ef9f8532cb4e183808e6b3606a54805500297e6ab69f07e9e2afd2b7fa951e54949ca0d353ea7a108a469 WHIRLPOOL de695870cda98e54a7b5b109c3034bba4c6485781f3ac898807b36be6dcbbeafd0d2f21cccd77dd3e4c0126653ce321704e6509874df02fec5dc3ad1d3b89b3b -DIST git-manpages-2.1.2.tar.xz 361148 SHA256 3d0cf5c693ff9fff524f6f864e6836eeeb5d232a4c57e431d1b30873fab4facd SHA512 9c3a5e94704c71176988567c35db15518ad03ae8115f482932f20d297dbccb1490c6ae82e09e3af6d7b17f0b4148254fcf1ad47e6ab2b2e4326203801b4626a1 WHIRLPOOL 7b6db2cff2ea706baf38c334d51bcbfacc68550f6d1fa2b2ae2e69e8702993e54f01d206c98ae331beaf3b0ae4916a80d2f4d56661c427afac0015c888e3952d +DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-manpages-2.1.3.tar.xz 361240 SHA256 416c0e7634d4513d069f6a02c493d2407d3776f6676c88ff45d063c52fcd5791 SHA512 9a8eb40603f0eff2ea5671a96c7679900e7a45f1cd8449f33126c8716ebdfe50e071888fbd9a6e478784c54a8b9e6ad3ec6ac2b8aee0f33890c92d5bc46f586a WHIRLPOOL ceec5a545b7a41143596b38f3292143dffd0287db9ea5339036bdec0a79a39ec847b5f67b4143482ccc61507759a64b7f493dc066c7824dcb07df7d944486184 +DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac diff --git a/dev-vcs/git-cvs/git-cvs-2.1.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild similarity index 97% rename from dev-vcs/git-cvs/git-cvs-2.1.2.ebuild rename to dev-vcs/git-cvs/git-cvs-2.2.1.ebuild index 1b0b293f0..8e465b2d9 100644 --- a/dev-vcs/git-cvs/git-cvs-2.1.2.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.2.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) 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.0.0-r2-optional-cvs.patch.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -117,10 +117,12 @@ src_unpack() { else git-2_src_unpack fi + + sab-patches_unpack } src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. + # see the git ebuild for the list of patches sab-patches_apply_all epatch_user diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest index fd4fc1ab8..9466b618e 100644 --- a/dev-vcs/git-gui-tools/Manifest +++ b/dev-vcs/git-gui-tools/Manifest @@ -1,3 +1,4 @@ DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38 -DIST git-2.1.2.tar.xz 3541584 SHA256 7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b SHA512 20775b6d146faf2e139d47c31c4bb4465d7838e4450ac9d0e5bc0c40498b204303fae4619126e9c1694d7301a1e0d057a35f3fa6a29d9726f838d7c2679a5735 WHIRLPOOL 89d855601ad6d06fd3c448da648e414383d0806e135722a238638e597b077554a5b8f054fbacf000fd2d185f684e6ca61bf7edcef095594d6639a03cd69d4166 DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 +DIST git-2.2.1-Gentoo-patches.tar.gz 3808 SHA256 170d06c861e8ab18d8c25743291dec60afcd0abea6e2b3b32563dba98134d874 SHA512 50941f35b0aa85b3bdded2367fb71113525280b137d8bfd25bd7a04986237136ee50ade5fa61b747937a3d7f7689d38998c215ca2a17c84232bfacca0aec6696 WHIRLPOOL 7224129460a2b98a0fd3c9cc4e38737d2d53f47e590fc688f77f4b19cd46b2dd8c2aeffa65a0df664eb677ec4b95d503d472cbb20c2306cbd0986cf2a09173bd +DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.1.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild similarity index 97% rename from dev-vcs/git-gui-tools/git-gui-tools-2.1.2.ebuild rename to dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild index 12a8ebd48..7f09beded 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.1.2.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.2.1.ebuild @@ -14,7 +14,7 @@ PYTHON_COMPAT=( python2_{6,7} ) 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.0.0-r2-optional-cvs.patch.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -120,10 +120,12 @@ src_unpack() { cd "${S}" #cp "${FILESDIR}"/GIT-VERSION-GEN . fi + + sab-patches_unpack } src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. + # see the git ebuild for the list of patches sab-patches_apply_all epatch_user diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest index b81f15ccf..2b4009569 100644 --- a/dev-vcs/git-subversion/Manifest +++ b/dev-vcs/git-subversion/Manifest @@ -1,7 +1,8 @@ DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38 -DIST git-2.1.2.tar.xz 3541584 SHA256 7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b SHA512 20775b6d146faf2e139d47c31c4bb4465d7838e4450ac9d0e5bc0c40498b204303fae4619126e9c1694d7301a1e0d057a35f3fa6a29d9726f838d7c2679a5735 WHIRLPOOL 89d855601ad6d06fd3c448da648e414383d0806e135722a238638e597b077554a5b8f054fbacf000fd2d185f684e6ca61bf7edcef095594d6639a03cd69d4166 DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 -DIST git-htmldocs-2.1.2.tar.xz 957744 SHA256 eaf3f92a4fca0babc284d1a928d85d2f5313586ce7f72f71c2684adb304bbfde SHA512 ebffb2772570ada1732172b1c12000d0c2e5335a733d3688d6ec89ff01f4ee0c5c71f81336a49236f84f9841bb3c6909512f1269b3b2c23f4de4483e371bb7ef WHIRLPOOL 2fe595cd666385741d8efc05594134b4ef9b484b21dfcb15f68ab2feb20a1266a6ba7aee6ab7ee73d79323cb5e3d03048d9eabfd8e43f6c51abe67c39c04f52b +DIST git-2.2.1-Gentoo-patches.tar.gz 3808 SHA256 170d06c861e8ab18d8c25743291dec60afcd0abea6e2b3b32563dba98134d874 SHA512 50941f35b0aa85b3bdded2367fb71113525280b137d8bfd25bd7a04986237136ee50ade5fa61b747937a3d7f7689d38998c215ca2a17c84232bfacca0aec6696 WHIRLPOOL 7224129460a2b98a0fd3c9cc4e38737d2d53f47e590fc688f77f4b19cd46b2dd8c2aeffa65a0df664eb677ec4b95d503d472cbb20c2306cbd0986cf2a09173bd +DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 DIST git-htmldocs-2.1.3.tar.xz 958212 SHA256 1bb7e90de93b5b986a5a9a12eef85b92ba4961af65fb0bbde6632fca2a68b404 SHA512 da8a706446ef3ac2c297c1f6cd648d217ccce8505c9ef9f8532cb4e183808e6b3606a54805500297e6ab69f07e9e2afd2b7fa951e54949ca0d353ea7a108a469 WHIRLPOOL de695870cda98e54a7b5b109c3034bba4c6485781f3ac898807b36be6dcbbeafd0d2f21cccd77dd3e4c0126653ce321704e6509874df02fec5dc3ad1d3b89b3b -DIST git-manpages-2.1.2.tar.xz 361148 SHA256 3d0cf5c693ff9fff524f6f864e6836eeeb5d232a4c57e431d1b30873fab4facd SHA512 9c3a5e94704c71176988567c35db15518ad03ae8115f482932f20d297dbccb1490c6ae82e09e3af6d7b17f0b4148254fcf1ad47e6ab2b2e4326203801b4626a1 WHIRLPOOL 7b6db2cff2ea706baf38c334d51bcbfacc68550f6d1fa2b2ae2e69e8702993e54f01d206c98ae331beaf3b0ae4916a80d2f4d56661c427afac0015c888e3952d +DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-manpages-2.1.3.tar.xz 361240 SHA256 416c0e7634d4513d069f6a02c493d2407d3776f6676c88ff45d063c52fcd5791 SHA512 9a8eb40603f0eff2ea5671a96c7679900e7a45f1cd8449f33126c8716ebdfe50e071888fbd9a6e478784c54a8b9e6ad3ec6ac2b8aee0f33890c92d5bc46f586a WHIRLPOOL ceec5a545b7a41143596b38f3292143dffd0287db9ea5339036bdec0a79a39ec847b5f67b4143482ccc61507759a64b7f493dc066c7824dcb07df7d944486184 +DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac diff --git a/dev-vcs/git-subversion/git-subversion-2.1.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild similarity index 97% rename from dev-vcs/git-subversion/git-subversion-2.1.2.ebuild rename to dev-vcs/git-subversion/git-subversion-2.2.1.ebuild index dcd35909c..186eee6a5 100644 --- a/dev-vcs/git-subversion/git-subversion-2.1.2.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.2.1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_{6,7} ) 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.0.0-r2-optional-cvs.patch.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} MY_PV="${PV/_rc/.rc}" @@ -124,10 +124,12 @@ src_unpack() { git-2_src_unpack fi + sab-patches_unpack + } src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. + # see the git ebuild for the list of patches sab-patches_apply_all epatch_user diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index b81f15ccf..2b4009569 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,7 +1,8 @@ DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38 -DIST git-2.1.2.tar.xz 3541584 SHA256 7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b SHA512 20775b6d146faf2e139d47c31c4bb4465d7838e4450ac9d0e5bc0c40498b204303fae4619126e9c1694d7301a1e0d057a35f3fa6a29d9726f838d7c2679a5735 WHIRLPOOL 89d855601ad6d06fd3c448da648e414383d0806e135722a238638e597b077554a5b8f054fbacf000fd2d185f684e6ca61bf7edcef095594d6639a03cd69d4166 DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 -DIST git-htmldocs-2.1.2.tar.xz 957744 SHA256 eaf3f92a4fca0babc284d1a928d85d2f5313586ce7f72f71c2684adb304bbfde SHA512 ebffb2772570ada1732172b1c12000d0c2e5335a733d3688d6ec89ff01f4ee0c5c71f81336a49236f84f9841bb3c6909512f1269b3b2c23f4de4483e371bb7ef WHIRLPOOL 2fe595cd666385741d8efc05594134b4ef9b484b21dfcb15f68ab2feb20a1266a6ba7aee6ab7ee73d79323cb5e3d03048d9eabfd8e43f6c51abe67c39c04f52b +DIST git-2.2.1-Gentoo-patches.tar.gz 3808 SHA256 170d06c861e8ab18d8c25743291dec60afcd0abea6e2b3b32563dba98134d874 SHA512 50941f35b0aa85b3bdded2367fb71113525280b137d8bfd25bd7a04986237136ee50ade5fa61b747937a3d7f7689d38998c215ca2a17c84232bfacca0aec6696 WHIRLPOOL 7224129460a2b98a0fd3c9cc4e38737d2d53f47e590fc688f77f4b19cd46b2dd8c2aeffa65a0df664eb677ec4b95d503d472cbb20c2306cbd0986cf2a09173bd +DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 DIST git-htmldocs-2.1.3.tar.xz 958212 SHA256 1bb7e90de93b5b986a5a9a12eef85b92ba4961af65fb0bbde6632fca2a68b404 SHA512 da8a706446ef3ac2c297c1f6cd648d217ccce8505c9ef9f8532cb4e183808e6b3606a54805500297e6ab69f07e9e2afd2b7fa951e54949ca0d353ea7a108a469 WHIRLPOOL de695870cda98e54a7b5b109c3034bba4c6485781f3ac898807b36be6dcbbeafd0d2f21cccd77dd3e4c0126653ce321704e6509874df02fec5dc3ad1d3b89b3b -DIST git-manpages-2.1.2.tar.xz 361148 SHA256 3d0cf5c693ff9fff524f6f864e6836eeeb5d232a4c57e431d1b30873fab4facd SHA512 9c3a5e94704c71176988567c35db15518ad03ae8115f482932f20d297dbccb1490c6ae82e09e3af6d7b17f0b4148254fcf1ad47e6ab2b2e4326203801b4626a1 WHIRLPOOL 7b6db2cff2ea706baf38c334d51bcbfacc68550f6d1fa2b2ae2e69e8702993e54f01d206c98ae331beaf3b0ae4916a80d2f4d56661c427afac0015c888e3952d +DIST git-htmldocs-2.2.1.tar.xz 975488 SHA256 dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b SHA512 68843b883e2fd4f14646ff97ba9e5f3fd4de9f6bbf57a40e9c1bceb6578ebf497e50f2b808fdb4174966e26bf9ac068b44cfdf111652d15796f4f84a7406d336 WHIRLPOOL 771af06f8663eaaa6de4d117277ea05680671c6d72010653ad8e2b037b7a8d77b4a3733b6c48e4775971304b680d0df2596ed1cb4eedbf9948135912ac9509a3 DIST git-manpages-2.1.3.tar.xz 361240 SHA256 416c0e7634d4513d069f6a02c493d2407d3776f6676c88ff45d063c52fcd5791 SHA512 9a8eb40603f0eff2ea5671a96c7679900e7a45f1cd8449f33126c8716ebdfe50e071888fbd9a6e478784c54a8b9e6ad3ec6ac2b8aee0f33890c92d5bc46f586a WHIRLPOOL ceec5a545b7a41143596b38f3292143dffd0287db9ea5339036bdec0a79a39ec847b5f67b4143482ccc61507759a64b7f493dc066c7824dcb07df7d944486184 +DIST git-manpages-2.2.1.tar.xz 369796 SHA256 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538 SHA512 9fea3a61afa7336c7da9a4c9c130ed4dd05bb3b5b1cc7fe5a3953109085169d9fb92aafd2b932e6b66ad93ac46e3b60ea05c0f311a8178b53bc1c2184773ada5 WHIRLPOOL f5d1f4d47a2bc244beb3a343db37fe6898fc121310cd6bec0d3292a3352a3c86e16b3538b22317419c760870fb511120a3b03c7bc0585bfaa15c1c7418a4e8ac diff --git a/dev-vcs/git/git-2.1.2.ebuild b/dev-vcs/git/git-2.2.1.ebuild similarity index 97% rename from dev-vcs/git/git-2.1.2.ebuild rename to dev-vcs/git/git-2.2.1.ebuild index 8230d55c2..12e8a15f2 100644 --- a/dev-vcs/git/git-2.1.2.ebuild +++ b/dev-vcs/git/git-2.2.1.ebuild @@ -12,7 +12,7 @@ PYTHON_COMPAT=( python2_{6,7} ) 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.0.0-r2-optional-cvs.patch.gz" ) +SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.2.1-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} MY_PV="${PV/_rc/.rc}" @@ -221,21 +221,18 @@ src_unpack() { cd "${S}" #cp "${FILESDIR}"/GIT-VERSION-GEN . fi + + sab-patches_unpack } src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. # git-...-optional-cvs.patch + + # git-...-mw-vendor.patch + # git-...-svn-fe-linking.patch sab-patches_apply_all - # we won't be using it (at least for now), so I don't see the reason - # to carry the patches (they are mediawiki specific) - use mediawiki && die "USE=mediawiki not supported, use Portage ebuild" - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - #epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - epatch_user sed -i \ @@ -386,6 +383,7 @@ src_install() { 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} @@ -518,7 +516,7 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi - fixlocalpod + perl_delete_localpod # burn CVS with fire, see #373439 if ! use cvs; then @@ -528,7 +526,7 @@ src_install() { } src_test() { - local disabled="t7004-tag.sh" #520270 + local disabled="" #t7004-tag.sh" #520270 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 ec8aad2d9..479c81a73 100644 --- a/www-apps/gitweb/Manifest +++ b/www-apps/gitweb/Manifest @@ -1,2 +1,2 @@ -DIST git-2.1.2.tar.xz 3541584 SHA256 7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b SHA512 20775b6d146faf2e139d47c31c4bb4465d7838e4450ac9d0e5bc0c40498b204303fae4619126e9c1694d7301a1e0d057a35f3fa6a29d9726f838d7c2679a5735 WHIRLPOOL 89d855601ad6d06fd3c448da648e414383d0806e135722a238638e597b077554a5b8f054fbacf000fd2d185f684e6ca61bf7edcef095594d6639a03cd69d4166 DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 +DIST git-2.2.1.tar.xz 3590808 SHA256 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450 SHA512 66bccfa617d2c8e2e61e5aac9b8daef9d4dc151b85906af252cadef3306ecf792ad6d7869deb149f0d04f6e7c3e9f71119bfeece5690e61782fb357e5384027b WHIRLPOOL f288d0227f3ad3045fd7dcc7a7fa6e68cb29c3a4d363d6648aa4f09aa5742a4496c67d63d0ad120a1f8f9420b9ae30930b8ffb3229f176cf429f8b8c8a1d06e6 diff --git a/www-apps/gitweb/gitweb-2.1.2.ebuild b/www-apps/gitweb/gitweb-2.2.1.ebuild similarity index 98% rename from www-apps/gitweb/gitweb-2.1.2.ebuild rename to www-apps/gitweb/gitweb-2.2.1.ebuild index f4aef8b82..eb57594d9 100644 --- a/www-apps/gitweb/gitweb-2.1.2.ebuild +++ b/www-apps/gitweb/gitweb-2.2.1.ebuild @@ -145,7 +145,7 @@ src_install() { # Maybe not needed, but it's created when non-split ebuild is used too. dosym /usr/share/gitweb /usr/share/git/gitweb - # fixlocalpod from perl-module: not needed + # perl_delete_localpod from perl-module: not needed } showpkgdeps() {