Add latest ogdi we should stabilise.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

4 files changed, 115 insertions, 1 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 82cdd3d349fb..73cdb58d487e 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ogdi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.27 2011/06/17 10:23:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.28 2011/06/17 10:54:43 scarabeus Exp $
+
+*ogdi-3.2.0_beta2 (17 Jun 2011)
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +ogdi-3.2.0_beta2.ebuild, +files/ogdi-3.2.0_beta2-endianess.patch,
+  +files/ogdi-3.2.0_beta2-subdirs.patch:
+  Add latest ogdi we should stabilise.
 
   17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> ogdi-3.1.6.ebuild:
   Move to eapi4.
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
new file mode 100644
index 000000000000..75c85fbb29b5
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
@@ -0,0 +1,18 @@
+diff -urNad ogdi-dfsg~/vpflib/include/machine.h ogdi-dfsg/vpflib/include/machine.h
+--- ogdi-dfsg~/vpflib/include/machine.h	2007-03-27 17:35:24.000000000 +0200
++++ ogdi-dfsg/vpflib/include/machine.h	2007-03-27 17:41:16.000000000 +0200
+@@ -15,10 +15,11 @@
+     long            output;
+ } xBYTE_ORDER;
+ 
+-#if SYS_BIG_ENDIAN == 1
+-#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+-#else
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define MACHINE_BYTE_ORDER LEAST_SIGNIFICANT
++#elif __BYTE_ORDER == __BIG_ENDIAN
++#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+ #endif
+ 
+ #ifdef _WINDOWS
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
new file mode 100644
index 000000000000..c98390c440de
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
@@ -0,0 +1,24 @@
+diff -urN ogdi-3.2.0.beta2.old/makefile ogdi-3.2.0.beta2/makefile
+--- ogdi-3.2.0.beta2.old/makefile	2011-06-17 12:45:53.171219473 +0200
++++ ogdi-3.2.0.beta2/makefile	2011-06-17 12:46:34.013708870 +0200
+@@ -17,7 +17,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= external vpflib ogdi contrib
++subdirs	= vpflib ogdi contrib
+ 
+ ifneq ($(PROJ_SETTING),external)
+ subdirs := proj $(subdirs) 
+diff -urN ogdi-3.2.0.beta2.old/ogdi/makefile ogdi-3.2.0.beta2/ogdi/makefile
+--- ogdi-3.2.0.beta2.old/ogdi/makefile	2011-06-17 12:45:53.174219434 +0200
++++ ogdi-3.2.0.beta2/ogdi/makefile	2011-06-17 12:47:38.814898744 +0200
+@@ -15,7 +15,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= include c-api glutil attr_driver datum_driver driver gltpd examples
++subdirs	= include c-api glutil attr_driver datum_driver driver gltpd
+ 
+ #
+ # Default target to build everything in all sub-directories
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
new file mode 100644
index 000000000000..3b9eda5aae0f
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.1 2011/06/17 10:54:43 scarabeus Exp $
+
+EAPI=4
+
+MY_P=${P/_/.}
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net"
+SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/expat
+	sci-libs/proj
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm -rf external
+	epatch \
+		"${FILESDIR}"/${P}-subdirs.patch \
+		"${FILESDIR}"/${P}-endianess.patch \
+		"${FILESDIR}"/${PN}-3.1.6-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)"
+}
+
+src_install() {
+	mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
+	dobin "${S}"/bin/${TARGET}/*
+	insinto /usr/include
+	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
+	dolib.so lib/${TARGET}/lib*
+	use static-libs && dolib.a lib/${TARGET}/static/*.a
+#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
+	dodoc ChangeLog NEWS README
+}