Version Bump, hopefully fixing bug 264724

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 121 insertions, 46 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index a9f2731722a0..874eddf20b66 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ogdi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.25 2010/01/01 17:42:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.26 2010/06/24 14:46:47 jlec Exp $
+
+*ogdi-3.1.6 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> -ogdi-3.1.4-r1.ebuild,
+  +ogdi-3.1.6.ebuild, +files/ogdi-3.1.6-fpic.patch,
+  +files/ogdi-3.1.6-unbundle-libs.patch:
+  Version Bump, hopefully fixing bug 264724
 
   01 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   ogdi-3.1.5-r1.ebuild:
diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
new file mode 100644
index 000000000000..f6fbc85e5ae9
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
@@ -0,0 +1,38 @@
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 1cb74f5..2e9cabe 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -35,16 +35,16 @@ AR		= ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS	= @C_PIC@
+-COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
++COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
+ 
+-SHLIB_LDFLAGS	= -shared 
+-COMMON_LDFLAGS  = $(OPTIMIZATION) 
++SHLIB_LDFLAGS	= -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR)
++COMMON_LDFLAGS  = $(OPTIMIZATION) $(LDFLAGS)
+ 
+ RPC_INCLUDES = @RPC_INCLUDES@
+ 
+ UCB_STATICLIB = 
+ 
+-TCL_INCLUDE = -I/usr/include/tcl8.3
++TCL_INCLUDE = -I${prefix}/include
+ TCL_LINKLIB =
+ 
+ #
+diff --git a/config/unix.mak b/config/unix.mak
+index e3af578..927b0fc 100644
+--- a/config/unix.mak
++++ b/config/unix.mak
+@@ -55,7 +55,7 @@ LINK_SW		= -L
+ ifeq ($(CFG),debug)
+ OPTIMIZATION	= -g
+ else
+-OPTIMIZATION	= -O
++OPTIMIZATION	= 
+ endif
+ 
+ #
diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch
new file mode 100644
index 000000000000..df96ddfeda76
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 8c62a03..3ecb0f0 100644
+--- a/makefile
++++ b/makefile
+@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= external vpflib ogdi contrib
++subdirs	= vpflib ogdi contrib
+ 
+ ifneq ($(PROJ_SETTING),external)
+ subdirs := proj $(subdirs) 
diff --git a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
deleted file mode 100644
index 6fd97ca32a35..000000000000
--- a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild,v 1.6 2005/11/01 07:41:27 nerdboy Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
-SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="sci-libs/proj
-	sys-libs/zlib
-	dev-libs/expat"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fpic.patch
-}
-
-src_compile() {
-	export TOPDIR="${S}"
-	export TARGET=`uname`
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
-	    --with-zlib --with-expat || die "econf failed"
-	make || die "make failed"
-}
-
-src_install() {
-	mv ${S}/bin/Linux/*.so ${S}/lib/Linux/. || die "lib move failed"
-	dobin ${S}/bin/Linux/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/Linux/*.so
-	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
-	dodoc ChangeLog LICENSE NEWS README VERSION
-}
diff --git a/sci-libs/ogdi/ogdi-3.1.6.ebuild b/sci-libs/ogdi/ogdi-3.1.6.ebuild
new file mode 100644
index 000000000000..1e6a1b3bc3a7
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.1.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.6.ebuild,v 1.1 2010/06/24 14:46:47 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net"
+SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	sci-libs/proj
+	sys-libs/zlib
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -rf external
+	epatch ${FILESDIR}/${P}-unbundle-libs.patch
+	epatch ${FILESDIR}/${P}-fpic.patch
+	sed 's:O2:O9:g' -i configure || die
+}
+
+src_configure() {
+	export TOPDIR="${S}"
+	export TARGET=`uname`
+	export CFG="release"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
+
+	econf \
+		--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
+		--with-zlib --with-expat
+}
+
+src_compile() {
+	# bug #299239
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		SHLIB_LD="$(tc-getCC)" \
+		|| die "make failed"
+}
+
+src_install() {
+	mv ${S}/bin/${TARGET}/*.so* ${S}/lib/Linux/. || die "lib move failed"
+	dobin ${S}/bin/${TARGET}/*  || die
+	insinto /usr/include
+	doins ogdi/include/ecs.h ogdi/include/ecs_util.h || die
+	dolib.so lib/${TARGET}/lib* || die
+	if use static-libs; then
+		dolib.a lib/${TARGET}/static/*.a || die
+	fi
+#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
+	dodoc ChangeLog NEWS README || die
+}