Fixed build issue without geoip, bug #252811, thank Mike Auty for report.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-openvz.git-89451f9 i686

6 files changed, 32 insertions, 63 deletions

diff --git a/net-misc/ipv6calc/ChangeLog b/net-misc/ipv6calc/ChangeLog
index 271d121d9321..90a105573f49 100644
--- a/net-misc/ipv6calc/ChangeLog
+++ b/net-misc/ipv6calc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ipv6calc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.20 2008/12/25 13:48:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.21 2008/12/28 20:30:14 pva Exp $
+
+  28 Dec 2008; Peter Volkov <pva@gentoo.org>
+  +files/ipv6calc-0.72.0-optional-geoip.patch, -ipv6calc-0.45.ebuild,
+  -ipv6calc-0.50.ebuild, ipv6calc-0.72.0.ebuild:
+  Fixed build issue without geoip, bug #252811, thank Mike Auty for report.
 
 *ipv6calc-0.72.0 (25 Dec 2008)
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 17665955f857..3f8e18fb480b 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,10 +1,7 @@
-DIST ipv6calc-0.45.tar.gz 297967 RMD160 8df61f7815dff365cfafa88b43d11845393e61de SHA1 0215a7e19246bde252c30ab715b0e1a8c419769a SHA256 726f9d73a75ba5b8114754f5feedfe6de4aab3c14dae317450fdacb5742d5462
-DIST ipv6calc-0.50.tar.gz 503695 RMD160 9e62afae35d26ae2ed6f398623cd3bf7e62479ed SHA1 06610ce8d02ae82388ead4af644d1be85d4aa689 SHA256 d4d65f5b345c378242ad8947fc1f6dcba0f44f601cee1bc725b662a7bf039605
+AUX ipv6calc-0.72.0-optional-geoip.patch 430 RMD160 e84bbabe6a6571c475f2bfa7d6dd0389d13d989e SHA1 a21dc9c2cb3d6ade08c1ee81ec2fc9fe7a03f0c7 SHA256 0e4b8c7dd9b63455ff507b990eb2715fc9f93b3c7ee94797e8175541cd2afe1d
 DIST ipv6calc-0.51.tar.gz 410846 RMD160 40d1b6a889f02064db3355876ff0c300b057739d SHA1 e15eb6907a4320cc1bfebee0068092c38792b910 SHA256 c15a971d5452de29cd2e4b9f26efa276814a673b05a66cd0f2631ff1cb0dcffc
 DIST ipv6calc-0.72.0.tar.gz 541374 RMD160 5ea679dc803b6745fea56694efe0e801a4e51f2e SHA1 5ed71aa99b0676438e729545d8fff5b6787d5287 SHA256 aaa002445773e4fb898a7edf270968233c223136a6ec586c96dadc44b8f630f0
-EBUILD ipv6calc-0.45.ebuild 720 RMD160 128992733cf952075eef44d99e8268815e1eab42 SHA1 bec55e6b36a65f8263337eb7a88ca431c8539ec2 SHA256 34c3c3a24c7b92d535ce069a4a63ead9e82d1a20df7cf06616d798c0bec7c5fb
-EBUILD ipv6calc-0.50.ebuild 746 RMD160 96ae6ec2b770d50616dd92705f46e2e72f7aec9c SHA1 b68bf91c73a77c134bb47af24708a239a96df8a3 SHA256 fa3c4f4f0207618718d7efc89bd82ce877d1f4fd525fd490accf1368819a4429
 EBUILD ipv6calc-0.51.ebuild 760 RMD160 6572764cf6664389c98565f5fdbca2b12a902f7f SHA1 61bf2db3cf798b426019c39a0a48f0dc5a0de660 SHA256 9079a1f4c249f009ec7c7be62422abf0a6ab90d071afe76a516335ec6ecf2009
-EBUILD ipv6calc-0.72.0.ebuild 1082 RMD160 917525150af2c8edb597a8aa13840e35b2ba2fa8 SHA1 92518f247699509772ef1881d4ac65c9690ceba5 SHA256 91bd1889b255f0b29078bf4d14f72dd426c2e4766aac775e18437fa6eebf82bb
-MISC ChangeLog 2197 RMD160 d9b489a59f445775fd4ffd71854ab90cd98f4e49 SHA1 faa93726adfd8ca84c42d577f8143193666cb37b SHA256 f1c9d0f1477a4b8ff6c7978745a4d89044372cc703b9269614ec4c05fa7fb7d8
+EBUILD ipv6calc-0.72.0.ebuild 1164 RMD160 4c98f617b1a05172279290ac8ea02700b52c69b2 SHA1 e1ed3a481494aa81ff7dc425709bb99a799330e4 SHA256 f00261f76878b24e49deafe4bc72eec55aba99e88fad42e2147e4c245c68c7b3
+MISC ChangeLog 2438 RMD160 5a1cc584620adc67054cf3af187c4a0e4f16b11d SHA1 af17957dc4445f9f63fd11ad3b4955cca8744f16 SHA256 6937029957c6862ca592516fd5a77f44dfcd3d90826c70b53c2b0eee9e151499
 MISC metadata.xml 220 RMD160 b56624799a61e159911dce9d7b7adc46b17f449b SHA1 ce4ddc50f8cb7b13c46292c4ef26cae62db260f3 SHA256 ef0ce175ca65c3d5fa9446b025ec37773fea8b40a0de2720beac7b254d1abef1
diff --git a/net-misc/ipv6calc/files/ipv6calc-0.72.0-optional-geoip.patch b/net-misc/ipv6calc/files/ipv6calc-0.72.0-optional-geoip.patch
new file mode 100644
index 000000000000..b7cf5384c330
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-0.72.0-optional-geoip.patch
@@ -0,0 +1,17 @@
+=== modified file 'configure.in'
+--- configure.in	2008-11-21 18:47:07 +0000
++++ configure.in	2008-12-28 19:57:19 +0000
+@@ -88,8 +88,10 @@
+ 	AS_HELP_STRING([--enable-geoip],
+ 	               [Enable GeoIP support (default: disabled)]),
+     [
+-        GEOIP="$enableval"
+-        GEOIP_LIB="-lGeoIP"
++	if test "$enableval" != "no"; then
++        	GEOIP="$enableval"
++        	GEOIP_LIB="-lGeoIP"
++	fi
+     ],
+     [GEOIP="no"])
+ 
+
diff --git a/net-misc/ipv6calc/ipv6calc-0.45.ebuild b/net-misc/ipv6calc/ipv6calc-0.45.ebuild
deleted file mode 100644
index e2a6068d88ab..000000000000
--- a/net-misc/ipv6calc/ipv6calc-0.45.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.45.ebuild,v 1.11 2005/07/30 18:04:37 swegener Exp $
-
-IUSE=""
-DESCRIPTION="ipv6calc convert a given IPv6 address to the compressed format or to the format used by /proc/net/if_inet6."
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-KEYWORDS="x86 ppc"
-SRC_URI="ftp://ftp.deepspace6.net/pub/sources/ipv6calc/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_install () {
-	# Using installonly to skip the tests scripts which are really broken
-	make root=${D} installonly || die
-	dodoc ChangeLog README TODO CREDITS LICENSE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-0.50.ebuild b/net-misc/ipv6calc/ipv6calc-0.50.ebuild
deleted file mode 100644
index 8b66d24630a9..000000000000
--- a/net-misc/ipv6calc/ipv6calc-0.50.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.50.ebuild,v 1.4 2006/06/25 13:20:23 dertobi123 Exp $
-
-inherit fixheadtails
-
-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="ppc x86"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	ht_fix_file ${S}/configure
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make root="${D}" install || die "make install failed"
-
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild b/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild
index 729b23d7d68b..694a63624c60 100644
--- a/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild,v 1.1 2008/12/25 13:48:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.72.0.ebuild,v 1.2 2008/12/28 20:30:14 pva Exp $
 
-inherit fixheadtails toolchain-funcs
+inherit eutils fixheadtails toolchain-funcs autotools
 
 DESCRIPTION="IPv6 address calculator"
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
@@ -17,13 +17,16 @@ DEPEND="geoip? ( >=dev-libs/geoip-1.4.1 )"
 
 src_unpack() {
 	unpack ${A}
-	ht_fix_file "${S}/configure"
+	cd "${S}"
 	find \( -name Makefile.in -o -name Makefile \) -exec \
 		sed -e "s:\(^CC[[:space:]]=\).*:\1 $(tc-getCC):" \
 			-e "s:\(^LDFLAGS[[:space:]]=.*\)$:\1 ${LDFLAGS}:" \
 			-e "/^CFLAGS/{s:-I\$(GETOPT_DIR)::}" \
 			-e "s:\(^CFLAGS[[:space:]]=.*\):\1 ${CFLAGS}:" \
 				-i '{}' \;
+	epatch "${FILESDIR}/${P}-optional-geoip.patch"
+	eautoreconf
+	ht_fix_file configure
 }
 
 src_compile() {