gentoo auto-resync : 09:09:2022 - 10:40:04

6 files changed, 110 insertions, 96 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index bfb14bbac786..0f42882ba778 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/automatic/Manifest b/net-p2p/automatic/Manifest
index bb89e0199310..ceef4169e033 100644
--- a/net-p2p/automatic/Manifest
+++ b/net-p2p/automatic/Manifest
@@ -1,7 +1,8 @@
+AUX automatic-0.9.0-util_test-header.patch 291 BLAKE2B 7a0feca16c37703030e735540864ccd77dd753874537c4b52d96752fdaa2ed41598d52fa14daf5c3bf677de0d1fb613f92443929ecad7fab2969d26f22a8701b SHA512 3f306cf70fd0112fd10b28df9055be59fe8842ac73d9205e03a0d566d861aff5b4e1f86bc710516fa2fe0aa25ac839ab61002905d0fe6e1ff5e49a3b421db07c
 AUX automatic.confd 214 BLAKE2B df9c0f34aee873dcc8db21e57b650926362a0030d13903317fb51aeb45ffd16b8c5c1b93ec6dd5be4ed48218285d333627cbfafee5401752744cbc9fa4d44d83 SHA512 8b8f6a1c3da195987c053639a564dc152d525f68da7891d54988e2dfd931bee7d91595734316ade23c29edd56cf3026bf78e19de04eda512cd2a6369ea5a6b6e
-AUX automatic.initd 745 BLAKE2B 9e54668ffcff2502ae864ca2f645e71f991b6fa2f1381a7ca1104ce8a19fc5706d73bb50f08513b89b62de28c4dc203030197cc759509ae3de93c31dcc03a92e SHA512 bb576a0aeea4d371d5b44e07a2dea1cf4e6e515a23b8e7e8c274831f32fda4e3be64245c08f37878b0bc5da371880c6d1904c87463ad0704305cc7b0818a2b3f
+AUX automatic.initd 431 BLAKE2B f81146ef64a4c0646ecb07bee7862293405bb5f7e8e81a5b3bdbc87e54d482aa392ae8b719c4cd7e226a53882d446e57282e5129173ff70994e76acf5436adff SHA512 29a12e02dfe1fbd0a8b39e44d0b8f9f49133a776d3c79d8aac17521dcc508f3a1c6cc736adecd3b8f8d1e7ef110fc53e68a8947cc98cb0b3ea37fbb54cc646a1
 AUX automatic.logrotate 94 BLAKE2B 6f505920dca44514ccec80d4bd917c5254d6955aad195fa1b830f0daee93d9465a445a3fc3966b9ff221e51a0d06380eb963a56ff942833fbb3a83f34dd6fd19 SHA512 91353a49d18eaac4ad65b5733a333bb173233d45622e8d421bb6ed2b3c0e8443b22f951f90a8f8964d13921debb6289a4c911ca40a8484a648f210a206589771
 AUX automatic.service 303 BLAKE2B 90b2d3ed19c6347b31b90bca68f482d580f56b62212eea17b6d0b8a10bd7ee15ea3937ece839485da7efba4d61597c032f1dccd9fc0802967f7bf0fbf33f6b4d SHA512 4e398133d71b834855d77c6d23f8d4ae87100c48661825797ccfc0e7613933a2a8dd4eddffeac51ffbaa1619847d2e2de0b4ecb20bfa1b13f9596cb57cda392c
-DIST automatic-0.8.3.tar.gz 102181 BLAKE2B cdba7706f16eb552d2da960ae03206acce45149d6e8d8f32654c05b6dc3293368afe3c44a7c0d254fd895c7f5fe30fe541139375793a143c4a3d605d27486824 SHA512 34061065d53ab362c9bfab9b66aebf7090b7079e5988b1984398410ab07ca2bdfdf3c65dd90bb076b6189120877784294484803d4ce5fa813d3bc13207aeebdd
-EBUILD automatic-0.8.3-r1.ebuild 1712 BLAKE2B b0468fb8ab99eec1a00d3b8f5605cc21350d5dfa18a5560bae79668b2fbc5ab6059fc2f408bd4a1c86c7e0b98b88db1445d8167dd99c2054dc13497d47587d60 SHA512 23b3bc1f2d035f8b16593f4ab730ac88a900c00985fa28fc8909c0aaae9d3ea2f6456239ad245abd9588070b9015e5407a16b02d40a0d664338881104e329caf
+DIST automatic-0.9.0.gh.tar.gz 104087 BLAKE2B d904771dce8b1f4077908389141708dd8f5dd91cab38aaae5adee37f870d42bc5da15838a5a56fd3ff429e095bf30d9e6ecbf5907428e3fe22a089fe8fb7c400 SHA512 9f26688ce67e7ab258b43159352e9615bfe72a8bc9c7a0a4129d156213196002d0809e360b5df751be7fb6cbc1a4b466e6c58edad655abba46b70642496445dc
+EBUILD automatic-0.9.0.ebuild 2155 BLAKE2B 366cb39a3f82fd9f9adf3dca56e0ebdf73b93d81fe59de010c7879b2cc0ab00faf6abffc1b81b00049e71f74d10f39898a03198acb8265786432db94195fc5e2 SHA512 b02bc7b73392881e08047fba4322b9f8a8da6cdbd81f5bacc6f601039e5aeed27c002185bb9a580e4f1b567eb5664b394289f03950e6b0e1b0f4374ed4f1ba21
 MISC metadata.xml 725 BLAKE2B 2639708effc0a0f3c7ad70972fa015656e8ac8a38041b7cea278ba2097ce1c8046e2f06432c13b350feab52d592f2206433e06470bbca8c662c150c5348f9185 SHA512 4fed3b36f9defce0fa40f6d43bafc5da43fe1471a65d443eb3203bf2e4b26a48489833a430c774cc5a4a4f7462f8e1d5efbb484cba57b97d676ea2d5077572d4
diff --git a/net-p2p/automatic/automatic-0.8.3-r1.ebuild b/net-p2p/automatic/automatic-0.8.3-r1.ebuild
deleted file mode 100644
index 1edc2fdd4e89..000000000000
--- a/net-p2p/automatic/automatic-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="RSS downloader for Tranmission"
-HOMEPAGE="https://github.com/1100101/Automatic"
-SRC_URI="https://github.com/1100101/Automatic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="acct-user/automatic
-	dev-libs/libxml2:2
-	dev-libs/libpcre:3
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P^}"
-
-DOC_CONTENTS="To run automatic you should move /etc/automatic.conf-sample
-to /etc/automatic.conf and config it.\\n
-If things go wrong, increase verbose level in /etc/conf.d/automatic
-and check log file in /var/log/automatic/\\n"
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/426262
-	mv configure.{in,ac} || die "rename failed"
-
-	# Remove CFLAGS and CXXFLAGS defined by upstream
-	sed -i  -e 's/CFLAGS="-Wdeclaration-after-statement -O3 -funroll-loops"/CFLAGS+=""/' \
-		-e 's/CXXFLAGS="-O3 -funroll-loops"/CXXFLAGS+=""/' \
-		configure.ac || die "sed for CXXFLAGS and CFLAGS failed"
-
-	# tests fail with network-sandbox
-	sed -i  -e '/check_PROGRAMS /s/http_test //' \
-		-e '/check_PROGRAMS /s/prowl_test //' src/tests/Makefile.am \
-		|| die "sed failed for Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/automatic.initd automatic
-	newconfd "${FILESDIR}"/automatic.confd automatic
-	systemd_dounit "${FILESDIR}"/automatic.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/automatic.logrotate automatic
-
-	readme.gentoo_create_doc
-
-	diropts -o automatic -g automatic -m 0700
-	keepdir /var/log/automatic/
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-p2p/automatic/automatic-0.9.0.ebuild b/net-p2p/automatic/automatic-0.9.0.ebuild
new file mode 100644
index 000000000000..f26ef8d29fba
--- /dev/null
+++ b/net-p2p/automatic/automatic-0.9.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
+
+COMMIT="6301c30"
+
+DESCRIPTION="RSS downloader for Tranmission"
+HOMEPAGE="https://github.com/1100101/Automatic"
+SRC_URI="https://github.com/1100101/Automatic/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="acct-group/automatic
+	acct-user/automatic
+	dev-libs/libxml2:2
+	dev-libs/libpcre:3
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P^}"
+
+# wrt #836740
+PATCHES=( "${FILESDIR}"/"${P}"-util_test-header.patch )
+
+DOC_CONTENTS="To run automatic you should move /etc/automatic.conf-sample
+to /etc/automatic.conf and config it.\\n
+If things go wrong, increase verbose level in /etc/conf.d/automatic
+and check log file in /var/log/automatic/\\n"
+
+src_prepare() {
+	default
+
+	# remove CFLAGS and CXXFLAGS defined by upstream
+	sed -i  -e '/CFLAGS=/s/=".*"/+=""/' \
+		-e '/CXXFLAGS=/s/=".*"/+=""/' \
+		configure.ac || die "sed failed for configure.ac"
+
+	# set version
+	sed -i  -e "/SVN_REVISION/s|'\`git rev-parse --short HEAD\`'|${COMMIT}|" \
+		-e "/LONG_VERSION_STRING/s|'\`git rev-parse --short HEAD\`'|${COMMIT}|" \
+		src/Makefile.am || die "sed failed for src/Makefile.am"
+
+	# provide test api keys for tests
+	sed -i '/correct_key/s|""|"05b363d4561aaaa5c4c49bbb15639068b8cb6646"|' \
+		src/tests/prowl_test.c || die "sed failed for prowl_test.c"
+	# disable pushover tests
+	sed -i '/check_PROGRAMS /s/ pushover_test//' src/tests/Makefile.am \
+		|| die "sed failed for src/tests/Makefile.am"
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-lto # wrt #861842
+
+	econf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/automatic.initd automatic
+	newconfd "${FILESDIR}"/automatic.confd automatic
+	systemd_dounit "${FILESDIR}"/automatic.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/automatic.logrotate automatic
+
+	readme.gentoo_create_doc
+
+	diropts -o automatic -g automatic -m 0700
+	keepdir /var/log/automatic/
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-p2p/automatic/files/automatic-0.9.0-util_test-header.patch b/net-p2p/automatic/files/automatic-0.9.0-util_test-header.patch
new file mode 100644
index 000000000000..726140644d8c
--- /dev/null
+++ b/net-p2p/automatic/files/automatic-0.9.0-util_test-header.patch
@@ -0,0 +1,11 @@
+# https://github.com/1100101/Automatic/pull/20
+--- ../src/tests/utils_test.c.org	2022-08-21 11:39:01.502847479 +0300
++++ ../src/tests/utils_test.c	2022-08-21 11:39:18.455043931 +0300
+@@ -6,6 +6,7 @@
+  */
+ 
+ 
++#include <stdint.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <assert.h>
diff --git a/net-p2p/automatic/files/automatic.initd b/net-p2p/automatic/files/automatic.initd
index 4eaa1dc810cd..e299d52876aa 100644
--- a/net-p2p/automatic/files/automatic.initd
+++ b/net-p2p/automatic/files/automatic.initd
@@ -1,35 +1,19 @@
 #!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
-NAME=${SVCNAME##*.}
-if [ -n "${NAME}" -a "${SVCNAME}" != "automatic" ]; then
-    PID="/run/automatic.${NAME}.pid"
-    PNAME=$(echo ${RC_SVCNAME} | sed 's/\..*//g')
-    CONF_DEFAULT="/etc/conf.d/automatic.${NAME}"
-else
-    PID="/run/automatic.pid"
-    PNAME=${RC_SVCNAME}
-    CONF_DEFAULT="/etc/conf.d/automatic"
-fi
-CONF=${CONF:-${CONF_DEFAULT}}
-EXEC=${EXEC:-/usr/bin/automatic}
+command="/usr/bin/automatic"
+command_args="${OPTS} ${CONFIG}"
+description="RSS downloader"
+name="RSS downloader"
+user="${AUTOMATIC_USER:-automatic}"
+group="${AUTOMATIC_GROUP:-automatic}"
+pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {
 	need net
 }
 
-start() {
-	ebegin "Starting automatic"
-	start-stop-daemon --start --quiet --make-pidfile --pidfile ${PID} --exec ${EXEC} -- ${OPTS} ${CONFIG}
-	eend $?
-}
-
 start_post() {
-	pgrep -n $(echo ${PNAME}) > ${PID}
-}
-
-stop() {
-	ebegin "Stopping automatic"
-	start-stop-daemon --stop --quiet --pidfile ${PID}
-	rm -f ${PID}
-	eend $?
+	pgrep -n "${RC_SVCNAME%%.*}" > "${pidfile}"
 }