gentoo resync : 22.05.2021

3 files changed, 2 insertions, 80 deletions

diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index e06d159ab6a1..8fa0fe12f052 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,8 +1,6 @@
 AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a5222a3ea7254b4bdc03808c5f9f87d9b33556f345e305d28e155834b33ff2a952c041af582cae3bedbae2034d SHA512 cd440ed686e8128ed46441ca29da8376c4d28e9e34ae9b85c18eb2f1681d60c0c04b79401a7368f917eeab6768965d6c867d0ac6578a7858557c11b356446c02
 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
-DIST tinyproxy-1.11.0-rc1.tar.xz 176732 BLAKE2B a448c90b17a8d3256aec1dba4307e9bce87ac421a67486e4987afbf22e49041971138f09e98a4a775cc05071b73b4f1b34e652eb2c0992b2a5fa1861a0df26b2 SHA512 e1d05777072d178c66d1f007163bcb4b3a0b1dfdf460881daaf962b5f1c0d0213ec5403bf50c161d811f46c8b50a476cd534f535962ec01b70fbb955471c1af1
 DIST tinyproxy-1.11.0.tar.xz 177664 BLAKE2B 6ea74ef0fff22fbc6e04b37519151fda771a7d3e789d94cbd2a77a76dce7b16151cfbad83ac665a5c1fdb7334cd4d26ed6d2bc73f70b3858ffe439b16698fd2e SHA512 c0ff2a90da2352e6021efc87d1293b85f2a7588b2a1ab13bd96d906382eda8188b22b01f9acb2d200fd570bf3ec9484fa370cae6834d1f055c0af1631d22ae9d
-EBUILD tinyproxy-1.11.0.ebuild 1722 BLAKE2B 7d01324e0e825dedc25e1cd9b37820d1bb60227397faec109c214500ecacaadf8ef079e5f2327b78188254625c7555b37d018170d41e819f90efe45b0cb9270c SHA512 cee971ea6980ed385bc40f28992e696d767af982b63331570294fed61bc41081529e3a30205836f2bb5457e57e77bcfb9549339e3993d50433eb5473c7ecdab1
-EBUILD tinyproxy-1.11.0_rc1.ebuild 1719 BLAKE2B b8a013fc7c996cca345f688f89f0017cbd8d3eb2eb6e62ad1f0ec9b2419a834c901dc45e68f2963906025870d76eb42b4f4fddf4fb8eb483319bca85608fd4aa SHA512 131ae575e82b52f495286c34b5accc8ed3902a83d91ed3d6ad159848ef2fc5e005d7ec06bd8afb0e296ae9294dbb519ea3d6e167eb7082606556342b962aa3e6
+EBUILD tinyproxy-1.11.0.ebuild 1719 BLAKE2B b8a013fc7c996cca345f688f89f0017cbd8d3eb2eb6e62ad1f0ec9b2419a834c901dc45e68f2963906025870d76eb42b4f4fddf4fb8eb483319bca85608fd4aa SHA512 131ae575e82b52f495286c34b5accc8ed3902a83d91ed3d6ad159848ef2fc5e005d7ec06bd8afb0e296ae9294dbb519ea3d6e167eb7082606556342b962aa3e6
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild
index 0f0cb9c579fa..29cef2869832 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~sparc x86"
 
 IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
 +upstream-proxy +xtinyproxy-header"
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
deleted file mode 100644
index 29cef2869832..000000000000
--- a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A lightweight HTTP/SSL proxy"
-HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
-SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~sparc x86"
-
-IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
-+upstream-proxy +xtinyproxy-header"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( xtinyproxy-header )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DEPEND="
-	acct-group/tinyproxy
-	acct-user/tinyproxy
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|nobody|${PN}|g" \
-		etc/${PN}.conf.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
-		--localstatedir=/var
-}
-
-src_test() {
-	# The make check target does not run the test suite
-	emake test
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	diropts -m0775 -o ${PN} -g ${PN}
-	keepdir /var/log/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
-	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
-	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.tmpfiles.conf
-
-	elog "For filtering domains and URLs, enable filter option in the configuration"
-	elog "file and add them to the filter file (one domain or URL per line)."
-}