gentoo resync : 29.12.2022

2 files changed, 7 insertions, 49 deletions

diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 0c50fe3aa224..55155aa380f3 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -3,5 +3,5 @@ AUX postinstall-en.txt 620 BLAKE2B a57e1a705fa31a2c5abb080be8e9ddea41017132c5142
 AUX reconfig 2133 BLAKE2B fb5fdf3d68c1ff06b0e1becd25594b4544515aea3399ef2a563cbc541aa8ccf18f0781cbd08f97504bba0980010a7756a657c5ca0d7caa227cebf15b0d0f3231 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56
 AUX rt-makefile-serialize-install-prereqs.patch 596 BLAKE2B 65427cbc4425fe47bd4ee5a624df45f802ff1153fa778493a619120db0ce5082876e05d802c411e2cbeb6293fa7899e374c462f7e2c83225a8d423baec162316 SHA512 0ae2ad3ac5faf7ecc65545cfbba210034a2f532c4b1fa82b37956731b35d7e42e3d3ca4714834f2797ecec7292f19dca0be295ad92ed3931374d07af02ed10a1
 DIST rt-4.4.4.tar.gz 9977845 BLAKE2B bc27a68c880d305e43069887bd4c2dbf09e82413ee9b7f1e0e19252ad5249430f17bd980c94a4c74386a8c7fefc79af50a0e572adbb0ef707e46a4be63e8d3e4 SHA512 95335cfa9e7107300670a5e8631ffb6f402895dae051201d051ac01885b0cb185f838a666acaec773e0f670e1b9d16b7cede72f37ce9832fd83a9da8514e6972
-EBUILD rt-4.4.4-r1.ebuild 7826 BLAKE2B 738272f75855198cf883b9ef59d14ffd4fde6963b92f22921fa4d2669e8d4d1191e1150c4d7e21340d99b09ee56c6ad671cb53b78549edaaced0f09bf4dc53d4 SHA512 34b3ca8876195de30b2525d0f1a1000d834a5ae2366779c40fc1257c39b9b05c3e06d8f04c324efddce1f565e97f656a11f5f8830be8ca52b6b98eeb71be079c
+EBUILD rt-4.4.4-r2.ebuild 6767 BLAKE2B bf6da2f65b83d06f7abed1f33759b5abb81bcd552b32d41327f9e3f699b71731db751395e54b2dfc2d11bd0bbea73b72187e214758372caf109c4ab2afb300fe SHA512 faad290fe8aebb417faf35eb543c6e2bacc06c610e0befc38be9ddbdd4ca10a584c63f6e9eccc045ec29101853f30603dc1549487919d745ec1c6ab57780ea69
 MISC metadata.xml 455 BLAKE2B 6664934a9bce66ae07c6b3b0c57a7ea118f0a0d0c582d4a5323765ffc185e2735afb85c359e1041f25f1d73be41cd279e460196c6c05cde4ca4df094ff6107e3 SHA512 31a8433cff9f603152dfe31356e0645872e91c08027e52d58919b16ed346d1707de442ef6eea52f1a06052cd6ba9001a64fd258b8d98f0df2e5943b91f58a704
diff --git a/www-apps/rt/rt-4.4.4-r1.ebuild b/www-apps/rt/rt-4.4.4-r2.ebuild
index 8f0b49e9cc7a..efcf278b94c6 100644
--- a/www-apps/rt/rt-4.4.4-r1.ebuild
+++ b/www-apps/rt/rt-4.4.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit webapp depend.apache user
+inherit webapp depend.apache
 
 DESCRIPTION="RT is an enterprise-grade ticketing system"
 HOMEPAGE="https://www.bestpractical.com/rt/"
@@ -17,8 +17,9 @@ REQUIRED_USE="^^ ( mysql postgres )"
 RESTRICT="test"
 
 DEPEND="
+	acct-group/rt
+	acct-user/rt
 	>=dev-lang/perl-5.10.1
-
 	>=dev-perl/Apache-Session-1.53
 	>=dev-perl/CGI-4
 	>=dev-perl/CSS-Squish-0.06
@@ -141,46 +142,6 @@ RDEPEND="${DEPEND}
 
 need_httpd_cgi
 
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
 pkg_setup() {
 	webapp_pkg_setup
 
@@ -189,16 +150,13 @@ pkg_setup() {
 	ewarn "make sure to read the related upgrade documentation in"
 	ewarn "${ROOT}usr/share/doc/${PF}."
 	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
 }
 
 src_prepare() {
 	# add Gentoo-specific layout
 	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+	sed -e "s|PREFIX|${EPREFIX}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${EPREFIX}/${MY_HTDOCSDIR}|g" \
 		-e 's|/\+|/|g' \
 		-i ./config.layout || die 'config sed failed'