bumped original 4.4.7 to x86, added -r1 ebuild with extra datum shift grids

7 files changed, 112 insertions, 6 deletions

diff --git a/dev-libs/proj/ChangeLog b/dev-libs/proj/ChangeLog
index 578afcce99d2..24aa3f9fe852 100644
--- a/dev-libs/proj/ChangeLog
+++ b/dev-libs/proj/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/proj
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/ChangeLog,v 1.4 2003/08/30 11:24:29 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/ChangeLog,v 1.5 2003/11/06 06:07:49 nerdboy Exp $
+
+*proj-4.4.7 (05 Nov 2003)
+
+  05 Nov 2003; <sarnold@gentoo.org> proj-4.4.7.ebuild:
+  bumped original 4.4.7 ebuild to x86
+
+*proj-4.4.7-r1 (05 Nov 2003)
+
+  05 Nov 2003; <nerdboy@gentoo.org> proj-4.4.7-r1.ebuild:
+  added additional grids and test scripts, metadata.xml file
 
 *proj-4.4.7.ebuild (30 Aug 2003)
 
diff --git a/dev-libs/proj/Manifest b/dev-libs/proj/Manifest
index 58e49e4fed7e..16e7717d1297 100644
--- a/dev-libs/proj/Manifest
+++ b/dev-libs/proj/Manifest
@@ -1,7 +1,7 @@
-MD5 9c22700d2c878ba38b9a158f7fbd5615 ChangeLog 794
-MD5 158b61ca1c3bf6e095343a121c52483a proj-4.4.7.ebuild 612
+MD5 2cf1a90cf86fb108f4b13d2c69289203 ChangeLog 1069
+MD5 fe787eead40259d96b3e025473cece70 proj-4.4.7.ebuild 615
 MD5 0673e088d6627cb1d2a6ed2c53f8b491 metadata.xml 426
-MD5 16488184f65b46cc5ec2342d4d061911 proj-4.4.7-r1.ebuild 1333
+MD5 a19485160c58ff404bf799b9e44de6fa proj-4.4.7-r1.ebuild 1330
 MD5 771bff3ae8a11925a2627c37da8ca6da files/digest-proj-4.4.7 62
 MD5 a057c46d8075728c0cfd3e97917c633c files/proj-4.4.7-gentoo.patch 914
 MD5 ac50ff8c7d1e1aee4f500e2046eb3ac4 files/digest-proj-4.4.7-r1 129
diff --git a/dev-libs/proj/files/digest-proj-4.4.7-r1 b/dev-libs/proj/files/digest-proj-4.4.7-r1
new file mode 100644
index 000000000000..079d9ea9a70b
--- /dev/null
+++ b/dev-libs/proj/files/digest-proj-4.4.7-r1
@@ -0,0 +1,2 @@
+MD5 4169ed0ead9fc0cf90da6d1448911418 proj-4.4.7.tar.gz 459333
+MD5 66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz 1816642
diff --git a/dev-libs/proj/files/proj-4.4.7-gentoo.patch b/dev-libs/proj/files/proj-4.4.7-gentoo.patch
new file mode 100644
index 000000000000..8c041e2fe68f
--- /dev/null
+++ b/dev-libs/proj/files/proj-4.4.7-gentoo.patch
@@ -0,0 +1,34 @@
+--- nad/test27.orig	2003-11-05 19:31:39.000000000 -0800
++++ nad/test27	2003-11-05 19:34:16.000000000 -0800
+@@ -1,4 +1,4 @@
+-:
++#! /bin/sh
+ # Script to test most of the SPCS zones.
+ #
+ # This script generated from execution of NMD's program l176, where
+@@ -8,7 +8,7 @@
+ #   Mercator due to greater precision of meridinal distance function.
+ #
+ OUT=proj_out27
+-EXE=../src/proj
++EXE=proj
+ INIT_FILE=./nad27
+ #
+ echo "doing tests into file ${OUT}, please wait"
+--- nad/test83.orig	2002-06-14 17:32:15.000000000 -0700
++++ nad/test83	2003-11-05 19:40:04.000000000 -0800
+@@ -1,4 +1,4 @@
+-:
++#! /bin/sh
+ # Script to test most of the SPCS zones.
+ #
+ # This script generated from execution of NMD's program l176, where
+@@ -8,7 +8,7 @@
+ #   Mercator due to greater precision of meridinal distance function.
+ #
+ OUT=proj_out83
+-EXE=../src/proj
++EXE=proj
+ INIT_FILE=./nad83
+ #
+ echo "doing tests into file ${OUT}, please wait"
diff --git a/dev-libs/proj/metadata.xml b/dev-libs/proj/metadata.xml
new file mode 100644
index 000000000000..ca2fe0954999
--- /dev/null
+++ b/dev-libs/proj/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>twp@gentoo.org</email>
+  <name>Tom Payne</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<longdescription>Proj.4 cartograpic projection code for forward and inverse 
+coordinate and projection transformations.</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/proj/proj-4.4.7-r1.ebuild b/dev-libs/proj/proj-4.4.7-r1.ebuild
new file mode 100644
index 000000000000..8142611334d4
--- /dev/null
+++ b/dev-libs/proj/proj-4.4.7-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/proj-4.4.7-r1.ebuild,v 1.1 2003/11/06 06:07:49 nerdboy Exp $
+
+# This is the Unidata Units library, which supports conversion of unit 
+# specifications between formatted and binary forms, arithmetic 
+# manipulation of unit specifications, and conversion of values between 
+# compatible scales of measurement.
+
+S=${WORKDIR}/${P}
+N=${S}/nad
+DESCRIPTION="Proj.4 cartographic projection software with extra grids"
+HOMEPAGE="http://proj.maptools.org/"
+SRC_URI="http://proj.maptools.org/dl/${P}.tar.gz
+	http://proj.maptools.org/dl/proj-nad27-1.1.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/proj-4.4.7-gentoo.patch || die
+	cd ${N}
+	mv README README.NAD
+	TMPDIR=${T}  tar xvzf ${DISTDIR}/proj-nad27-1.1.tar.gz || die
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	insinto /usr/share/proj
+	insopts -m 755
+	doins nad/test27
+	doins nad/test83
+	insopts -m 644
+	doins nad/pj_out27.dist
+	doins nad/pj_out83.dist
+	dodoc COPYING README NEWS AUTHORS INSTALL ChangeLog ${N}/README.NAD ${N}/README.NADUS
+}
diff --git a/dev-libs/proj/proj-4.4.7.ebuild b/dev-libs/proj/proj-4.4.7.ebuild
index 8cc1e71e6390..3cb9fad6ba2f 100644
--- a/dev-libs/proj/proj-4.4.7.ebuild
+++ b/dev-libs/proj/proj-4.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/proj-4.4.7.ebuild,v 1.1 2003/08/30 11:24:29 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/proj-4.4.7.ebuild,v 1.2 2003/11/06 06:07:49 nerdboy Exp $
 
 DESCRIPTION="Cartographic projections library"
 HOMEPAGE="http://www.remotesensing.org/proj/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"