gentoo resync : 25.09.2021

5 files changed, 6 insertions, 142 deletions

diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index bb535eb93ada..d1a8196a0ec4 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,12 +1,8 @@
 AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
-DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
-DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
-DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
 DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
-EBUILD ipv6calc-1.0.0.ebuild 1487 BLAKE2B 2bea35e2df217cee666c20940c365e91976eb70cf752653148138649e1c80c35514d13b2eb3571a401c3413fb9b29c24fa3e297c0d6837bd57bb4618b340b1e3 SHA512 93bb58646c27e30c067f003bd8b79c8d9562e63c2db39c80e207913760c1bcc46ec3e14cb343466d0a5a2f8a4d9cf037abdabcac520cd06a950f364c705f189f
-EBUILD ipv6calc-2.1.0.ebuild 1525 BLAKE2B 2fb920cc7f827d4b6d272f8a50418a6382ea82ac64ed7ed79c2cd2faa76240b0656ba02b1184207c9de2161b13b176ea283db9713bb6ebd5ad9d3a1ddbc0c00a SHA512 2e3653a9c4a8b48d2f61a8ff3d46f2218cf9a407ed48c2add7d8a04f686984c046491ec6f0f2235daa20c935bb50e754ff63f85778efe21a7dd8e174f408a86c
-EBUILD ipv6calc-2.1.1.ebuild 1528 BLAKE2B fd6b294ac662f84c8f4812e1049ca3c546ddb66fd126a49154b076833745aa217660f89ce4049207a8177c306e1ec2e724dd7120175ff49fcce86bc012861ba1 SHA512 297f6571f673e48b0edab519cfdea211f62bd07a8ba0570acb6a68592f468661b9e9bb12ae66710c36893eaf76d36a46fc66cb540cf9680036dc6a33471cfc07
+DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
 EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
-EBUILD ipv6calc-3.1.1.ebuild 1535 BLAKE2B 38a64d668af4ef06e5106513cf29fdfac4407d59e3c8d84dff049fb0227f5084cdc364a3c50b84a38b203e00db4f86f8ee7967848c766dfad0bacad141e07542 SHA512 4f2a5b818e076092d5ecf9a2666887c7ecfd6a7a4a743c41af4f07a93a168cadff86936496070c57ab6f7d44534383e147fa812c057b6bb2a013c5ed9072e2f7
+EBUILD ipv6calc-3.1.1.ebuild 1532 BLAKE2B 94dc5e9c2c3567f8f838e750c5e8ff5bc2deb9f72d6893252a3eca1a29bd647936a23e972979afd28c6888e3e48a203dddac7f21ae2d78713fb59aa23ad9dafc SHA512 4b613ccedda6b597f7bfd226a62a5a5d87efad5213a83940779ba30fac030e792ebf735ebe69867619cfee3804aa616d808f8987242d7cf42bad73eae735e2fc
+EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
 MISC metadata.xml 335 BLAKE2B 80a2b9fa130b3475f0045dc1626eb166078e1f091632013bcb48af829da11ab8f8c6fa61e107ddf1636eac2282493d370eb639669383f7f00e56cbbdb8ce5028 SHA512 a95df3df487415da7ba079eb8de0466bda61770e128761b8d8a9158aac7b22727287d2f35ba7bc6ad00c2e80037892dac6c9e2ce7ad1beec2bc9b2329e14688c
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
deleted file mode 100644
index 86d615e8a1ea..000000000000
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild
deleted file mode 100644
index b7026925c586..000000000000
--- a/net-misc/ipv6calc/ipv6calc-2.1.1.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"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-dbip2 \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
index 80ba906c239b..434e03208517 100644
--- a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
index 69f5be77bbdb..42eca99cbb18 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 DESCRIPTION="IPv6 address calculator"
 HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"