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

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-openvz.git-89451f9 i686)

5 files changed, 29 insertions, 57 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/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() {