gentoo resync : 24.07.2021

5 files changed, 22 insertions, 76 deletions

diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index a23982881954..f8d8f3667fab 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,9 +1,7 @@
-AUX conf 292 BLAKE2B 985eee63e2f797dc7bb84a19b5dfb77bd6bf171d675f881226fc2b5a833392f179c040d71f45b4b4a8fe723eb7981f5fdb317d7be3dc7c7725c46879bbb10412 SHA512 56c3fe690e513f0e96ef486dbee3dc862409321935be03977d38a47641e7b8fd87c2b2a29d444320a1554689df497b5aee204922f2059a1e2d1139b8fce6291a
 AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c40d4b84d554c11ffb9d3c628b0142f5ce33d6f5e1ff8b140d8cd7d05642648c2e4f8bc700d SHA512 981dc0dca903f8ebdd3cc80368650d42f02bf194ccd12e64d2d4cc273ae13ec42da69341529750bca7232d7bcb3df67a02aa3db6179c4835682e86fabef689f0
-AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5221fc3ffcf68618e6434dfe7eaf83a361d4c6faa7799ce5342d5c546edc3f0930a499 SHA512 cbeaeac8a993711822086a761b624783bbf4ff11cff5c569a4c0cd3e6e174fe36904a661155c1460f7b43e0b2d6b631cd9e290d76138520021a702567b0494dd
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
-DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
-EBUILD beanstalkd-1.10.ebuild 1031 BLAKE2B 4f2acac9f9b39efab62fcfb505954c077215dfdb7ef1c26371c3e8129bda91ebf55507dc9e2edfad0ecb9077f93a5a4193a5b89252b07465be66ebbf8ad7e0a7 SHA512 121e35a3c4423c7323dbae112e4609a3b16b1c82b0f380f54133275fcef27dc74085949d55176ecb8ec49ee6a1684af12f821a1b7df590296f8a1c22d9adcf4f
-EBUILD beanstalkd-1.11.ebuild 967 BLAKE2B de995db0b67689a1bcfe0fe26782c1816516f0681bc03cd617db80966e7a7def2b90e3deac21d8289b753fc298a13b97cda23b70a0ad42e89f9680025a834527 SHA512 363223dc266de41d6ea04b6f8b67f480fee20e3cf55658c1182e3211b89d98e250c8c75570aefcf87f615961c4ed779a036184ec14a14fe25c5d67683a1298df
+DIST beanstalkd-1.12.tar.gz 79592 BLAKE2B d0abe510bada93014c9c748e116a7a34e947be50269eba3b64ed97739800f3464b7c2574c9d7e87786855f6f50701e60464d280c95db4f75f402f547700ef19e SHA512 347f8cf29501d4bf1a01a472f8f6265d1211eadfaa4e5626c8fcab5b1f8116e1e0ddee2a0c82ac116ee60655a2e3b514d254f98c2154be76109a24d77f7d8210
+EBUILD beanstalkd-1.10-r1.ebuild 911 BLAKE2B d912810d75d0e822a44481bbc1a3548fb6f9cc6ae0863f1ddfa6126d4627d51970f67a85e0ff82aefd51be95ff6bd816858b66c15df37f063d09410c7c81106e SHA512 925aab027bb55d6c856b7e55c724eb4028a828501ad35b00959a19cd08563a372e00d8c9bf6a5109ebe57684e9ee7236463a8be3f442698b4c200d86ed398163
+EBUILD beanstalkd-1.12.ebuild 854 BLAKE2B 1f52fd1076c7e18cc0b993a9301a08cf017989635c5c7c6423cb04271584800fd4c286d938fa347bb4ac32cbb10c4555bd0a17c4478162507557db728ff16a35 SHA512 7e8459ca2a0c78e499ed7efb7809e1b8020b97f43609bb8abf2591e1bcc50d87a7d8627884bfc3774b563210e390c502a9217a82cef1a72790fa4fd3fcd8b16a
 MISC metadata.xml 250 BLAKE2B 7caaab71f81fdc8dea5bcf2e8d1896f61d0d0ca7ad0f837c6e09ec5f788ea4663d2c179f8e25bd2dc2c6e298b5ef34b1c066ffd8d4d99f191fab1de7965948e5 SHA512 2d931d2f89bc23783adbf91ac5be611b0b9bc00f16d36b0d1bbcb19cd2ad77ba6b4d3b2a6a9af7afd33027a1f850384a22cc48f148ea0620bb956d39c46247de
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
index 0207e6355a88..489bb2fc14e4 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit systemd toolchain-funcs user
+inherit systemd toolchain-funcs
 
 DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="http://kr.github.io/beanstalkd/"
+HOMEPAGE="https://kr.github.io/beanstalkd/"
 SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
 
-RDEPEND=""
-DEPEND=""
-
-IUSE=""
+RDEPEND="
+	acct-group/beanstalk
+	acct-user/beanstalk
+"
 
 DOCS=( README News docs/protocol.txt )
 
-pkg_setup() {
-	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
 src_prepare() {
-	sed -i -e "s/CFLAGS=/CFLAGS?=/" \
+	sed -e "s/CFLAGS=/CFLAGS?=/" \
 		-e "s/LDLIBS/LDFLAGS/" \
-		-e "s/LDFLAGS=/LDFLAGS?=/" Makefile
+		-e "s/LDFLAGS=/LDFLAGS?=/"
+		-i Makefile || die
 }
 
 src_compile() {
@@ -37,10 +34,6 @@ src_compile() {
 src_install() {
 	dobin beanstalkd
 
-	DATADIR=/var/lib/${PN}
-	dodir ${DATADIR}
-	fowners beanstalk:daemon ${DATADIR}
-
 	doman doc/"${PN}".1
 
 	newconfd "${FILESDIR}/conf-1.9" beanstalkd
diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.12.ebuild
index 3f10665d8ffc..0fafbc7be72d 100644
--- a/app-misc/beanstalkd/beanstalkd-1.11.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.12.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit systemd toolchain-funcs user
+inherit systemd toolchain-funcs
 
 DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="http://kr.github.io/beanstalkd/"
+HOMEPAGE="https://kr.github.io/beanstalkd/"
 SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
 
-RDEPEND=""
-DEPEND=""
-
-IUSE=""
+RDEPEND="
+	acct-group/beanstalk
+	acct-user/beanstalk
+"
 
 DOCS=( README News docs/protocol.txt )
 
-pkg_setup() {
-	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
 src_prepare() {
-	sed -i -e "/override/d" Makefile
+	default
+	sed -e "/override/d" -i Makefile || die
 }
 
 src_compile() {
@@ -35,10 +32,6 @@ src_compile() {
 src_install() {
 	dobin beanstalkd
 
-	DATADIR=/var/lib/${PN}
-	dodir ${DATADIR}
-	fowners beanstalk:daemon ${DATADIR}
-
 	doman doc/"${PN}".1
 
 	newconfd "${FILESDIR}/conf-1.9" beanstalkd
diff --git a/app-misc/beanstalkd/files/conf b/app-misc/beanstalkd/files/conf
deleted file mode 100644
index c646326bf271..000000000000
--- a/app-misc/beanstalkd/files/conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BEANSTALKD_BINARY="/usr/bin/beanstalkd"
-PIDFILE="/var/run/beanstalkd.pid"
-
-# User to run as
-USER="beanstalk"
-
-# Port to listen on
-PORT="11300"
-
-# Address to listen on
-ADDR="127.0.0.1"
diff --git a/app-misc/beanstalkd/files/init b/app-misc/beanstalkd/files/init
deleted file mode 100644
index 2dddc9d6d6f4..000000000000
--- a/app-misc/beanstalkd/files/init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting beanstalkd"
-	/sbin/start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY} \
-		-- -d -p ${PORT} -l ${ADDR} -u ${USER}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping beanstalkd"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY}
-	eend $?
-}