gentoo (valentine's day) resync : 14.02.2021

5 files changed, 36 insertions, 11 deletions

diff --git a/net-proxy/squirm/Manifest b/net-proxy/squirm/Manifest
index d4b886732417..5fec48d29d6c 100644
--- a/net-proxy/squirm/Manifest
+++ b/net-proxy/squirm/Manifest
@@ -1,5 +1,6 @@
+AUX squirm-1.26-fno-common.patch 441 BLAKE2B f2284d89bef3764295750b91b76df86103ffbd15e32e2796502a9ce3c69ae1927454ae0a137dcdf773bd9814a49fd07a3cca9446e4d5c56e6e92ab3244946880 SHA512 e3560ffe9f2414633ef441ab1fc83404cbba643002eee93a014ad5518c695430016edf35671adb6098f9a28b6706cc75849ae84e3de39e116ed47f41e3fd22d1
 AUX squirm-1.26-gcc5.patch 182 BLAKE2B c583aaef670d104202513ea1a37c44df2d6238bf33722fe459bf098130d709900e060b9f28d9ba4d3b9407c49217ed0cc6229ff83473a101c4fe300d6ddf912d SHA512 ca757dd978c15e32ddca80bd402c4b10b953add88350dadd05615812973104cc788916974ff92b56c73e922477ef892dee4427ef5211a2e4281f29316a828050
-AUX squirm-1.26-gentoo.patch 1019 BLAKE2B ecabb023c59c8db0c0dd4a076ab3f6171ba586d8cff133710593b7f34a64cf6c74f7aa9663517204776d51b89963b3c4e89fadf16dd61f2b2abffd4cabb385a8 SHA512 673997c76a660d276f628007e4a2a66ea9afb502f6803e2ef9c9b289b7e50c86428cb95abb48aee992cb7afe5c7684790328549adc0b69e70888528d076636b9
+AUX squirm-1.26-gentoo.patch 865 BLAKE2B 2596330444bb787558ea50ae9c62f050a76777471ef0e6660bfb879ee0b24a14993c8fc8e6471e2d2ddbf656aa97161eddecaf27e2c54bed5c70937a5fc9cfa2 SHA512 da8e8f49f82c3eaabd73b50e74895a9eee42e3cfdda8344a94b347949580ebe36724ae800e8b61c357097a851c8d9f63ebf993d5699a5284275f94a9a660e06c
 DIST squirm-1.26.tgz 24151 BLAKE2B 2e653575d0043c73d8a6ffc526af38c06e32c4bba7726bdc57d56b556ca2bbcf489ed6e009952c4559b3aa63ca79fb4569c30c1cd11b758d669656b192b2274f SHA512 f6d0ec06d796b053cbe77e3099aa15665dc42a0e48e7c5b48c25c35a02677152bbb868ed822460cd52a1e898ec0ad605c43fe408c19e85e473e04257c8ffd9be
-EBUILD squirm-1.26-r1.ebuild 761 BLAKE2B a4eb8c046545b92b2619604361f92ba08f9294a98efa3c3814ba10e9fb5ee6b80fb3c7013d01140e319bd0113ade1c85684a5d4264c15fb528680a24fdd3691a SHA512 3cf9af0e0221e15e3243ee4b80d4767b8bb62a1bf197238f391a24c80e2967d5afe14d732f8f2d2798ad82433437b7bc6dab1e8e99cefac9f2ad651f44460adb
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD squirm-1.26-r1.ebuild 785 BLAKE2B dd8b4a72ac7d9c5ad954aa7763f2f398c61688e4d426bec0d49277729b612982febed1e8bec45bf79377bf9f9ddfe36594ae684c56c91ccd5256af93d3d8a886 SHA512 9ea9ce99f488280d11fde0ad581444050d6cc62cc04ff283a017f315dae06935454d8263cd9bc8f0d374c69df64b10f38596561a1c534586a0a5cdd75ab9180a
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-proxy/squirm/files/squirm-1.26-fno-common.patch b/net-proxy/squirm/files/squirm-1.26-fno-common.patch
new file mode 100644
index 000000000000..01e6b25f59d1
--- /dev/null
+++ b/net-proxy/squirm/files/squirm-1.26-fno-common.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/709648
+--- a/lists.c
++++ b/lists.c
+@@ -38,6 +38,8 @@
+ 
+ 
+ extern int dodo_mode;
++struct pattern_file *pattern_head;
++struct subnet_block *subnet_head;
+ 
+ 
+ void init_lists(void)
+--- a/lists.h
++++ b/lists.h
+@@ -45,8 +45,8 @@
+ 
+ 
+ /* the two chief lists */
+-struct subnet_block *subnet_head;
+-struct pattern_file *pattern_head;
++extern struct subnet_block *subnet_head;
++extern struct pattern_file *pattern_head;
+ 
+ 
+ 
diff --git a/net-proxy/squirm/files/squirm-1.26-gentoo.patch b/net-proxy/squirm/files/squirm-1.26-gentoo.patch
index 16b6e21c7aa2..1f823d9e525c 100644
--- a/net-proxy/squirm/files/squirm-1.26-gentoo.patch
+++ b/net-proxy/squirm/files/squirm-1.26-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru squirm-1.26.orig/Makefile squirm-1.26/Makefile
---- squirm-1.26.orig/Makefile	2005-08-19 09:31:06.000000000 +0200
-+++ squirm-1.26/Makefile	2009-06-20 14:58:18.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,7 +1,7 @@
  # $Id$
  
diff --git a/net-proxy/squirm/metadata.xml b/net-proxy/squirm/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/net-proxy/squirm/metadata.xml
+++ b/net-proxy/squirm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-proxy/squirm/squirm-1.26-r1.ebuild b/net-proxy/squirm/squirm-1.26-r1.ebuild
index e5e323ec0781..d20f275a0c5b 100644
--- a/net-proxy/squirm/squirm-1.26-r1.ebuild
+++ b/net-proxy/squirm/squirm-1.26-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="http://squirm.foote.com.au/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
 RDEPEND="net-proxy/squid"
 DEPEND="${RDEPEND}"
@@ -20,6 +19,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
@@ -27,7 +27,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${ED%/}/opt/squirm" install
+	emake PREFIX="${ED}/opt/squirm" install
 }
 
 pkg_postinst() {