replaced borked versions with -r1's and added new version

(Portage version: 2.0.51.22-r1)

8 files changed, 55 insertions, 70 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 80bdf335c41f..49ea94433c82 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/ogdi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.10 2005/07/21 04:03:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.11 2005/07/23 02:20:14 nerdboy Exp $
+
+*ogdi-3.1.5 (23 Jul 2005)
+*ogdi-3.1.1-r1 (23 Jul 2005)
+
+  23 Jul 2005; Steve Arnold <nerdboy@gentoo.org> -ogdi-3.1.1.ebuild,
+  +ogdi-3.1.1-r1.ebuild, -ogdi-3.1.4.ebuild, +ogdi-3.1.5.ebuild:
+  replaced borked versions with -r1's and added new version (sorry,
+  I couldn't commit the one below until I fixed a couple deps first)
 
 *ogdi-3.1.4-r1 (21 Jul 2005)
 
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index c23aa64c4bf7..3dd86eebf355 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,8 +1,8 @@
-MD5 86b68ebda120ee52433e6822458c8a6c ChangeLog 1820
+MD5 2c9eba052c8494b51f92484416e8eb64 ChangeLog 2148
 MD5 3cd06cd3d8efbe532cd128301ca23678 metadata.xml 219
-MD5 e91a0bb37210e9b3f94852251dc0d8b5 ogdi-3.1.1.ebuild 1293
-MD5 ee07060e76e4c9b834bd499530a306d4 ogdi-3.1.4.ebuild 1111
 MD5 d77921b50f401ab791420e7de59784dd ogdi-3.1.4-r1.ebuild 949
-MD5 59e695f13d9d346bdd13a22bde58a3a6 files/digest-ogdi-3.1.1 62
-MD5 e328cdec7e54dc60be77116181727d5a files/digest-ogdi-3.1.4 62
+MD5 0a3b7b4d91dcc80011a6accae6084ffc ogdi-3.1.1-r1.ebuild 946
+MD5 d77921b50f401ab791420e7de59784dd ogdi-3.1.5.ebuild 949
+MD5 59e695f13d9d346bdd13a22bde58a3a6 files/digest-ogdi-3.1.1-r1 62
+MD5 74a3ce4489f2fb78319ceeb5689e459c files/digest-ogdi-3.1.5 62
 MD5 e328cdec7e54dc60be77116181727d5a files/digest-ogdi-3.1.4-r1 62
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.1 b/sci-libs/ogdi/files/digest-ogdi-3.1.1-r1
index 1b16d04c56ad..1b16d04c56ad 100644
--- a/sci-libs/ogdi/files/digest-ogdi-3.1.1
+++ b/sci-libs/ogdi/files/digest-ogdi-3.1.1-r1
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.4 b/sci-libs/ogdi/files/digest-ogdi-3.1.4
deleted file mode 100644
index d587554ee978..000000000000
--- a/sci-libs/ogdi/files/digest-ogdi-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d54a5dcce211e37b8ba317531312ff55 ogdi-3.1.4.tar.gz 912849
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.5 b/sci-libs/ogdi/files/digest-ogdi-3.1.5
new file mode 100644
index 000000000000..b2bb76f1964a
--- /dev/null
+++ b/sci-libs/ogdi/files/digest-ogdi-3.1.5
@@ -0,0 +1 @@
+MD5 9ccf8202b63875a68ded23588bd49544 ogdi-3.1.5.tar.gz 913902
diff --git a/sci-libs/ogdi/ogdi-3.1.4.ebuild b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
index b65f663ac1ac..13a8e495020c 100644
--- a/sci-libs/ogdi/ogdi-3.1.4.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2005/07/11 19:15:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild,v 1.1 2005/07/23 02:20:14 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="~alpha ~amd64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sci-libs/proj
@@ -17,23 +17,17 @@ DEPEND="sci-libs/proj
 
 src_compile() {
 	export TOPDIR="${S}"
-	export TARGET="linux"
+	export TARGET=`uname`
 	export CFG="release"
-	export LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
 
-	econf --with-proj --with-zlib --with-expat || die "econf failed"
+	econf --with-proj=/usr --with-projlib="-L/usr/lib -lproj" \
+	    --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" \
+	einstall TARGET=`uname` TOPDIR="${S}" \
 		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
 	dodoc ChangeLog LICENSE NEWS README VERSION
 }
diff --git a/sci-libs/ogdi/ogdi-3.1.1.ebuild b/sci-libs/ogdi/ogdi-3.1.1.ebuild
deleted file mode 100644
index a6d8eab93847..000000000000
--- a/sci-libs/ogdi/ogdi-3.1.1.ebuild
+++ /dev/null
@@ -1,50 +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.1.ebuild,v 1.4 2005/07/10 20:27:26 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="sci-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}"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-proj \
-		--with-projlib=/usr/lib \
-		--with-projinc=/usr/include \
-		--with-zlib \
-		--with-zliblib=/usr/lib \
-		--with-zlibinc=/usr/include \
-		--with-expat \
-		--with-expatlib=/usr/lib \
-		--with-expatinc=/usr/include || die "./configure 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"
-
-	dodoc ChangeLog LICENSE NEWS README VERSION
-}
diff --git a/sci-libs/ogdi/ogdi-3.1.5.ebuild b/sci-libs/ogdi/ogdi-3.1.5.ebuild
new file mode 100644
index 000000000000..9e51a3eca96b
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.1.5.ebuild
@@ -0,0 +1,33 @@
+# 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.5.ebuild,v 1.1 2005/07/23 02:20:14 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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sci-libs/proj
+	sys-libs/zlib
+	dev-libs/expat"
+
+src_compile() {
+	export TOPDIR="${S}"
+	export TARGET=`uname`
+	export CFG="release"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
+
+	econf --with-proj=/usr --with-projlib="-L/usr/lib -lproj" \
+	    --with-zlib --with-expat || die "econf failed"
+	make || die "make failed"
+}
+
+src_install() {
+	einstall TARGET=`uname` TOPDIR="${S}" \
+		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
+	dodoc ChangeLog LICENSE NEWS README VERSION
+}