bumped 3.1.1 to x86 and added cleaned-up 3.1.4 to ~ (needed by gdal)

6 files changed, 67 insertions, 10 deletions

diff --git a/dev-libs/ogdi/ChangeLog b/dev-libs/ogdi/ChangeLog
index 8d2a05ce481c..8fe0f72fad35 100644
--- a/dev-libs/ogdi/ChangeLog
+++ b/dev-libs/ogdi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/ogdi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ogdi/ChangeLog,v 1.4 2004/06/24 23:29:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ogdi/ChangeLog,v 1.5 2004/12/19 03:06:31 nerdboy Exp $
+
+*ogdi-3.1.4 (18 Dec 2004)
+
+  18 Dec 2004; Steve Arnold <nerdboy@gentoo.org> +metadata.xml,
+  ogdi-3.1.1.ebuild, +ogdi-3.1.4.ebuild:
+  bumped 3.1.1 to x86 and added cleaned-up 3.1.4 to ~
 
 *ogdi-3.1.1 (04 Jan 2003)
 
diff --git a/dev-libs/ogdi/Manifest b/dev-libs/ogdi/Manifest
index 852226cb9fcc..8779ff8120ff 100644
--- a/dev-libs/ogdi/Manifest
+++ b/dev-libs/ogdi/Manifest
@@ -1,3 +1,6 @@
-MD5 a7167251bae1384ae16e3f931358ac77 ogdi-3.1.1.ebuild 1225
-MD5 04eb887c1f68b9c1ef4a6b23d6b2b841 ChangeLog 470
+MD5 1de741d7b9348abfc1166c98a68698a6 ChangeLog 656
+MD5 88be63d6805b02d0515cd6e2416285d8 ogdi-3.1.1.ebuild 1295
+MD5 517e69bdb75f2ef673630032f58beeac ogdi-3.1.4.ebuild 1111
+MD5 fcb4229d5eb6d3026c97d2836dfd4f76 metadata.xml 224
 MD5 59e695f13d9d346bdd13a22bde58a3a6 files/digest-ogdi-3.1.1 62
+MD5 e328cdec7e54dc60be77116181727d5a files/digest-ogdi-3.1.4 62
diff --git a/dev-libs/ogdi/files/digest-ogdi-3.1.4 b/dev-libs/ogdi/files/digest-ogdi-3.1.4
new file mode 100644
index 000000000000..d587554ee978
--- /dev/null
+++ b/dev-libs/ogdi/files/digest-ogdi-3.1.4
@@ -0,0 +1 @@
+MD5 d54a5dcce211e37b8ba317531312ff55 ogdi-3.1.4.tar.gz 912849
diff --git a/dev-libs/ogdi/metadata.xml b/dev-libs/ogdi/metadata.xml
new file mode 100644
index 000000000000..2c39e1b98a79
--- /dev/null
+++ b/dev-libs/ogdi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-herd</herd>
+<maintainer>
+  <email>nerdboy@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/ogdi/ogdi-3.1.1.ebuild b/dev-libs/ogdi/ogdi-3.1.1.ebuild
index 182147731d63..e8f971a5e77d 100644
--- a/dev-libs/ogdi/ogdi-3.1.1.ebuild
+++ b/dev-libs/ogdi/ogdi-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ogdi/ogdi-3.1.1.ebuild,v 1.6 2004/07/14 15:02:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ogdi/ogdi-3.1.1.ebuild,v 1.7 2004/12/19 03:06:31 nerdboy Exp $
 
 DESCRIPTION="open geographical datastore interface"
 HOMEPAGE="http://ogdi.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ~hppa ~alpha ~amd64 ~ppc ~ppc64"
 IUSE=""
 
 DEPEND="dev-libs/proj
@@ -35,16 +35,16 @@ src_compile() {
 		--with-expat \
 		--with-expatlib=/usr/lib \
 		--with-expatinc=/usr/include || die "./configure failed"
-	make || die
+	make || die "make failed"
 }
 
 src_install() {
 	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
+		prefix=${D}usr \
+		mandir=${D}usr/share/man \
+		infodir=${D}usr/share/info \
 		TOPDIR="${S}" TARGET="linux" LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" \
-		install || die
+		install || die "make install failed"
 
 	dodoc ChangeLog LICENSE NEWS README VERSION
 }
diff --git a/dev-libs/ogdi/ogdi-3.1.4.ebuild b/dev-libs/ogdi/ogdi-3.1.4.ebuild
new file mode 100644
index 000000000000..0b7b9ea9e254
--- /dev/null
+++ b/dev-libs/ogdi/ogdi-3.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ogdi/ogdi-3.1.4.ebuild,v 1.1 2004/12/19 03:06:31 nerdboy Exp $
+
+DESCRIPTION="open geographical datastore interface"
+HOMEPAGE="http://ogdi.sourceforge.net"
+SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64 ~ppc ~ppc64"
+IUSE=""
+
+DEPEND="dev-libs/proj
+	sys-libs/zlib
+	dev-libs/expat"
+
+src_compile() {
+	export TOPDIR="${S}"
+	export TARGET="linux"
+	export CFG="release"
+	export LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}"
+
+	econf --with-proj --with-zlib --with-expat || die "econf failed"
+	make || die "make failed"
+}
+
+src_install() {
+	#make \
+	#	prefix=${D}usr \
+	#	mandir=${D}usr/share/man \
+	#	infodir=${D}usr/share/info \
+	#	TOPDIR="${S}" TARGET="linux" LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" \
+	#	install || die "make install failed"
+
+	einstall TOPDIR="${S}" TARGET="linux" \
+		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
+	dodoc ChangeLog LICENSE NEWS README VERSION
+}