[gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/

[Andreas Sturmlechner]

commit:     92a6aec7d300f7681223194ea170a71db5ef7258
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 22:34:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 00:20:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a6aec7

sci-libs/ogdi: Drop 3.2.0_beta2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/ogdi/Manifest                             |   1 -
 sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch          |  38 ---
 sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch     |  11 -
 .../ogdi/files/ogdi-3.2.0_beta2-endianess.patch    |  18 --
 sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch | 297 ---------------------
 sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild              |  66 -----
 6 files changed, 431 deletions(-)

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index d2b94841f4a..e10d38f7e8a 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,2 +1 @@
-DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0

diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
deleted file mode 100644
index f6fbc85e5ae..00000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 1cb74f5..2e9cabe 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,16 +35,16 @@ AR		= ar cr
- # Compilation and linking flags
- #
- SHLIB_CFLAGS	= @C_PIC@
--COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
-+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
- 
--SHLIB_LDFLAGS	= -shared 
--COMMON_LDFLAGS  = $(OPTIMIZATION) 
-+SHLIB_LDFLAGS	= -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR)
-+COMMON_LDFLAGS  = $(OPTIMIZATION) $(LDFLAGS)
- 
- RPC_INCLUDES = @RPC_INCLUDES@
- 
- UCB_STATICLIB = 
- 
--TCL_INCLUDE = -I/usr/include/tcl8.3
-+TCL_INCLUDE = -I${prefix}/include
- TCL_LINKLIB =
- 
- #
-diff --git a/config/unix.mak b/config/unix.mak
-index e3af578..927b0fc 100644
---- a/config/unix.mak
-+++ b/config/unix.mak
-@@ -55,7 +55,7 @@ LINK_SW		= -L
- ifeq ($(CFG),debug)
- OPTIMIZATION	= -g
- else
--OPTIMIZATION	= -O
-+OPTIMIZATION	= 
- endif
- 
- #

diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
deleted file mode 100644
index 16c40b2ff43..00000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogdi.old/ogdi/driver/vrf/feature.c	2007/05/09 20:46:28	1.16
-+++ ogdi/ogdi/driver/vrf/feature.c	2009/05/08 04:15:50	1.17
-@@ -1347,7 +1350,7 @@
-   short int temp4;
-   int temp5;
-   date_type temp6;
--  long count;
-+  int32 count;
- 
-   if (returnString != NULL) {
-     free(returnString);

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
deleted file mode 100644
index 75c85fbb29b..00000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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-proj480.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
deleted file mode 100644
index 9380f91ffd3..00000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Index: ogdi-dfsg/configure
-===================================================================
---- ogdi-dfsg.orig/configure
-+++ ogdi-dfsg/configure
-@@ -3939,7 +3939,7 @@
- fi
- 
- 
--for ac_header in projects.h
-+for ac_header in proj_api.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -4085,8 +4085,8 @@
-    { (exit 1); exit 1; }; }
-   fi
-   if test "$ac_cv_header_projects_h" = no ; then
--    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&5
--echo "$as_me: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&2;}
-+    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&5
-+echo "$as_me: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-@@ -4095,12 +4095,12 @@
- 
- elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- 
--  if test -r $with_proj/include/projects.h ; then
--    echo "checking for $with_proj/include/projects.h ... found"
-+  if test -r $with_proj/include/proj_api.h ; then
-+    echo "checking for $with_proj/include/proj_api.h ... found"
-     PROJ_INCLUDE=-I$with_proj/include
-   else
--    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/projects.h" >&5
--echo "$as_me: error: Unable to find $with_proj/include/projects.h" >&2;}
-+    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/proj_api.h" >&5
-+echo "$as_me: error: Unable to find $with_proj/include/proj_api.h" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-Index: ogdi-dfsg/configure.in
-===================================================================
---- ogdi-dfsg.orig/configure.in
-+++ ogdi-dfsg/configure.in
-@@ -81,13 +81,13 @@
- if test "$with_proj" = "yes" ; then
- 
-   AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
--  AC_CHECK_HEADERS(projects.h)
-+  AC_CHECK_HEADERS(proj_api.h)
- 
-   if test $PROJ_SETTING = missing ; then
-     AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
-   fi
-   if test "$ac_cv_header_projects_h" = no ; then
--    AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])
-+    AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
-   fi
- 
-   PROJ_SETTING=external
-@@ -95,11 +95,11 @@
- 
- elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
-   
--  if test -r $with_proj/include/projects.h ; then
--    echo "checking for $with_proj/include/projects.h ... found"
-+  if test -r $with_proj/include/projapi.h ; then
-+    echo "checking for $with_proj/include/proj_api.h ... found"
-     PROJ_INCLUDE=-I$with_proj/include
-   else
--    AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])
-+    AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
-   fi
- 
-   if test -r $with_proj/lib/libproj.so ; then
-Index: ogdi-dfsg/ogdi/c-api/client.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/c-api/client.c
-+++ ogdi-dfsg/ogdi/c-api/client.c
-@@ -1576,7 +1576,7 @@
-   char *error_message;
-   ecs_CtlPoints *cpts;
-   ecs_Result *res;
--  PJ *tempproj;
-+  projPJ tempproj;
- 
-   if (multiblock != 0) {
-     res = &cln_dummy_result;
-@@ -1598,7 +1598,7 @@
-   /* Check if the projection is valid */
- 
-   if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
--    tempproj = (PJ *) cln_ProjInit(projection);
-+    tempproj = (projPJ) cln_ProjInit(projection);
-     if(tempproj == NULL) {
-       res = &cln_dummy_result;
-       ecs_SetError(res,1,"This projection string is invalid");
-@@ -1775,7 +1775,7 @@
-   ecs_Result *res;
-   register ecs_Client *cln;
-   char *server_proj;
--  PJ *oldtarget,*oldsource;
-+  projPJ oldtarget,oldsource;
-   ecs_Region oldreg;
-   int oldisprojequal;
-   int oldisTargetLL;
-@@ -1874,7 +1874,7 @@
- 
-   if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
-     cln->isTargetLL = FALSE;
--    cln->target = (PJ *) cln_ProjInit(projection);
-+    cln->target = (projPJ) cln_ProjInit(projection);
-     if(cln->target == NULL) {
-       goto setprojerror;
-     }
-@@ -1920,7 +1920,7 @@
- 
-   if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
-     cln->isSourceLL = FALSE;
--    cln->source = (PJ *) cln_ProjInit(server_proj);
-+    cln->source = (projPJ) cln_ProjInit(server_proj);
-     if(cln->source == NULL) {
-       goto setprojerror;
-     }
-@@ -2328,13 +2328,13 @@
-  *	char *d: Projection name
-  *
-  *  OUT
-- *	return PJ *: New projection structure. If NULL, the operation
-+ *	return projPJ: New projection structure. If NULL, the operation
-  *	is a failure.
-  *
-  *----------------------------------------------------------------------
-  */
- 
--PJ *cln_ProjInit(d)
-+projPJ cln_ProjInit(d)
-      char *d;
- {
-   int i,n;
-@@ -2343,7 +2343,7 @@
-   char *l;
-   int longueur;
-   char *c;
--  PJ *retour;
-+  projPJ retour;
-   
-   if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
-     return NULL;
-@@ -2378,7 +2378,7 @@
-     n++;
-   }
- 
--  retour = (PJ *) pj_init(n, (char **) tableau);
-+  retour = (projPJ) pj_init(n, (char **) tableau);
-   free(c);
-   free(tableau);
- 
-Index: ogdi-dfsg/ogdi/c-api/ecsgeo.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/c-api/ecsgeo.c
-+++ ogdi-dfsg/ogdi/c-api/ecsgeo.c
-@@ -310,7 +310,7 @@
-      char *projection;
-      double X1,Y1,X2,Y2;
- {
--  PJ *proj;
-+  projPJ proj;
-   char **argv;
-   int argc;
-   double lon1,lat1,lon2,lat2;
-Index: ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/datum_driver/usa/dtusa.c
-+++ ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
-@@ -26,7 +26,12 @@
-   ********************************************************************/
- 
- #include "ecs.h"
--#include "projects.h"
-+#include "proj_api.h"
-+
-+/* Definition from Proj.4 */
-+projUV nad_cvt(projUV, int, struct CTABLE *);
-+struct CTABLE *nad_init(projCtx ctx, char *);
-+void nad_free(struct CTABLE *);
- 
- typedef struct {
-   struct CTABLE *dtptr;
-@@ -124,7 +129,7 @@
-     strcat(pathfile,"/");  
-     strcat(pathfile,table);  
- 
--    ptr->dtptr = nad_init(pathfile);
-+    ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
-     if (ptr->dtptr == NULL) {
-       ptr->count--;
-       return FALSE;
-Index: ogdi-dfsg/ogdi/include/ecs_util.h
-===================================================================
---- ogdi-dfsg.orig/ogdi/include/ecs_util.h
-+++ ogdi-dfsg/ogdi/include/ecs_util.h
-@@ -105,12 +105,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#include "projects.h"
--
--/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
--#ifndef USE_PROJUV
--#  define projUV UV
--#endif
-+#include "proj_api.h"
- 
- #include "ecs.h"
- 
-@@ -1054,8 +1049,8 @@
-      ecs_Family currentSelectionFamily: Current layer selection type
-      char *tclprocname: attribute callback procedure for tcl
-      char *target_proj: Projection descriptor
--     PJ *target: target (c interface) projection descriptors
--     PJ *source: source (driver) projection descriptors
-+     projPJ target: target (c interface) projection descriptors
-+     projPJ source: source (driver) projection descriptors
-      ecs_Datum targetdatum: target datum information
-      ecs_Datum sourcedatum: source datum information
-      void *dthandle: Handle to the datum driver
-@@ -1092,8 +1088,8 @@
-   ecs_Family currentSelectionFamily; /* Current layer selection type */
-   char *tclprocname;      /* attribute callback procedure for tcl */
-   char *target_proj;
--  PJ *target;             /* source and target projection descriptors */
--  PJ *source;
-+  projPJ target;             /* source and target projection descriptors */
-+  projPJ source;
-   int isSourceLL;         /* flags to avoid unnecessary computation */
-   int isTargetLL;
-   int isProjEqual;
-@@ -1165,7 +1161,7 @@
- 
- /* Projection conversion functions */
- 
--PJ *cln_ProjInit                     _ANSI_ARGS_((char *d));
-+projPJ cln_ProjInit                     _ANSI_ARGS_((char *d));
- int cln_CompareProjections           _ANSI_ARGS_((int ClientID));
- int cln_UpdateMaxRegion              _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));
- int cln_ConvRegion                   _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));
-Index: ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
-===================================================================
---- ogdi-dfsg.orig/contrib/ogdi_import/ogdi_import.c
-+++ ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
-@@ -63,12 +63,7 @@
- #include "ecs.h"
- #include "shapefil.h"
- #include <assert.h>
--#include "projects.h"
--
--#ifndef PJ_VERSION
--#define projPJ PJ*
--#define projUV UV
--#endif
-+#include "proj_api.h"
- 
- static int	ClientID = -1;
- static int      bNoDict = FALSE;
-Index: ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
-===================================================================
---- ogdi-dfsg.orig/contrib/ogdi_info/ogdi_info.c
-+++ ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
-@@ -63,7 +63,7 @@
-  */
- 
- #include "ecs.h"
--#include "projects.h"
-+#include "proj_api.h"
- 
- static int	ClientID = -1;
- static int      bNoDict = FALSE;
-@@ -214,7 +214,7 @@
- /*                          DumpGlobalRegion()                          */
- /************************************************************************/
- 
--static int DumpGlobalRegion( ecs_Region * region, PJ * proj_defn )
-+static int DumpGlobalRegion( ecs_Region * region, projPJ proj_defn )
- 
- {
-     ecs_Result	*result;
-@@ -398,7 +398,7 @@
- 
- {
-     ecs_Result *result;
--    PJ	       *proj_defn = NULL;
-+    projPJ     proj_defn = NULL;
- 
- /* -------------------------------------------------------------------- */
- /*      Close old client if there is one active.                        */

diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
deleted file mode 100644
index fcd803cbbad..00000000000
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/expat
-	>=sci-libs/proj-4.8.0
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -rf external
-	epatch \
-		"${FILESDIR}"/${P}-subdirs.patch \
-		"${FILESDIR}"/${P}-endianess.patch \
-		"${FILESDIR}"/${P}-64b.patch \
-		"${FILESDIR}"/${P}-proj480.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
-	dodoc ChangeLog NEWS README
-}