gentoo resync : 30.09.2020

3 files changed, 101 insertions, 20 deletions

diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index 9b1062ac9e14..fa82b8ea2e01 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,4 +1,6 @@
 DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3
 DIST redirector-3.2.10.tgz 45407 BLAKE2B 735cab04b58d62a5772b2da540f1f358d20a1bf4612ab1d838066e9319bf28e3288a988e2fbebd5a7f7e6ad3912a59f3fadbed3bddf99b557ee562cd45779751 SHA512 6e82341e402b149464b048e763cfa6f7bc514bae48514b482eded9288af9705942fbfd2e11b5701d3540489ec5ccab358848108fe15f25c5ab2915e44f3f1033
-EBUILD rejik-3.2.10.ebuild 2321 BLAKE2B a1ba8d0b9de4bbf51f59cb772658fc83341001aa070d36b2456149e924d52ece8fe555094eb2bf1ebaa4dba37b9c4a1f2efcbd9a0d94cf06df2535eb79c7887c SHA512 5242e4266c01094dbd75e44ceee73292a07836d17cb586cf41c13c2af814d2d466d83db489d87c218c7c1491c18f419c3a287b4f1b186b2ccc5bcecd2c99b7ba
+DIST redirector-3.2.11.tgz 45758 BLAKE2B 39f83c8245d8a24c7454d40d607c851250bd9844f56ee8e9f43d64f32ac3cb52d9c1d9091e3d5126133d94fe59d5be8e8d99b7f2cb253c7731a73e344604a1ce SHA512 e4b20f11a46a84d47c8e6adc74f88f6092f9791e1b6050a3e3b4685cf4c510b55f32ea3d4c9a334dbe5753ee486b98ca73bb7e2d9854e2c8d299b7fd50fce2f8
+EBUILD rejik-3.2.10.ebuild 2290 BLAKE2B 3723f29be3740d3e937c8c1433f1bfb27b555c31a18a06c49443efa59c932670a4a3b9b11ddc385cc302f8de58535fdf03afbbca8d4b80cc328f7bc6bc394998 SHA512 1052da6d1d2bac007f11a39810dcd7d53aae659efd12312839d76ca65e113914cf598bff3f2d2c5ebb85718cc4cb5f63210cbe313a2bed474f5ef1a22143f307
+EBUILD rejik-3.2.11.ebuild 2374 BLAKE2B 14283a74cfef4686ecb0bb35d793376c9be59631be67515a86501d26f2b13fdb8c638b413e568bf99d187e0868cf1bf5a01f1724e0f9952bb9de5142ea020b92 SHA512 bcc318e80da39475396632e91dba1d3397af744d0659af43d67b0b4b3552f25141330b22506f0d9ba65b2a877d6e780d7dc63da6874e038e42ed4bda36b7527a
 MISC metadata.xml 345 BLAKE2B ced7a93f69f79d0f576c3249172a0557eca3002ba2b2c4bfeaed9f24d9bdce2e0cd10081ca67e96e3f2b944fe1a5c16bc2de4aba1a5ab14e274d89362be2089e SHA512 c45ec66f94f72f5a1faae645214953c4941e98e442625775fc25a2010345a31e61db086f1498344a64dd026764037a7a6d277655ab578ff32d7e9167d5eece57
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index 2c60bc8a830f..e566d009210b 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A squid redirector used for blocking unwanted content"
 HOMEPAGE="https://rejik.ru/"
 SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
 	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,25 +22,24 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 	net-proxy/squid"
 
-S=${WORKDIR}/redirector-${PV}
-
 src_prepare() {
-	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${D}/opt/rejik:g" Makefile
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h
-	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile
-	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
 	# Respect CFLAGS
-	sed -i -e "s:CC=gcc -Wall:CC=$(tc-getCC) $CFLAGS:" Makefile
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
 	# Respect LDFLAGS
-	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
 	#
-	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
 }
 
 src_install() {
-	dodir /opt/rejik
 	exeinto /opt/rejik
 	insinto /opt/rejik
 
@@ -47,13 +47,9 @@ src_install() {
 	doexe redirector
 	doins redirector.conf.dist
 
-	dodir /opt/rejik/tools
 	insinto /opt/rejik/tools
 	exeinto /opt/rejik/tools
 
-	fperms +x tools/kill-cache
-	fperms +x tools/benchmark
-
 	doexe tools/kill-cache
 	doexe tools/benchmark
 	doins tools/IN.gz
@@ -79,6 +75,6 @@ pkg_postinst() {
 	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
 	einfo "to /etc/squid/squid.conf"
 	einfo ""
-	einfo "Dont forget to edit /opt/rejik/redirector.conf"
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
 	einfo "Be sure redirector.conf has right permissions"
 }
diff --git a/net-proxy/rejik/rejik-3.2.11.ebuild b/net-proxy/rejik/rejik-3.2.11.ebuild
new file mode 100644
index 000000000000..da5a1a17a739
--- /dev/null
+++ b/net-proxy/rejik/rejik-3.2.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A squid redirector used for blocking unwanted content"
+HOMEPAGE="https://rejik.ru/"
+SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
+	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banlists"
+
+DEPEND="dev-libs/libpcre"
+RDEPEND="${DEPEND}
+	dev-perl/Text-Iconv
+	dev-perl/XML-Parser
+	net-proxy/squid"
+
+src_prepare() {
+	# Workaround for GCC 10 failure, bug #706766
+	append-cflags -fcommon
+
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
+	# Respect CFLAGS
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
+	# Respect LDFLAGS
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
+	#
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
+}
+
+src_install() {
+	exeinto /opt/rejik
+	insinto /opt/rejik
+
+	doexe make-cache
+	doexe redirector
+	doins redirector.conf.dist
+
+	insinto /opt/rejik/tools
+	exeinto /opt/rejik/tools
+
+	doexe tools/kill-cache
+	doexe tools/benchmark
+	doins tools/IN.gz
+
+	fowners -R squid:squid /opt/rejik
+	fperms 750 /opt/rejik
+
+	keepdir /var/log/rejik
+	fowners -R squid:squid /var/log/rejik
+
+	if use banlists; then
+		insinto /opt/rejik
+		doins -r "${WORKDIR}/banlists"
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Copy /opt/rejik/redirector.conf.dist to /opt/rejik/redirector.conf and add line"
+	einfo "for squid 3.*"
+	einfo "url_rewrite_program /opt/rejik/redirector /opt/rejik/redirector.conf "
+	einfo "for squid 2.*"
+	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
+	einfo "to /etc/squid/squid.conf"
+	einfo ""
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
+	einfo "Be sure redirector.conf has right permissions"
+}