gentoo resync : 02.06.2019

3 files changed, 91 insertions, 5 deletions

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2d05e6262f6f..10c3ab3b19e2 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -5,6 +5,8 @@ AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb
 AUX ttrssd.initd-r3 2338 BLAKE2B 6ddcb12c548ef6b34196da7539b5ec2f061db46f041912647ea2741208004d25cc7d51d88375aa06b5866a7ef44995088cc9002d625666bdaaf687733b699a8f SHA512 eb6a9824562f49d42e94522c074719720686cd2d3fb3d0ac13ce5d83fdeae6b17a5047e79e761aea084eb8ff6e6aa733d49131324f8a00406935f8e0b962764b
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
+DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
 EBUILD tt-rss-20180105.ebuild 2116 BLAKE2B 420d5b05643b29abe653a53db201ac1d5bd287faf48a5ed4eb8694e183ce38fec6c36dbe77cbdbe55cdb03508e720bd3371df939dd10d0185398a2fcc3fb5838 SHA512 362544447ff951a400056ebd8a083a0d7f37dd0a6772b5b25bc46aada86d69ed6df37b6f612c8313e2b6cd4667d0e16c5cc18990730e333dbb11588d528242c9
-EBUILD tt-rss-99999999.ebuild 2163 BLAKE2B 2147dd308815ea48e4b91bb62606647d18736772068ea82e5ea52dd155e15a523c271ea1691f65459101d0df5151a2b4dd0f06af4db828ee31261c1be6094186 SHA512 15ff6fc2390ad194a7f7b26e7b448c8e9062b0ab79b9c60edd2e5edc9bf5ca6bcb275469ec7a1a0a0fba0971bf1f1a843908f373862a34644071e484be68d3b4
+EBUILD tt-rss-20190523.ebuild 2123 BLAKE2B 5e741b1b68a15327824b3fb98090ee993dd2517cc0851bd1cbfce3f67f1fc5163e458aeec22767a915f2705c0c4970c8dd2bd3b4586a0ca091d50f2ab2ec0f17 SHA512 7baa07afbcb6112bfbab8409a31a63afab7f566cd764a7e110c61e62555ad330d07e8cba4d541ba1775b789b2c86f3cbb8ea15aec0748874133432f0d3441ce7
+EBUILD tt-rss-99999999.ebuild 2170 BLAKE2B 360b2ada6756ae564c7dc1497f488baebb4d1db78e93ff21c0681a40767b70bbfb5c4c161f08411cbe89cb9f3d3cdf451ba64208b4f3c2f2f7f6534ea25b0f48 SHA512 c453912dc640ba2a235601a8442061e775e0259a468df39bad3dedcd6f69999f906196076c57bcf44b79a8754558f4b3eedb0af400a31efc7077f089d6642c94
 MISC metadata.xml 349 BLAKE2B d14bc6946ab95fa116a982d4d9ea1c76b94c1094876c32451adeb783925410e5f80323943aa8922aef9c4c7bd630038bbab07186f62cbc3aa36b2d7eec5fc306 SHA512 2b18408b092177dc05b0720635e28c8dac334d9013d1e9f30ee7288fd2158a1c47fd313f916dea4e5f1bf37ea04b15e8845f4a7331dcce43579163fb7a36bb6a
diff --git a/www-apps/tt-rss/tt-rss-20190523.ebuild b/www-apps/tt-rss/tt-rss-20190523.ebuild
new file mode 100644
index 000000000000..fbfb5e9a9330
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20190523.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix user webapp
+
+COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="https://tt-rss.org/"
+SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+acl daemon +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+
+DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
+
+RDEPEND="${DEPEND}
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
+	virtual/httpd-php:*"
+
+DEPEND="!vhosts? ( ${DEPEND} )"
+
+need_httpd_cgi # From webapp.eclass
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use daemon; then
+		enewgroup ttrssd
+		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_configure() {
+	hprefixify config.php-dist
+
+	sed -i -r \
+		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
+		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
+		config.php-dist || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	# When updating, grep the plugins directory for additional CACHE_DIR
+	# instances as they cannot be created later due to permissions.
+	dodir "${MY_HTDOCSDIR}"/cache/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
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+		newinitd "${FILESDIR}"/ttrssd.initd-r3 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
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php-dist into config.php manually when upgrading."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index b611aa54bd70..1f6d41d337bf 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 prefix user webapp
 
@@ -16,8 +16,8 @@ REQUIRED_USE="|| ( mysqli postgres )"
 DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
 
 RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
+	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
+	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
 	virtual/httpd-php:*"
 
 DEPEND="!vhosts? ( ${DEPEND} )"