fixed sparc install issues (sandbox violations)

Package-Manager: portage-2.0.51.22-r2

5 files changed, 43 insertions, 19 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 49ea94433c82..0af8ae0d99a6 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2005/07/23 02:20:14 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.12 2005/07/30 22:11:12 nerdboy Exp $
+
+  30 Jul 2005; Steve Arnold <nerdboy@gentoo.org> ogdi-3.1.1-r1.ebuild,
+  ogdi-3.1.4-r1.ebuild, ogdi-3.1.5.ebuild:
+  fixed sparc install issues (sandbox violations) so it should work
+  correctly on other arches (in theory).  This is a mostly stealth update,
+  since it won't help people for whom it already worked...
 
 *ogdi-3.1.5 (23 Jul 2005)
 *ogdi-3.1.1-r1 (23 Jul 2005)
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 4703dec4f295..da84c5e61112 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,8 +1,8 @@
-MD5 caab0f145df49ed7154880ffac49a7b9 ChangeLog 2148
+MD5 0e8383be9cf5bdba1db59f615d5bf092 ChangeLog 2465
 MD5 3cd06cd3d8efbe532cd128301ca23678 metadata.xml 219
-MD5 d77921b50f401ab791420e7de59784dd ogdi-3.1.4-r1.ebuild 949
-MD5 0ce6a9bd1b72697ccc5326c28efd2829 ogdi-3.1.1-r1.ebuild 946
-MD5 e703123fd229596664df855bc4faa3b9 ogdi-3.1.5.ebuild 946
+MD5 3aa9258a795cb85642ac16549c8114c4 ogdi-3.1.4-r1.ebuild 1127
+MD5 e0eb462c28b33071556846a4ada0bfc6 ogdi-3.1.1-r1.ebuild 1126
+MD5 ad2790850aada6ff3c9a07c463bf921f ogdi-3.1.5.ebuild 1125
 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/ogdi-3.1.1-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
index 13a8e495020c..6ab336e6f036 100644
--- a/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
@@ -1,8 +1,10 @@
 # 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-r1.ebuild,v 1.1 2005/07/23 02:20:14 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
 
-DESCRIPTION="open geographical datastore interface"
+inherit toolchain-funcs
+
+DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
 HOMEPAGE="http://ogdi.sourceforge.net"
 SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
 
@@ -27,7 +29,11 @@ src_compile() {
 }
 
 src_install() {
-	einstall TARGET=`uname` TOPDIR="${S}" \
-		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
+	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 /usr/lib/libogdi31.so /usr/lib/libogdi.so
 	dodoc ChangeLog LICENSE NEWS README VERSION
 }
diff --git a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
index 13bc3de22fb5..0e831a6f7f1d 100644
--- a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
@@ -1,14 +1,16 @@
 # 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.1 2005/07/21 04:03:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
 
-DESCRIPTION="open geographical datastore interface"
+inherit toolchain-funcs
+
+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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sci-libs/proj
@@ -27,7 +29,11 @@ src_compile() {
 }
 
 src_install() {
-	einstall TARGET=`uname` TOPDIR="${S}" \
-		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
+	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 /usr/lib/libogdi31.so /usr/lib/libogdi.so
 	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
index 9e51a3eca96b..4447c3d160db 100644
--- a/sci-libs/ogdi/ogdi-3.1.5.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.5.ebuild
@@ -1,14 +1,16 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
 
-DESCRIPTION="open geographical datastore interface"
+inherit toolchain-funcs
+
+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"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="sci-libs/proj
@@ -27,7 +29,11 @@ src_compile() {
 }
 
 src_install() {
-	einstall TARGET=`uname` TOPDIR="${S}" \
-		 LD_LIBRARY_PATH="${TOPDIR}/bin/${TARGET}" || die "einstall failed"
+	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 /usr/lib/libogdi31.so /usr/lib/libogdi.so
 	dodoc ChangeLog LICENSE NEWS README VERSION
 }