Fix bug #501734

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 78 insertions, 18 deletions

diff --git a/net-misc/ipv6calc/ChangeLog b/net-misc/ipv6calc/ChangeLog
index e055c1ac378d..cd878b294b49 100644
--- a/net-misc/ipv6calc/ChangeLog
+++ b/net-misc/ipv6calc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ipv6calc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.73 2014/02/16 23:15:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.74 2014/02/19 14:44:05 blueness Exp $
+
+  19 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/ipv6calc-0.96.0-fix-link-order.patch, ipv6calc-0.96.0.ebuild:
+  Fix bug #501734
 
 *ipv6calc-0.96.0 (16 Feb 2014)
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index beb01f9d6e13..a095445f0a3a 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ipv6calc-0.96.0-fix-link-order.patch 2222 SHA256 acaba20fbe3f26c7cea8cce93cc3c70d01013d90b30a7a4794087485983650f1 SHA512 8c809d9c428b54fbc16719172a2aec286b6a0064129be87a69f35876d0c0686518a6a97c8b5bf1590d06a1a95eedbe44a94a45171b5c8a96c35745219bf8f016 WHIRLPOOL 6aaf1a6ace125ab40c74fcb89a10767b0fefe5679daa6a8bc3016815fdd192c5b9647041637f9e30bd946872ceba8dfe19b4b2edb0b0f13f5bbfc1a970bf53ac
 DIST ipv6calc-0.93.1.tar.gz 669435 SHA256 31c6473c96f24691b28c33831a0c184e86aa2396afe8c5fbc2e7e14d85043e47 SHA512 480f0a2d078e5a1fcb1138461faa26ee163990dfa63e952e62623e2d814f090e0076777a8f86f5aca523c03d8e014a8531891fc94c85d20126c0802159a7f643 WHIRLPOOL cf99f4e9770ab287c7d2fc9f905c7d1748d4a3b733415b6edcb57ecfa0bd4f5b45d45a2870622540a7206643717d59ec9c865840143aebd5e5b8da03b52d29f6
 DIST ipv6calc-0.94.1.tar.gz 749953 SHA256 3bd73fd92c1d971fadea41b39830975b4a20bbcd26587dfb2835964b33de4040 SHA512 804aaa1a78aacd5c78e0de0642438ab85fe00d6bac36310022653c5f4d6e24c0d4c616133dcc9b0e35a0288f4f477f277376ea9465521702e5b46c098aa0fd16 WHIRLPOOL 481aabebcff8b4591105757c3e583c56f1fd2ae4ebe101cb562691abd0a2aaa55eee6eeaec9145e6caba2c1a5f9a4829af125465ea0836e4000c1a67a13e7691
 DIST ipv6calc-0.95.0.tar.gz 867807 SHA256 be8f25be14ea1fc9814e791c1757fa2a3cc32f82202388d3030604eac84873b0 SHA512 5f564085c62f50f8dcb3f469e24c5267f80fd508a1c2f91bacb91525be9894bfe5cf42515581c1711fc19919c160bb1eacc11ff368d24b1424063536a6494285 WHIRLPOOL 4256c1bd882ebf077587593bb4273185531c06e8edef31d3e0b4a1aecfbed4201f7fc71da38736496751e3879e539bebebae029357a362ff425db59c4e4a7b0c
@@ -8,23 +9,23 @@ DIST ipv6calc-0.96.0.tar.gz 946885 SHA256 9fc17061cb2876d13af6b765ed0e1b21943cfb
 EBUILD ipv6calc-0.93.1.ebuild 1109 SHA256 1398086c770a7e7cf4db4961d6e8291fa82226491ecf2692ab4a4e4e18874dd7 SHA512 2024daf9c2691cdfccea2fabff8ef098ee9633e299c3554f599123b405c3e53fcf7cc5a662cfaea7bbeafa71d7fa616bab4f087c309461e27f6906fefc7d27d2 WHIRLPOOL 5a2a329e0f146604924f10bfc7e79f508068d7ef7beead98005701dfa327c6b512a814cc6450b173006807576269404e33b99ca501537a51777e043e5eeb932c
 EBUILD ipv6calc-0.94.1.ebuild 1314 SHA256 3f0ca958c934cebdbd084447a1fac249896327c9e87b85b0eaa7aa20100d17b5 SHA512 f75eb7d0ae6ccd7d5d08fea738854d4229a354d05b43c2d6cd4328b80bfb3868635078786054473df04f98bf90979d6c6d3245af03df1e74e763ce0e1ac3fea4 WHIRLPOOL 240f9efb7f068b419f17e2528206af0438e96c48437c7cd79d69ec022234c207aa2a71c3502a16b6029f6676d1a7d95f1fa5ac8b5a04cc5f34e994b39c1052a2
 EBUILD ipv6calc-0.95.0.ebuild 1217 SHA256 690ef4d0c5ada38bbde90b06e8f54030b9a10bb3aea7eed4c99a6eccf3377809 SHA512 0ff0a62b88da8b4dd3537c53acb4e10dc93c04bf1a17f7b39ba931c23bb8391816b2e9f24fa2b92ef0dd81e1c1d34ac3d71faa31745467ee5a9a4cc597296b71 WHIRLPOOL 3b43ef712edabb6d7b8e8d1c6bb2e4d519089ad1b7ea43eff3876fae66b8147e46d81f490ff7b96d75b4762a5eb5ef41e880b55bdc867b3f920c36e76ed1d3bb
-EBUILD ipv6calc-0.96.0.ebuild 1294 SHA256 fabe27e3fa7ddd1d97113effd736c0aa9d3a8b72a3e74aeea22e7af670c9fca8 SHA512 be33eec56fa363c1a9d9a50bf48f49a0124524d56eaacacba2a54d62ee43f09b41500f9e318085cc6b792f1a714662e8823b8fa550e607b81a3dbb9243cf69ba WHIRLPOOL e4e56a206411c515df4ddbeade5e624ff71c3078f7a89590555573327428e023c3654eaa55569755251a5d4eb1d7ecb2b2437da9771718acde5d9e33dcfb6bec
-MISC ChangeLog 9023 SHA256 5458001cf17a88aaa5f6230e2cc67f74432240a88e6535ead5a25de7a70c78af SHA512 d56f457fc10778119d41d27474df1aab42ad3285ba63bc2544e5cf48b1d395d4863c5ecb892dc3d1ed66b62e708e42cbb008963c6e6ea4947c77f861ee25e792 WHIRLPOOL 77387e0a4ed017e5f8bcb184f791890921883da387d00603bb1e3ba3661dabff876862b2f5bf66a659b4b9776c7f35db9d9e15fdb236e8c5e0fed61e968465cd
+EBUILD ipv6calc-0.96.0.ebuild 1486 SHA256 221d140d720c4d6c309abeb584c051ef79c0b07561aab5e127285d93a707078d SHA512 80d44c451f2ede30c364436b3538db8f54c4154ce3c1c3de02b242473d7237420809ad802babc7430ebc9a28382b734bb00555ae225cc4a2af79f457545b73cd WHIRLPOOL 7edc33c01a7e4960e2b40ed603bfb572f927d9311fa9e5f65e6590df2087e90fd88dc09d454c30af818fba92f94d8fa4def1d1facccc9010503e9a013c4de283
+MISC ChangeLog 9168 SHA256 596b1cb9d14ba1e1a76b945cf5194ad47422a7788fcef76301f5c722318a10e6 SHA512 8d01a50691fed6f3ab2f94ce1008f423abd4f3502af477ba082cda1510269eb68cd5bdff8229ce09e448a76b78804ef62f57fd0865b6e1103bedf71830cf4963 WHIRLPOOL b090987372d549518136ad38277839c98b19881af33807db5d9fccd2989c467248b873cc435131bf42d77007e700e52ee14a91d47b61b70bf2302a7899c76ee3
 MISC metadata.xml 454 SHA256 bb3a99307b375bb4b27f399fcf80fd2346025520452458edc27545ab1d2c4c0e SHA512 b9ca573cc5766dc490d0a276a649d577681418581970028dc376aaaa244ce32abbfce065717dbe21aa866b62fdffda975b6ddf13d23d6e9d1cd2935d248f827d WHIRLPOOL 710bb8dfc31e72ba1300c5703f82fd18ada13695042224e9d1ded4280ebd81b5f6c4df61ea4405939674ab8767172cbbc35a2991335d7f96c74f2d6b82a8ea3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTAUblAAoJEJOE+m71LUu6/30P/1jSFJxAUtlJ5um2tTIjwimm
-bwM4QhQfPDn4A/q0Tr63EJuXTN27zFrelImdegTmMzEz7fuj+OeYTRMADofhKJVy
-T8e22CEU1XwusZ0an43OHft29t228q9Edg65y0jh61JUneueAPCX9+Kj3KJ5q3zz
-F42RZsdYKrBX1SbTuLu3Bd+sPOpY2Qav4H9CcRZHOydXVipYyj3rdev80GHWeNR3
-NaibX6tA/EVGaU9hZI4yMNXMdUi4C+MDKPhW1CbCuugcL07tD/3QS0PNppFgQWug
-zKPSB4ETrDYiyA0G805yjF2GnuOQzdN0IabMnbfIkzV/10DVRrJ/Ae5FZW6hl38w
-h+NYc8NyoR/YvaIAd1wk36AnDGr6Kq0j4GfmiMgSZ40fN6HMCGJc5h63RnQtqPzv
-2Ud0FqcVpNmzEOqwdabv59Mwr89+n2xOxGu4MPfNMhQWoO9/VNM7xMeZ8OTE514x
-mDvxZLqBvlo4ccXjTogI5ig4OeJblnPNzXSW7crKgA8roaSnEZu7UyeGwno1V3H9
-sb9WKpVesTP7/AMBHBATQ877PIAKafxtyW7rxQoyRwNz7qwXxC+i+/FmoU5yTw7/
-vf6lsXiCHH6kfx2FmxTk5kRu46thosvgi6jQ5GwIgX57I+1Ss3DXqbQ3EF31Fkvd
-JKdaIJvaRBEItR3Z9s2L
-=OCyC
+iQIcBAEBCAAGBQJTBMOUAAoJEJOE+m71LUu6PQUP/0D1ssCsCoFl6rGzvfnCEHUC
+9E7hXDzsDYDR+IjHhQqX6wSiS+9LcbekxzRG79I76GrzVnLk249ASscQK8qS4/vL
+qh5kgt3nEaSKz03FSzdmDGr5WctSKulFSKznHG3jtlW83e1gUJvkbIKxf970M0Vo
+K/MDvAArbcP9Qxt/2poABl7yO9AJO5mpKI0H+zwxuYvFW1QB3SPXGB8c/y7K17nQ
+TsGk+UW2QYqsAUteY1PdKHigP5HWLV06twNDZPrFBTssc09ygXFtRrJ3TYwrTvOe
+TTR1cbDg2acKZfvjcLUStbbvWQ7tgQCU5qWwr/0Y/1Z1EiT5bgWK/k8C9KBtin0E
+vJVatHmI6pte/syf7MwRNbk7wmAuSwfNpzvmnsFWQdiMjSvWUiYLxIusTboFhLXS
+w85/AOzXgqM8fLTDFKXs2y8g2yvz3pw7799kLAsVcZL50UA8RTFSouzhEUJQg2lW
+UBYwaOWwsEyHZqWNmknRM/I6/BI33vO3rT//l5KaMVKQe7E1e48NJHa+jNg+KWCl
+9sFDs28SwDUeHnqb48mOXsXDkx/9ZWwMyOlXyKqw5a+g7v1GVNuAQilbV6CILH1Q
+0IhGJiKSSxHDRs1alOSBA71ny0cU+U59Dj7UP7ONOHd7hjmXvcrngQW915Yvq+eg
+gZD8lNT+SH8ZGRj5gxun
+=6XQ2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch b/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch
new file mode 100644
index 000000000000..b1e48dcf7e3b
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch
@@ -0,0 +1,48 @@
+diff -Naur ipv6calc-0.96.0.orig/ipv6calc/Makefile.in ipv6calc-0.96.0/ipv6calc/Makefile.in
+--- ipv6calc-0.96.0.orig/ipv6calc/Makefile.in	2014-02-03 01:45:20.000000000 -0500
++++ ipv6calc-0.96.0/ipv6calc/Makefile.in	2014-02-19 09:36:48.504688355 -0500
+@@ -16,7 +16,7 @@
+ 
+ INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/
+ 
+-LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@
+ 
+ GETOBJS = @LIBOBJS@
+ 
+diff -Naur ipv6calc-0.96.0.orig/ipv6loganon/Makefile.in ipv6calc-0.96.0/ipv6loganon/Makefile.in
+--- ipv6calc-0.96.0.orig/ipv6loganon/Makefile.in	2014-02-02 14:33:21.000000000 -0500
++++ ipv6calc-0.96.0/ipv6loganon/Makefile.in	2014-02-19 09:37:01.211687339 -0500
+@@ -18,7 +18,7 @@
+ 
+ INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/
+ 
+-LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@
+ 
+ GETOBJS = @LIBOBJS@
+ 
+diff -Naur ipv6calc-0.96.0.orig/ipv6logconv/Makefile.in ipv6calc-0.96.0/ipv6logconv/Makefile.in
+--- ipv6calc-0.96.0.orig/ipv6logconv/Makefile.in	2014-02-02 14:33:21.000000000 -0500
++++ ipv6calc-0.96.0/ipv6logconv/Makefile.in	2014-02-19 09:36:32.225689657 -0500
+@@ -18,7 +18,7 @@
+ 
+ INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/
+ 
+-LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@
+ 
+ GETOBJS = @LIBOBJS@
+ 
+diff -Naur ipv6calc-0.96.0.orig/ipv6logstats/Makefile.in ipv6calc-0.96.0/ipv6logstats/Makefile.in
+--- ipv6calc-0.96.0.orig/ipv6logstats/Makefile.in	2014-02-02 14:33:21.000000000 -0500
++++ ipv6calc-0.96.0/ipv6logstats/Makefile.in	2014-02-19 09:37:15.840686169 -0500
+@@ -18,7 +18,7 @@
+ 
+ INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/
+ 
+-LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@
+ 
+ GETOBJS = @LIBOBJS@
+ 
diff --git a/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild b/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild
index 8f749c5d5ccc..7e713eda1758 100644
--- a/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild,v 1.1 2014/02/16 23:15:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.96.0.ebuild,v 1.2 2014/02/19 14:44:05 blueness Exp $
 
 EAPI="5"
-inherit fixheadtails
+inherit fixheadtails eutils
 
 DESCRIPTION="IPv6 address calculator"
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	ht_fix_file configure
+	epatch "${FILESDIR}"/${P}-fix-link-order.patch
 }
 
 src_configure() {
@@ -36,6 +37,12 @@ src_configure() {
 	econf \
 		--disable-bundled-getopt \
 		--disable-bundled-md5 \
+		--disable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--disable-db-ipv6 \
+		--disable-ip2location \
 		${myconf}
 }