diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest
index b49d2e4c6..95875aa31 100644
--- a/dev-vcs/git-cvs/Manifest
+++ b/dev-vcs/git-cvs/Manifest
@@ -1,8 +1,7 @@
-DIST git-1.9.0_rc3-optional-cvs.patch.gz 2961 SHA256 86088ca02b4b6552dbac79cc53c05c68a99d8cf878db31cd7c05fec3e23965fa SHA512 2c1d9ac13863d8893572c5bbe4b36b75e319eeb87675d6ca3bf5157b3a0591d5ebcc4d2849cd4a2a36f9c16f777e46168e27f8f4c0653d6b665eac5b6211223f WHIRLPOOL b3a65748e04db9186402908ecb177da6adf738e2593ccd06724d6a5d9a7885492f2e455fe1f222aff2886f6a5877839ebf1059215e7c16ea835c616f2f5ef5be
-DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38
 DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
-DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7
+DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0
 DIST git-htmldocs-2.0.2.tar.xz 943424 SHA256 b8adaadf5ef37aebf50a5ae0d2be17129202021306aded97c66eb97e40f47e1d SHA512 c1be70fb78b2c5a95fcf63132e4b5b1a319b3e8373a1291b9d0eea5d19ce16e8691e1ed75a254e535c0093b8b02f3906c6616d5909eb3800b94f00084d4962b0 WHIRLPOOL e89396ef5658839aaba3d5de1bbb8ab22d77e1f134a17a0f7a9d0547a9ca41525f7b1d11394135ef959bad8f42fcaeecb1697f325ab20872d6ce48016afd2de2
-DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd
+DIST git-htmldocs-2.0.4.tar.xz 943324 SHA256 0ed51a78743ff1accb9165bf2983fe8ab3bcae62d40692d881f895c7e4672ca0 SHA512 c302b12e124597610a10f1d7e3d22c2f0c4dc5bb122c6846dab210e5ce47bb1079ed0e507d44b4260cc76c633abb550729560bddcd9d7b3c2b6f958536cb5716 WHIRLPOOL 3e0408f690aa8f76225b3b91c9c1d9a8a73312abcb32b52efe448d37318818917366354a5cf41fd1a066555f5d5eb71c1ee98561f31dc1122ff123ba8c899875
 DIST git-manpages-2.0.2.tar.xz 358984 SHA256 a367ab3704c05b4d69a5a02f2d89d2b6075be63670b29e580b63f99e918c377b SHA512 36347ce921d781c230dc1a3e050eda72bc1d9e12177bbc68190b5014ac3ca77828534a930665bb4aa2c3988fff04dcd114a80da54075b150790f702648b99fff WHIRLPOOL d93c58f66a844e78669ec015572f475a0baa120e846cf5fc027e4a8a533c34f2a5cdfe2a7b3ad9e961ef64bc93655ef93621af107cd061f547415dae09438847
+DIST git-manpages-2.0.4.tar.xz 358936 SHA256 f9b15d115746b7d0bdc5ff2a46ef5cf02ec1cf9f0d61393285fae68349c6b62b SHA512 78a360c6307338e463a0401a1664694feb0bf5cb6aaaaa4d0f0b812bfca568616fb77268ba395be8cbab8612eb9a7d2f2a9e863fe76667b70f9c0d7e5c75b2cc WHIRLPOOL ce68e29d53d6ae3149cae9880914ef64e5087c980b0c14af67a5fbbc9a9cd58fe605dcfe6686cea891d51d9ee2b3eb53ac22acfcf59cc3593aafe29078b843c6
diff --git a/dev-vcs/git-cvs/git-cvs-1.9.3.ebuild b/dev-vcs/git-cvs/git-cvs-2.0.4.ebuild
similarity index 97%
rename from dev-vcs/git-cvs/git-cvs-1.9.3.ebuild
rename to dev-vcs/git-cvs/git-cvs-2.0.4.ebuild
index 1b5f052f0..ca54631d9 100644
--- a/dev-vcs/git-cvs/git-cvs-1.9.3.ebuild
+++ b/dev-vcs/git-cvs/git-cvs-2.0.4.ebuild
@@ -9,8 +9,9 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python2_{6,7} )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
 
-SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-1.9.0_rc3-optional-cvs.patch.gz" )
+SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.0.0-r2-optional-cvs.patch.gz" )
 inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
@@ -22,7 +23,7 @@ DOC_VER=${MY_PV}
 DESCRIPTION="CVS module for GIT, the stupid content tracker"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="gz"
+	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest
index fa8557d1d..53625fa72 100644
--- a/dev-vcs/git-gui-tools/Manifest
+++ b/dev-vcs/git-gui-tools/Manifest
@@ -1,4 +1,3 @@
-DIST git-1.9.0_rc3-optional-cvs.patch.gz 2961 SHA256 86088ca02b4b6552dbac79cc53c05c68a99d8cf878db31cd7c05fec3e23965fa SHA512 2c1d9ac13863d8893572c5bbe4b36b75e319eeb87675d6ca3bf5157b3a0591d5ebcc4d2849cd4a2a36f9c16f777e46168e27f8f4c0653d6b665eac5b6211223f WHIRLPOOL b3a65748e04db9186402908ecb177da6adf738e2593ccd06724d6a5d9a7885492f2e455fe1f222aff2886f6a5877839ebf1059215e7c16ea835c616f2f5ef5be
-DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38
 DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
+DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-1.9.3.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.0.4.ebuild
similarity index 97%
rename from dev-vcs/git-gui-tools/git-gui-tools-1.9.3.ebuild
rename to dev-vcs/git-gui-tools/git-gui-tools-2.0.4.ebuild
index adde1f50f..12a8ebd48 100644
--- a/dev-vcs/git-gui-tools/git-gui-tools-1.9.3.ebuild
+++ b/dev-vcs/git-gui-tools/git-gui-tools-2.0.4.ebuild
@@ -12,8 +12,9 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python2_{6,7} )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
 
-SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-1.9.0_rc3-optional-cvs.patch.gz" )
+SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.0.0-r2-optional-cvs.patch.gz" )
 inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
@@ -24,7 +25,7 @@ MY_P="${MY_P/-gui-tools}"
 DESCRIPTION="GUI tools derived from git: gitk, git-gui and gitview"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="gz"
+	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest
index b49d2e4c6..95875aa31 100644
--- a/dev-vcs/git-subversion/Manifest
+++ b/dev-vcs/git-subversion/Manifest
@@ -1,8 +1,7 @@
-DIST git-1.9.0_rc3-optional-cvs.patch.gz 2961 SHA256 86088ca02b4b6552dbac79cc53c05c68a99d8cf878db31cd7c05fec3e23965fa SHA512 2c1d9ac13863d8893572c5bbe4b36b75e319eeb87675d6ca3bf5157b3a0591d5ebcc4d2849cd4a2a36f9c16f777e46168e27f8f4c0653d6b665eac5b6211223f WHIRLPOOL b3a65748e04db9186402908ecb177da6adf738e2593ccd06724d6a5d9a7885492f2e455fe1f222aff2886f6a5877839ebf1059215e7c16ea835c616f2f5ef5be
-DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38
 DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
-DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7
+DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0
 DIST git-htmldocs-2.0.2.tar.xz 943424 SHA256 b8adaadf5ef37aebf50a5ae0d2be17129202021306aded97c66eb97e40f47e1d SHA512 c1be70fb78b2c5a95fcf63132e4b5b1a319b3e8373a1291b9d0eea5d19ce16e8691e1ed75a254e535c0093b8b02f3906c6616d5909eb3800b94f00084d4962b0 WHIRLPOOL e89396ef5658839aaba3d5de1bbb8ab22d77e1f134a17a0f7a9d0547a9ca41525f7b1d11394135ef959bad8f42fcaeecb1697f325ab20872d6ce48016afd2de2
-DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd
+DIST git-htmldocs-2.0.4.tar.xz 943324 SHA256 0ed51a78743ff1accb9165bf2983fe8ab3bcae62d40692d881f895c7e4672ca0 SHA512 c302b12e124597610a10f1d7e3d22c2f0c4dc5bb122c6846dab210e5ce47bb1079ed0e507d44b4260cc76c633abb550729560bddcd9d7b3c2b6f958536cb5716 WHIRLPOOL 3e0408f690aa8f76225b3b91c9c1d9a8a73312abcb32b52efe448d37318818917366354a5cf41fd1a066555f5d5eb71c1ee98561f31dc1122ff123ba8c899875
 DIST git-manpages-2.0.2.tar.xz 358984 SHA256 a367ab3704c05b4d69a5a02f2d89d2b6075be63670b29e580b63f99e918c377b SHA512 36347ce921d781c230dc1a3e050eda72bc1d9e12177bbc68190b5014ac3ca77828534a930665bb4aa2c3988fff04dcd114a80da54075b150790f702648b99fff WHIRLPOOL d93c58f66a844e78669ec015572f475a0baa120e846cf5fc027e4a8a533c34f2a5cdfe2a7b3ad9e961ef64bc93655ef93621af107cd061f547415dae09438847
+DIST git-manpages-2.0.4.tar.xz 358936 SHA256 f9b15d115746b7d0bdc5ff2a46ef5cf02ec1cf9f0d61393285fae68349c6b62b SHA512 78a360c6307338e463a0401a1664694feb0bf5cb6aaaaa4d0f0b812bfca568616fb77268ba395be8cbab8612eb9a7d2f2a9e863fe76667b70f9c0d7e5c75b2cc WHIRLPOOL ce68e29d53d6ae3149cae9880914ef64e5087c980b0c14af67a5fbbc9a9cd58fe605dcfe6686cea891d51d9ee2b3eb53ac22acfcf59cc3593aafe29078b843c6
diff --git a/dev-vcs/git-subversion/git-subversion-1.9.3.ebuild b/dev-vcs/git-subversion/git-subversion-2.0.4.ebuild
similarity index 94%
rename from dev-vcs/git-subversion/git-subversion-1.9.3.ebuild
rename to dev-vcs/git-subversion/git-subversion-2.0.4.ebuild
index aad3ab3c0..6785d99ce 100644
--- a/dev-vcs/git-subversion/git-subversion-1.9.3.ebuild
+++ b/dev-vcs/git-subversion/git-subversion-2.0.4.ebuild
@@ -9,8 +9,9 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python2_{6,7} )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
 
-SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-1.9.0_rc3-optional-cvs.patch.gz" )
+SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.0.0-r2-optional-cvs.patch.gz" )
 inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
@@ -22,7 +23,7 @@ DOC_VER=${MY_PV}
 DESCRIPTION="Subversion module for GIT, the stupid content tracker"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="gz"
+	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -201,7 +202,12 @@ src_compile() {
 	fi
 
 	cd "${S}"/contrib/svn-fe
-	git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+	# 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
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b49d2e4c6..95875aa31 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,8 +1,7 @@
-DIST git-1.9.0_rc3-optional-cvs.patch.gz 2961 SHA256 86088ca02b4b6552dbac79cc53c05c68a99d8cf878db31cd7c05fec3e23965fa SHA512 2c1d9ac13863d8893572c5bbe4b36b75e319eeb87675d6ca3bf5157b3a0591d5ebcc4d2849cd4a2a36f9c16f777e46168e27f8f4c0653d6b665eac5b6211223f WHIRLPOOL b3a65748e04db9186402908ecb177da6adf738e2593ccd06724d6a5d9a7885492f2e455fe1f222aff2886f6a5877839ebf1059215e7c16ea835c616f2f5ef5be
-DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.0-r2-optional-cvs.patch.gz 3008 SHA256 d830bb96d4f9c4066fb279d2f04a194d5666202b01daee64bd6995c43f8124c5 SHA512 3b607c1fe4fd08bd33a967c5c9ec35d8a95c28b871231bde87ed937b18e40af3b990bf54896ddf141df045aa98bf87560ded3a45e4363057a3933059ea7165a2 WHIRLPOOL 0d72552ccbbb8203a5a58e95549870e86d8fe1cd529c8996bbaa8a21f2ebdac200a173c6c0d61f17b00a3cc254c752f8bb8cf31bcd58621d8a7e26e686c51e38
 DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
-DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7
+DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0
 DIST git-htmldocs-2.0.2.tar.xz 943424 SHA256 b8adaadf5ef37aebf50a5ae0d2be17129202021306aded97c66eb97e40f47e1d SHA512 c1be70fb78b2c5a95fcf63132e4b5b1a319b3e8373a1291b9d0eea5d19ce16e8691e1ed75a254e535c0093b8b02f3906c6616d5909eb3800b94f00084d4962b0 WHIRLPOOL e89396ef5658839aaba3d5de1bbb8ab22d77e1f134a17a0f7a9d0547a9ca41525f7b1d11394135ef959bad8f42fcaeecb1697f325ab20872d6ce48016afd2de2
-DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd
+DIST git-htmldocs-2.0.4.tar.xz 943324 SHA256 0ed51a78743ff1accb9165bf2983fe8ab3bcae62d40692d881f895c7e4672ca0 SHA512 c302b12e124597610a10f1d7e3d22c2f0c4dc5bb122c6846dab210e5ce47bb1079ed0e507d44b4260cc76c633abb550729560bddcd9d7b3c2b6f958536cb5716 WHIRLPOOL 3e0408f690aa8f76225b3b91c9c1d9a8a73312abcb32b52efe448d37318818917366354a5cf41fd1a066555f5d5eb71c1ee98561f31dc1122ff123ba8c899875
 DIST git-manpages-2.0.2.tar.xz 358984 SHA256 a367ab3704c05b4d69a5a02f2d89d2b6075be63670b29e580b63f99e918c377b SHA512 36347ce921d781c230dc1a3e050eda72bc1d9e12177bbc68190b5014ac3ca77828534a930665bb4aa2c3988fff04dcd114a80da54075b150790f702648b99fff WHIRLPOOL d93c58f66a844e78669ec015572f475a0baa120e846cf5fc027e4a8a533c34f2a5cdfe2a7b3ad9e961ef64bc93655ef93621af107cd061f547415dae09438847
+DIST git-manpages-2.0.4.tar.xz 358936 SHA256 f9b15d115746b7d0bdc5ff2a46ef5cf02ec1cf9f0d61393285fae68349c6b62b SHA512 78a360c6307338e463a0401a1664694feb0bf5cb6aaaaa4d0f0b812bfca568616fb77268ba395be8cbab8612eb9a7d2f2a9e863fe76667b70f9c0d7e5c75b2cc WHIRLPOOL ce68e29d53d6ae3149cae9880914ef64e5087c980b0c14af67a5fbbc9a9cd58fe605dcfe6686cea891d51d9ee2b3eb53ac22acfcf59cc3593aafe29078b843c6
diff --git a/dev-vcs/git/git-1.9.3.ebuild b/dev-vcs/git/git-2.0.4.ebuild
similarity index 96%
rename from dev-vcs/git/git-1.9.3.ebuild
rename to dev-vcs/git/git-2.0.4.ebuild
index d53576472..847df8375 100644
--- a/dev-vcs/git/git-1.9.3.ebuild
+++ b/dev-vcs/git/git-2.0.4.ebuild
@@ -10,8 +10,9 @@ GENTOO_DEPEND_ON_PERL=no
 PYTHON_COMPAT=( python2_{6,7} )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
 
-SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-1.9.0_rc3-optional-cvs.patch.gz" )
+SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.0.0-r2-optional-cvs.patch.gz" )
 inherit sab-patches toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 
 MY_PV="${PV/_rc/.rc}"
@@ -22,7 +23,7 @@ DOC_VER=${MY_PV}
 DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="gz"
+	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -55,7 +56,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@@ -329,7 +330,12 @@ src_compile() {
 
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
-		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		# 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
@@ -381,7 +387,9 @@ src_install() {
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	# Not really a bash-completion file (bug #477920)
-	dodoc contrib/completion/git-prompt.sh
+	# 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}
@@ -640,8 +648,8 @@ showpkgdeps() {
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
-	einfo "Note that the prompt bash code is now in the seperate script"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "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"
diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest
index 6deed623e..b98ea2a1e 100644
--- a/www-apps/gitweb/Manifest
+++ b/www-apps/gitweb/Manifest
@@ -1,2 +1,2 @@
-DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
+DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0
diff --git a/www-apps/gitweb/gitweb-1.9.3.ebuild b/www-apps/gitweb/gitweb-2.0.4.ebuild
similarity index 99%
rename from www-apps/gitweb/gitweb-1.9.3.ebuild
rename to www-apps/gitweb/gitweb-2.0.4.ebuild
index 204b292b8..f4aef8b82 100644
--- a/www-apps/gitweb/gitweb-1.9.3.ebuild
+++ b/www-apps/gitweb/gitweb-2.0.4.ebuild
@@ -8,6 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
 
 inherit toolchain-funcs eutils ${SCM}
 
@@ -19,7 +20,7 @@ MY_P="${MY_P/gitweb/git}"
 DESCRIPTION="A web interface to git"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ "$PV" != *9999 ]]; then
-	SRC_URI_SUFFIX="gz"
+	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}