commit: 0f438ccc5002f2c4cf1e2a4d7c9a9b26fcf1bb7a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 7 15:49:10 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 7 15:49:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f438ccc
dev-vcs/git: drop broken USE=mediawiki-experimental Closes: https://bugs.gentoo.org/764998 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/git-2.39.1.ebuild | 15 +-------------- dev-vcs/git/git-2.39.2.ebuild | 15 +-------------- dev-vcs/git/git-2.40.0_rc0.ebuild | 15 +-------------- dev-vcs/git/git-9999-r1.ebuild | 15 +-------------- dev-vcs/git/git-9999-r2.ebuild | 15 +-------------- dev-vcs/git/git-9999-r3.ebuild | 15 +-------------- dev-vcs/git/git-9999.ebuild | 15 +-------------- dev-vcs/git/metadata.xml | 1 - 8 files changed, 7 insertions(+), 99 deletions(-) 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>
