gentoo auto-resync : 07:03:2023 - 17:57:54

12 files changed, 17 insertions, 109 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 03663f9c4007..5210d611dc0b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 51d0eeb2916c..f29cd2ee94ed 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,7 +1,7 @@
 DIST git-machete-3.14.3.gh.tar.gz 1397234 BLAKE2B 827d3234260461d5cba6b192767e9923b79cc70afb0e7d0bd24e3f307559e3c0774499b34651dd6da7e52157c18becb69c15de9246b99bb35d47104787e6164e SHA512 a4e6015832b4fefa48b75dbd2f3aa50f53788c3a612beada971c0da9da722d49b48e891ddfa3f7d6c91ed4d461b16504ecab9f64b4da84d319b08bb06b1ee8c2
 DIST git-machete-3.15.2.gh.tar.gz 1399230 BLAKE2B f10ff0678b80e5a940a5746771addb1ef9f425faa49c64fd1c808c2f9236c8fb6973ddb662950582718a25b034eba9c3dba6a4008ae4702e5d662cd8796543f7 SHA512 64115f9bb2af7f0596d0327067adfe01ceb17e96325ae2ae31c377f1a86cd4f7eb6e5a5940efb46a9e9d6805ae0b61a8d1d52e0ed7e4f65250783c290d8989cc
 DIST git-machete-3.16.0.gh.tar.gz 1400708 BLAKE2B c0756c997ed287fb64c561ca21dcfc5f126fd98b51e839613c47ca537ceaa5e66dc1b99e22c10d5e54be57d81ac1e729bf5eab819792b7c0125589b4cdde0a79 SHA512 0b0e4c3b675d1d6728fb48ed69085a7f1c052af3a3fb6b565ef7730d6734c3badafef83f8bd4ce866e41cbb3d087cd1e7246ac07888d515cd0cf62b547ea99ce
-EBUILD git-machete-3.14.3.ebuild 1114 BLAKE2B f1fb6a4f5c878203bd446a259386fc78458f394eb5cf6e692841cf49ca9be9eac59e33fd73b3f0ca541d8d064a136d49a428b519f704d6b34843f0362cbc5ced SHA512 07b107304dee3bb17b6b516127a15bbee808216b65990ee15634b12f08c4efcae451a9a78e777be0b0e6f149afd5b6bc884c51a6a3df6244fc92daa54fa7e320
+EBUILD git-machete-3.14.3.ebuild 1113 BLAKE2B 2a6a42b99966e5f3f1f48ee1154d72aef41bc274cd28dcf2ada2c92d09d6419a237ebbcce34318304e791a4786fd8dea6b07e7cdbb05734bba266f3cd38e4b92 SHA512 4b12e321b6f6960ded2d7a31eb0827fa66274270e0af1e42b659aa580b3ea6f2bd56ee342cd155ae96029b69c47a7a05da2c9cc6f2cae144294ea4442e31d70d
 EBUILD git-machete-3.15.2.ebuild 1114 BLAKE2B f1fb6a4f5c878203bd446a259386fc78458f394eb5cf6e692841cf49ca9be9eac59e33fd73b3f0ca541d8d064a136d49a428b519f704d6b34843f0362cbc5ced SHA512 07b107304dee3bb17b6b516127a15bbee808216b65990ee15634b12f08c4efcae451a9a78e777be0b0e6f149afd5b6bc884c51a6a3df6244fc92daa54fa7e320
 EBUILD git-machete-3.16.0.ebuild 1114 BLAKE2B f1fb6a4f5c878203bd446a259386fc78458f394eb5cf6e692841cf49ca9be9eac59e33fd73b3f0ca541d8d064a136d49a428b519f704d6b34843f0362cbc5ced SHA512 07b107304dee3bb17b6b516127a15bbee808216b65990ee15634b12f08c4efcae451a9a78e777be0b0e6f149afd5b6bc884c51a6a3df6244fc92daa54fa7e320
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.14.3.ebuild b/dev-vcs/git-machete/git-machete-3.14.3.ebuild
index 9964c2ef2ad2..11fab108fd67 100644
--- a/dev-vcs/git-machete/git-machete-3.14.3.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.14.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-vcs/git"
 BDEPEND="test? (
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ecb1e246b526..1ca2ba03a889 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -19,11 +19,11 @@ DIST git-htmldocs-2.40.0.rc0.tar.xz 1516032 BLAKE2B 076dfa70832fedf4f39bbe321aa7
 DIST git-manpages-2.39.1.tar.xz 557012 BLAKE2B 1a39a1192443eac0d12da059e0146d286272054192810d12f53f627bd341c3dc50bea2078cccac0d46c5e95502a1d669f072ab387e1662c890e5c38d46ad3f31 SHA512 4f1fdd7abf53dd60478ffc5f926777cd00446a3799ad9a2129814adfe7d3d63e13dd9bcdcea699fd139c9e134cf45857f0585ce2772e4fb93e4930c8f86a08bb
 DIST git-manpages-2.39.2.tar.xz 557080 BLAKE2B 6b2dbb33f1041ba802582f529638b8b4574309efbf5af94add5c676efed7314743d5b326ec18a95ba85a4fe818e95913069717034a9863879e1d03ee32b839ba SHA512 6326ff43564fc42ca0a424edd17896434e11c09ce21f4bfd4d4975aaaf7f2c0d823da0e89b267557b0b7799c342db88d84685d24f589f53edfe486208c1f15b1
 DIST git-manpages-2.40.0.rc0.tar.xz 562536 BLAKE2B 1c41631408a9bea0d73dbc8df2242c3cbaf2330bc96f3e3020b10397568dc6e32b631d6ff0dd8026adc5c36398e44d88dcf773f49b706e446b93e84c94942081 SHA512 1444417c073c8a5d74edeb45e521761ce42d911c3f8dcc329a54a78d9078a81d4d1f9e8a1772d03f4196bc6b013fe092d0ea422ca43292399dd22c84813ddba7
-EBUILD git-2.39.1.ebuild 16791 BLAKE2B f691822daf1a1c8a39551ccfaf211a9e71c3597efaf977d5d146646517409fc74db62ab7e8834352400873953bd6ff0cd9403f53c87b06f84c486ea92f1691dc SHA512 a4dc6255e21fb03d01152516b5b1c74072d590a45fe89e4097d769f5c2df32a9d9162927da510d687c97e7ae323ed7f59b104a84cbfabd38fb96d006ff809c37
-EBUILD git-2.39.2.ebuild 16791 BLAKE2B f691822daf1a1c8a39551ccfaf211a9e71c3597efaf977d5d146646517409fc74db62ab7e8834352400873953bd6ff0cd9403f53c87b06f84c486ea92f1691dc SHA512 a4dc6255e21fb03d01152516b5b1c74072d590a45fe89e4097d769f5c2df32a9d9162927da510d687c97e7ae323ed7f59b104a84cbfabd38fb96d006ff809c37
-EBUILD git-2.40.0_rc0.ebuild 16799 BLAKE2B 6468e202c7d92144f2e136b7f5a864d15c0e9ce336e7569a01f80bbede6e41e2a96e55e8dd65163505f8bd071d83020f7720575663535a29e95d38a75e1e65d6 SHA512 f64667f29603cda57f22925a5a322b6276e120bf5978f9dbb64f1308d5f9b95bf776979f5cb8731084c3167a1c6f48a2401ad1042ac580fce19a83826e63ef3b
-EBUILD git-9999-r1.ebuild 16799 BLAKE2B 6468e202c7d92144f2e136b7f5a864d15c0e9ce336e7569a01f80bbede6e41e2a96e55e8dd65163505f8bd071d83020f7720575663535a29e95d38a75e1e65d6 SHA512 f64667f29603cda57f22925a5a322b6276e120bf5978f9dbb64f1308d5f9b95bf776979f5cb8731084c3167a1c6f48a2401ad1042ac580fce19a83826e63ef3b
-EBUILD git-9999-r2.ebuild 16799 BLAKE2B 6468e202c7d92144f2e136b7f5a864d15c0e9ce336e7569a01f80bbede6e41e2a96e55e8dd65163505f8bd071d83020f7720575663535a29e95d38a75e1e65d6 SHA512 f64667f29603cda57f22925a5a322b6276e120bf5978f9dbb64f1308d5f9b95bf776979f5cb8731084c3167a1c6f48a2401ad1042ac580fce19a83826e63ef3b
-EBUILD git-9999-r3.ebuild 16799 BLAKE2B 6468e202c7d92144f2e136b7f5a864d15c0e9ce336e7569a01f80bbede6e41e2a96e55e8dd65163505f8bd071d83020f7720575663535a29e95d38a75e1e65d6 SHA512 f64667f29603cda57f22925a5a322b6276e120bf5978f9dbb64f1308d5f9b95bf776979f5cb8731084c3167a1c6f48a2401ad1042ac580fce19a83826e63ef3b
-EBUILD git-9999.ebuild 16799 BLAKE2B 6468e202c7d92144f2e136b7f5a864d15c0e9ce336e7569a01f80bbede6e41e2a96e55e8dd65163505f8bd071d83020f7720575663535a29e95d38a75e1e65d6 SHA512 f64667f29603cda57f22925a5a322b6276e120bf5978f9dbb64f1308d5f9b95bf776979f5cb8731084c3167a1c6f48a2401ad1042ac580fce19a83826e63ef3b
-MISC metadata.xml 2144 BLAKE2B ce6172eb573662df06586f46a07e01a276702eb5f96550faa4eddf6396a754e24bdc0f718d64cb0945581d1f5d1edf17fffd8e260052e2f26a5b81e3aee003e3 SHA512 82d8a083189adab8aee545f5bb44cd025033b710af7c355279e8e159cc5322a2ba0acddab69866406e30c3088fa0197d156282d33f774e48cf74247fee37187f
+EBUILD git-2.39.1.ebuild 16284 BLAKE2B a92cf9abd9b60c2e778ee7a547be6ee2f06a65b65dbcaa4a3f981e6030167fdc5e049d47caa2b377dfdd01ea63bf271740bd41d22d35adda296faf8c21e82d4e SHA512 a8a454682c6c0821129d56f5f2f21d268de2b3fe0264df5d583e992bbf156db5c060f28aa9bdc8b1b83af21e376f6e08cb53763d5e0467ad483fd0c8ee18f058
+EBUILD git-2.39.2.ebuild 16284 BLAKE2B a92cf9abd9b60c2e778ee7a547be6ee2f06a65b65dbcaa4a3f981e6030167fdc5e049d47caa2b377dfdd01ea63bf271740bd41d22d35adda296faf8c21e82d4e SHA512 a8a454682c6c0821129d56f5f2f21d268de2b3fe0264df5d583e992bbf156db5c060f28aa9bdc8b1b83af21e376f6e08cb53763d5e0467ad483fd0c8ee18f058
+EBUILD git-2.40.0_rc0.ebuild 16292 BLAKE2B e704127db60a87ac92ce779ed01902b948ed627b6e86557ab9658dbfbe8bc95d53d63633aae4db86c3fc179ede4d1a544899811f45fa5d10a6c1546835d43552 SHA512 5f686ff2152ee8eb8769e15f5852a08a60fc7819b418d5135eead862202a6f4ecf1889aca921d3c2667cf885f771b5f8e0051e4a802e048111a63f587ced8b7f
+EBUILD git-9999-r1.ebuild 16292 BLAKE2B e704127db60a87ac92ce779ed01902b948ed627b6e86557ab9658dbfbe8bc95d53d63633aae4db86c3fc179ede4d1a544899811f45fa5d10a6c1546835d43552 SHA512 5f686ff2152ee8eb8769e15f5852a08a60fc7819b418d5135eead862202a6f4ecf1889aca921d3c2667cf885f771b5f8e0051e4a802e048111a63f587ced8b7f
+EBUILD git-9999-r2.ebuild 16292 BLAKE2B e704127db60a87ac92ce779ed01902b948ed627b6e86557ab9658dbfbe8bc95d53d63633aae4db86c3fc179ede4d1a544899811f45fa5d10a6c1546835d43552 SHA512 5f686ff2152ee8eb8769e15f5852a08a60fc7819b418d5135eead862202a6f4ecf1889aca921d3c2667cf885f771b5f8e0051e4a802e048111a63f587ced8b7f
+EBUILD git-9999-r3.ebuild 16292 BLAKE2B e704127db60a87ac92ce779ed01902b948ed627b6e86557ab9658dbfbe8bc95d53d63633aae4db86c3fc179ede4d1a544899811f45fa5d10a6c1546835d43552 SHA512 5f686ff2152ee8eb8769e15f5852a08a60fc7819b418d5135eead862202a6f4ecf1889aca921d3c2667cf885f771b5f8e0051e4a802e048111a63f587ced8b7f
+EBUILD git-9999.ebuild 16292 BLAKE2B e704127db60a87ac92ce779ed01902b948ed627b6e86557ab9658dbfbe8bc95d53d63633aae4db86c3fc179ede4d1a544899811f45fa5d10a6c1546835d43552 SHA512 5f686ff2152ee8eb8769e15f5852a08a60fc7819b418d5135eead862202a6f4ecf1889aca921d3c2667cf885f771b5f8e0051e4a802e048111a63f587ced8b7f
+MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/git-2.39.1.ebuild b/dev-vcs/git/git-2.39.1.ebuild
index 64a55f3350b6..f94eb3ccb09b 100644
--- a/dev-vcs/git/git-2.39.1.ebuild
+++ b/dev-vcs/git/git-2.39.1.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-2.39.2.ebuild b/dev-vcs/git/git-2.39.2.ebuild
index 64a55f3350b6..f94eb3ccb09b 100644
--- a/dev-vcs/git/git-2.39.2.ebuild
+++ b/dev-vcs/git/git-2.39.2.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-2.40.0_rc0.ebuild b/dev-vcs/git/git-2.40.0_rc0.ebuild
index fb287df0a1a8..88ee1b4db80e 100644
--- a/dev-vcs/git/git-2.40.0_rc0.ebuild
+++ b/dev-vcs/git/git-2.40.0_rc0.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index fb287df0a1a8..88ee1b4db80e 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index fb287df0a1a8..88ee1b4db80e 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index fb287df0a1a8..88ee1b4db80e 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index fb287df0a1a8..88ee1b4db80e 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -136,7 +136,6 @@ REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
 	perforce? ( ${PYTHON_REQUIRED_USE} )
 	subversion? ( perl )
 	webdav? ( curl )
@@ -250,16 +249,6 @@ src_unpack() {
 }
 
 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
-
 	if ! use safe-directory ; then
 		# This patch neuters the "safe directory" detection.
 		# bugs #838271, #838223
@@ -652,6 +641,4 @@ pkg_postinst() {
 	optfeature_header "Some scripts require additional dependencies:"
 	optfeature git-quiltimport dev-util/quilt
 	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 937247ba6d1d..e196dbc5f3c4 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -26,7 +26,6 @@
     <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
     <flag name="highlight">GitWeb support for <pkg>app-text/highlight</pkg></flag>
     <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
-    <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
     <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
     <flag name="safe-directory">Respect the safe.directory setting</flag>
     <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>