gentoo auto-resync : 06:10:2024 - 04:27:04

5 files changed, 104 insertions, 11 deletions

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 0197be4884d2..a5be618a9e12 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,4 +1,4 @@
-AUX permissions-r1 1296 BLAKE2B e62b17eecf08c79a6a63eba85280db62253bea9ae7b85abdfeee7d7e430f57bb934468062d5481d79867a09526e4190df1a13c1b0928800d499bf9528afe10a7 SHA512 62960d83977eda6b7ce797e6c9272def43f4ee658cff3128203a0158ab0ac1e28c4604543f5be040639e76c72ae4ad87c77afabed8e0cc3d8770ec45600b5e66
+AUX permissions-r1 1320 BLAKE2B 4c3af35e9722b0099dcc0ecd40af0c266887c879bc09912e5459a154982ec2ce585207e566bf145510017faa05d4d35693a2d267e657e424580375adab2ac31e SHA512 2236ec3c166cffb568275209ccdb95a6fa249371c2c4ed3fbba97e9276a2737b4dfab1dd8451a76b3ee6d80e96a4683ca299527029a8b9b7a7a10fd4a0b3246d
 AUX postinstall-en-with-daemon-r1.txt 586 BLAKE2B 8a8c24cb93373af40ca662bc5453bbf3f2628ba0e39f0053405010e9c91e032167a7da9feb335782a679af1efee004bd134694fb655a5992cc3b1f8d3712b8db SHA512 e57ae761499454ce26c5bf58b7faa1cdfa05a7409bc4fc2b2ade16097a8131e279ffb09be2d5b39e80a17fd1c9533e795c6908548097f318106f1c7cac00e65d
 AUX postinstall-en.txt 102 BLAKE2B e4edc2c0a482cb8ba822b902e553680626081336abe42421380404c179324c2243eb07c4934ff70ce07b0c9c4777af14c803e1adf08768ea76c1660612e111d3 SHA512 2b1a6e9faf17b36e7011b488cde989d890fa23e87d5f88aa91a1d9597bb55400db74e413742c9d15acbc745a25f23b1533ad6fdb829d04dc21ff5898c7d98ccf
 AUX tt-rss-no-chmod.patch 740 BLAKE2B 38bb66330ab33c67c2e0df680942d53149c5d2422643842311d5e1b351c243572a8dd325d7bbf86d388f3972108ffb58be84ad3953fa08ba9f315069316b672c SHA512 51f00f7eb1896909eed6d20e947ac60fa52b8ca51416406a21d69f6880c878f7d727d2ed031af923399e2da4c7c69a1da9d3d94875a94ef600c4e05d8cc782be
@@ -6,6 +6,8 @@ AUX ttrssd.confd-r2 1536 BLAKE2B 6ccecdadb0167ec4e245f95f14a3ad4d37dccebb52dbe32
 AUX ttrssd.initd-r4 2863 BLAKE2B 28a0b410b8425bcf4c9abc5197ff777b06347c1cdefa021b9f8fb32d256b9ca72e0c175ac412b3aa41e7f75e30446741b7f6445d1293b1a59c19e3eba2ec52e6 SHA512 8ff7a6b2f1cb38baa0c13fa7c7f5ee1b54bf2ff2111ad62649d36cf3b12e5b82f9ef3eb6b6c904daa8565a7d2cd817daaba322f4aa03b5f3c5ffdefced730f82
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
 DIST tt-rss-20230901.tar.xz 5368876 BLAKE2B af7dc8c7003f9bd83f656a1596458302eb29b7f27428e38e9cbc7fdeb0b920079622b577e5e578069d8475c265061efeb23648da621ad66263370a748512d49c SHA512 02111c89a3dc8fbf94be38d87fa90770eaaa644672aeeb7c1ece3ac7137c5a4f2f0f4412319bd887305f365fc7da9bfe3f644495a5655e8a351ecdae97a04d35
-EBUILD tt-rss-20230901.ebuild 1885 BLAKE2B 55be482ab4f91fd12996f93c43f654492942ad41c43e74c8df6724ce2e36c50f50fdbc42e14367ce414ca125e86c182b4a0592fe51fa38857fb0d63cec8b54c4 SHA512 98deb924fd0ad45453658bf2f0d99bf5c24eb85c00a77e99588bbfd1bf25243d65b4cbe4e13a1a00dd61b4e57b725d23a470ac3e7936fef5dc29232b4db6586f
-EBUILD tt-rss-99999999.ebuild 2084 BLAKE2B 3ec49a01dae8eca47b37cf17a5380a342f132f6f92df94fd92aaba52d094edfe8e3af41599a85d07c4bac710f727bae7285bc9cb4a711e9ba996244cf4c86b10 SHA512 872cf793170aea03b05a7958ad8cf9ef07e134d44c499610146813df7fb9ee7a13987a37ca2920011e4859cadea0a7bc1f0f5b9369b7f1da67aae19c6440923f
+DIST tt-rss-20241001.tar.xz 5436596 BLAKE2B 0f913496d93c702eaf3d33b2bfe2ec623d7a215457296399483927ba4bd8cf0dc44915bbc950b0635d452e67373d0a365736d7916141eb6d2cccb2487900d02d SHA512 fba5f5d18b855a299450d9659cd52d3c8d48995ab25778ae92ee8a5711a8afa5bf42cf21360fcd189664d3cd1ab12032bb67e688201b57e989bff1003cbea2ca
+EBUILD tt-rss-20230901.ebuild 1896 BLAKE2B bd63fec1ed820085bd97f034e0e6920f1c3fc3c0713f80accb46f7c82b8365434430630c7a5ef171c9544dc9ba7206dcf74d11e3671627ada9423e20fc98c1a2 SHA512 f555feb89d40d3fe0101c8f785d0fe2833e3b68d35e374de8af3293ca7fb36fb798cea5cb18ff5eafebbf8663dfaf261e88a3965f2b4f4589795091271cb3694
+EBUILD tt-rss-20241001.ebuild 1977 BLAKE2B 34ec82094358e178de1d7b09c755b6ebaed67c83bbdef28195b3750885483ab7dcdbe72b5e4089e4e12c1cd543cf92f7728f4f23b6a4e281d5deb2bfa657dc60 SHA512 618352535c0476427bdc45318c028444b68a9c66f23a7279b32e9f051aaedbc84fda6c982756c8d4e331fed7c0f9bd3ae9b47f9c51809633b8e12125556a5865
+EBUILD tt-rss-99999999.ebuild 2173 BLAKE2B 1cef36f0cacd27b74de0f41ba028d26be22427b61b228fcb5bd7a2353efe1094df84e762c481bdaa0acb427480b1c913ad8d5f29f2cc5a2ed408c8c16d9de156 SHA512 1dc863e5e1b97f7e22e68132c6a9586483a01fe431441b6c37a7f18916c9df0643b90fd784d35e009ab468f9af492e0cd8b8dff76d82390a56bc6f085dda364e
 MISC metadata.xml 374 BLAKE2B 659dd027265141ba90d4bf8abe45e12ed5187c866605f939f26fd4b55911870c8cca907c96f4bae2f84cb43c1691a6eb79eabe671e4b3de0c34d9befb6ed4c46 SHA512 ab38e1e98bb90c292576830d65ad6871dc6feab2a93d7cc9a580f1333e6c7859cb215ef44952b3e9018b431ca0c4c7f61fd0ee6d2daa86bde971ab2e113ba0bc
diff --git a/www-apps/tt-rss/files/permissions-r1 b/www-apps/tt-rss/files/permissions-r1
index 0ca420e97beb..ce698a1b25fa 100644
--- a/www-apps/tt-rss/files/permissions-r1
+++ b/www-apps/tt-rss/files/permissions-r1
@@ -14,8 +14,8 @@ if [[ $1 = install ]]; then
 	chown root:root cache/
 	chmod 00755 cache/
 
-	chgrp --no-dereference ttrssd lock/ cache/*/
-	chmod g+ws lock/ cache/*/
+	chgrp --no-dereference ttrssd feed-icons/ lock/ cache/*/
+	chmod g+ws feed-icons/ lock/ cache/*/
 
 	# Files within lock/ are exclusively written by the update daemon. cache/
 	# subdirectories hold files that are modified in place by both processes and
diff --git a/www-apps/tt-rss/tt-rss-20230901.ebuild b/www-apps/tt-rss/tt-rss-20230901.ebuild
index 34b6d313a90e..602be926f79d 100644
--- a/www-apps/tt-rss/tt-rss-20230901.ebuild
+++ b/www-apps/tt-rss/tt-rss-20230901.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,7 +67,7 @@ src_install() {
 	keepdir "${MY_HTDOCSDIR}"/cache/{feed-icons,starred-images}
 
 	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,lock}/; do
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
 		webapp_serverowned "${dir#${ED}}"
 	done
 
diff --git a/www-apps/tt-rss/tt-rss-20241001.ebuild b/www-apps/tt-rss/tt-rss-20241001.ebuild
new file mode 100644
index 000000000000..55c108a7ca49
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20241001.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="https://tt-rss.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="+acl daemon gd +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+
+PHP_SLOTS="8.3"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
+
+php_rdepend() {
+	local slot
+	echo "|| ("
+	for slot in ${PHP_SLOTS}; do
+		echo "(
+			virtual/httpd-php:${slot}
+			dev-lang/php:${slot}[$1]
+		)"
+	done
+	echo ")"
+}
+
+DEPEND="
+	daemon? ( acl? ( sys-apps/acl ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-user/ttrssd
+		acct-group/ttrssd
+		$(php_rdepend "${PHP_USE},cli,pcntl")
+	)
+	!daemon? (
+		$(php_rdepend "${PHP_USE}")
+	)
+"
+
+DEPEND="
+	!vhosts? ( ${DEPEND} )
+"
+
+need_httpd_cgi # From webapp.eclass
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-no-chmod.patch
+)
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	# When updating, grep the code for new DiskCache::instance occurrences as
+	# these directories cannot be created later due to permissions. Some
+	# of these directories are already present in the source tree.
+	keepdir "${MY_HTDOCSDIR}"/cache/{feed-icons,starred-images}
+
+	local dir
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+		webapp_serverowned "${dir#${ED}}"
+	done
+
+	if use daemon; then
+		webapp_hook_script "${FILESDIR}"/permissions-r1
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+		newinitd "${FILESDIR}"/ttrssd.initd-r4 ttrssd
+		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
+
+		elog "After upgrading, please restart ttrssd."
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index 3ea3d6a0a40a..783f41b666ac 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -13,7 +13,7 @@ SLOT="${PV}" # Single live slot.
 IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
 
-PHP_SLOTS="8.3 8.2 8.1"
+PHP_SLOTS="8.3"
 PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json(+),pdo,unicode,xml"
 
 php_rdepend() {
@@ -60,12 +60,13 @@ src_install() {
 	insinto "${MY_HTDOCSDIR}"
 	doins -r *
 
-	# When updating, grep the code for additional DiskCache::instances as they
-	# cannot be created later due to permissions.
+	# When updating, grep the code for new DiskCache::instance occurrences as
+	# these directories cannot be created later due to permissions. Some
+	# of these directories are already present in the source tree.
 	keepdir "${MY_HTDOCSDIR}"/cache/{feed-icons,starred-images}
 
 	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,lock}/; do
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
 		webapp_serverowned "${dir#${ED}}"
 	done