gentoo resync : 22.10.2018

3 files changed, 70 insertions, 3 deletions

diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index e12377fb420c..5f4541dda61a 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,7 +1,9 @@
 DIST ipv6calc-0.97.4.tar.gz 1037582 BLAKE2B b01929321c94169631c865ddf00067a85d0df8083f2d675b6fea6d4d780400d654cc802a94ff8c723f2e5f4f0d970e82338d5e9fc4bf4c1572b304fa017ec4db SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde
 DIST ipv6calc-0.99.2.tar.gz 1287951 BLAKE2B 14de353f5883e1aa538c9fd1b66dbc9d9b485192a7cd7853f4b8a00a31b1b798cee33edb4263a9c5acd8b6dd42b26cbce35e0f072e7b92a7c40f1222bba27075 SHA512 f757a4a7d69b5dea34051125b96b9f9f36957bfabb1568ddae2aaefe6551aac7b9edb6abfdb3ac90aeaf32e517720157614cb7552b4e9dc18180904674e48f09
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
+DIST ipv6calc-1.1.0.tar.gz 1396498 BLAKE2B 67b95057ea75f7c26ab1f9fc8b8e869ef027594e71800c4f8f1c442f34bce31340f1e7160d4f48033b8bc080738051418be48e3913ccd62594256ab64eaef919 SHA512 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101
 EBUILD ipv6calc-0.97.4.ebuild 1261 BLAKE2B 685a6981839b68a33c680812c5d4307a5d41ac580db6d08394134b000f9b0045eaadaf85491a6fecd4ee91b5540ab155354d3feeb0bb30271bc1671986fe118a SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb
 EBUILD ipv6calc-0.99.2.ebuild 1509 BLAKE2B 9f5bfc6e3dea8ec9d1659a44b8e646f7fa41278db028d99c3451a201dbbd51d24d27117ecdd1a41cc1d16603a39115db093736cafe399eceef90593ddcb41135 SHA512 b0a1cd648acece998390e55d6ee38659f0352d1f82599e17c2761c9f384079c2eec4e371673f1566cb1d4baf61a97f3b0857f79f0c4ca6980b402c33ebcf0756
-EBUILD ipv6calc-1.0.0.ebuild 1514 BLAKE2B 56d45b5ee76725139cfd0f32038c59b37cc837d1b4108d54bd8de7bcaa0064a1f2ac74591c79e86b60664ee8cea2b3fe09c85f12a0b3572ecb2892b50657493e SHA512 618f534e7feb55ea0ec9c92c4a159b187c363797c5e6fa3be2045ae1d26d930529dea2c505c329d1d8de6cb4569489e5d83ad03d70bd79151de042134fac1c4c
+EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
+EBUILD ipv6calc-1.1.0.ebuild 1514 BLAKE2B 1b520e08975817482c85dccf0ba9ff118a2f976dae4c83ee35f155277862969562ca8c880ef4d215ed92c9fc2f304d42d5f68b070f24a585c617c47e742d60d1 SHA512 34ce1a7e1ceecac75e0758078a72a7b9e319b2050eebc0b2f56497436744b1e7e9c74e44b36ec2457ef8658ff20aab560302a7c4037c9bff5d6e263a62209227
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
index 6ea0a78da694..b0e61d909d24 100644
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 
 RDEPEND="
diff --git a/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
new file mode 100644
index 000000000000..f16ce08a7706
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-1.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	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
+}