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 3E76C15803E for ; Sun, 31 Dec 2023 17:37:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B97D2BC027; Sun, 31 Dec 2023 17:37:34 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A6AD2BC027 for ; Sun, 31 Dec 2023 17:37:34 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04BAD335DEC for ; Sun, 31 Dec 2023 17:37:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D86E13A0 for ; Sun, 31 Dec 2023 17:37:31 +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: <1704044176.90f738b661e9e6cf903cd2a65418a6e00482c19f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/apache/apache-2.4.57-r5.ebuild www-servers/apache/apache-2.4.57-r6.ebuild www-servers/apache/apache-2.4.58-r1.ebuild www-servers/apache/apache-2.4.58-r2.ebuild X-VCS-Directories: www-servers/apache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 90f738b661e9e6cf903cd2a65418a6e00482c19f X-VCS-Branch: master Date: Sun, 31 Dec 2023 17:37:31 +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: f8f3d074-a1bb-463c-9a2b-f082968e23a7 X-Archives-Hash: 250cadefb73b92f0428226be53075120 commit: 90f738b661e9e6cf903cd2a65418a6e00482c19f Author: Eli Schwartz gmail com> AuthorDate: Sun Dec 31 03:40:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 31 17:36:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f738b6 www-servers/apache: clean up ancient outdated split-usr hack For nearly a decade, USE=split-usr has been declared in apache-2.eclass and provides a hack intended as a short-term migration for moving a binary from /usr/sbin to /usr/bin. No remaining cases of /usr/sbin/apxs exist in tree, so drop the symlink and the USE flag and revbump. Closes: https://bugs.gentoo.org/502384 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> .../apache/{apache-2.4.57-r5.ebuild => apache-2.4.57-r6.ebuild} | 7 ------- .../apache/{apache-2.4.58-r1.ebuild => apache-2.4.58-r2.ebuild} | 7 ------- 2 files changed, 14 deletions(-) diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild b/www-servers/apache/apache-2.4.57-r6.ebuild similarity index 96% rename from www-servers/apache/apache-2.4.57-r5.ebuild rename to www-servers/apache/apache-2.4.57-r6.ebuild index 02691c5f39d9..bf8fd0ba00f5 100644 --- a/www-servers/apache/apache-2.4.57-r5.ebuild +++ b/www-servers/apache/apache-2.4.57-r6.ebuild @@ -8,9 +8,6 @@ GENTOO_PATCHSTAMP="20231011" GENTOO_DEVELOPER="graaff" GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5" -# ancient hack: bug #502384 -IUSE="split-usr" - # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" IUSE_MPMS_THREAD="event worker" @@ -193,11 +190,7 @@ src_install() { rm "${ED}"/${i} || die "Failed to prune apache-tools bits" done - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs # Note: wait for mod_systemd to be included in some forthcoming release, # Then apache2.4.service can be used and systemd support controlled diff --git a/www-servers/apache/apache-2.4.58-r1.ebuild b/www-servers/apache/apache-2.4.58-r2.ebuild similarity index 96% rename from www-servers/apache/apache-2.4.58-r1.ebuild rename to www-servers/apache/apache-2.4.58-r2.ebuild index 7a858a9b3cbf..5b5e4fb1a034 100644 --- a/www-servers/apache/apache-2.4.58-r1.ebuild +++ b/www-servers/apache/apache-2.4.58-r2.ebuild @@ -8,9 +8,6 @@ GENTOO_PATCHSTAMP="20231019" GENTOO_DEVELOPER="graaff" GENTOO_PATCHNAME="gentoo-apache-2.4.58" -# ancient hack: bug #502384 -IUSE="split-usr" - # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" IUSE_MPMS_THREAD="event worker" @@ -193,11 +190,7 @@ src_install() { rm "${ED}"/${i} || die "Failed to prune apache-tools bits" done - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs # Note: wait for mod_systemd to be included in some forthcoming release, # Then apache2.4.service can be used and systemd support controlled