From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A2EF15802F for ; Tue, 7 Mar 2023 15:49:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E7F6E0794; Tue, 7 Mar 2023 15:49:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D33EE0794 for ; Tue, 7 Mar 2023 15:49:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 390793413E0 for ; Tue, 7 Mar 2023 15:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B33177D8 for ; Tue, 7 Mar 2023 15:49:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678204150.0f438ccc5002f2c4cf1e2a4d7c9a9b26fcf1bb7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.39.1.ebuild dev-vcs/git/git-2.39.2.ebuild dev-vcs/git/git-2.40.0_rc0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild dev-vcs/git/metadata.xml X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0f438ccc5002f2c4cf1e2a4d7c9a9b26fcf1bb7a X-VCS-Branch: master Date: Tue, 7 Mar 2023 15:49:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2549664e-3cf4-4605-a11e-e5085826c8df X-Archives-Hash: 4939b275056368bdf1a6c6949c83dabe commit: 0f438ccc5002f2c4cf1e2a4d7c9a9b26fcf1bb7a Author: Sam James gentoo org> AuthorDate: Tue Mar 7 15:49:10 2023 +0000 Commit: Sam James gentoo 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 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 @@ Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime! GitWeb support for app-text/highlight Support pulling and pushing from MediaWiki - Add experimental patches for improved MediaWiki support Add support for Perforce version control system (requires manual installation of Perforce client) Respect the safe.directory setting Include git-svn for dev-vcs/subversion support