gentoo resync : 25.04.2020

9 files changed, 2 insertions, 649 deletions

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index fc1a00bafd29..1110c86f5e08 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,15 +1,7 @@
-AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
-AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
 AUX ogdi-3.2.0-endianess.patch 1028 BLAKE2B 25ea3bb0991b201bbfae2597ae622e2cd0a18749d274e6553e7dcd31cd2befb15f2bea1dd073f8d6d3bac568aeafbdaac6b04b7fcb0597733a97ea926bbd9a49 SHA512 3a4ee5ee69f27fbad6170f1e3142a70ba529bd81a9b3209d1cb005a2ebf1c04f782194f20e8a046a19ec817c81ee04a9f7ab192321f8dc9590f4f8823c71d38e
-AUX ogdi-3.2.0-fpic.patch 896 BLAKE2B ef7056cd60c3cb046137b7dc6bfea37fe711c9b41feb5c1bb40acd1b5fc8fb63178149e6d72c4a89940d45b4164d7cd93e26f003c845ce59862096fbcfb1e87e SHA512 71b429563254762a485ac05b9efdb4da29bc1c909b19d830b06a680722eee0991f0448d1885c9c96dad53e4a821257404f8b95bbb0d54a8fbca2300987d9f244
-AUX ogdi-3.2.0-ldflags.patch 700 BLAKE2B 6a2b494e35644dfa544ed000c4b3139b03a495e6a782bc8ad42fb1038b89b6e436222a1425b8a6ac7ca70e7680beadba4996de600202454e0e13c8f31b18ed63 SHA512 0d1c8c9bbff63abcfb713c4a2df627e9b00278eb00e89e3aecbeb87a6f9d4196687fd4eb5829248c352dd41f16db4060285bf4e1ea75df2f7c3f51dc314446d8
 AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe4352728f020b76c4c7dcbb58c6cc9903165ac49ec442c773a97bb575271f37e88a5f22951aae507afa0483c6b512d5488 SHA512 894dd439f0599e68117a82e461e75e5e48efde1bcd165fde727339b3d5855a17fab1f721663154a8d8626e38607237d8136e41a57b6b390f061762dd317b2e3c
-AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
-AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
-DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
-EBUILD ogdi-3.2.0-r1.ebuild 1730 BLAKE2B 0414eebbe445021de0a41e17ae77f5b954d025c90c3f4e74708e941793d3bd5cb171a329897b06b0652fa01dc4e036cadb4199ee56a7b6503a8ca38cd74d1b74 SHA512 8602a2c3ed67233f23006739206a471e72fed4a8d370150bbaa7d3f7e9f3a0567eca246d7ec47db96767237538a42962cfc3dbee12ba9cd317d4479590931a93
-EBUILD ogdi-4.1.0.ebuild 1294 BLAKE2B c93e6386c764d4b884e78538cdecd14d1dcf95835db25eefca763a23f103c3b6131c8ac8587c3da015d471f7f8b5b39d28900afee227b63ac6226e7fcb88f79f SHA512 54f53ef1b5c73f1b4908257e1554f04c6ec4cead60c7c5ecca092bf34d153682f9f1556b59931ed2d6dfd0487e7b43b969bb18f1cbef1f5a5791aad32431ddfe
+EBUILD ogdi-4.1.0.ebuild 1292 BLAKE2B 0afbdc5e6e7e21aecaaac7f1f94d4709f945e24c4bf7f624519e820704d3aed3e22b0f496137870892d125620f6f31d8865d6c4bb34373dca0da763a8db0debc SHA512 bad62a8b25c92ef7a2544a80cd3e54312d38aafe68b54415966b1288fca0e710faee7591bd06bbd6b8feb53d59be58507afee3bd015081e6746df0de18175af3
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
deleted file mode 100644
index 6952e7d349df..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 9e56a8be9e228b466d6464f09349a8ea2c3ec637 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:23:11 +0100
-Subject: [PATCH 2/6] Rename aclocal.m4 to acinclude.m4 to prevent clash with
- actual aclocal generated file
-
----
- aclocal.m4 => acinclude.m4 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename aclocal.m4 => acinclude.m4 (100%)
-
-diff --git a/aclocal.m4 b/acinclude.m4
-similarity index 100%
-rename from aclocal.m4
-rename to acinclude.m4
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
deleted file mode 100644
index bc39b7753d3b..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 2f8d760ac4470e22f2f4965aa3282ea21ffa1f17 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:21:39 +0100
-Subject: [PATCH 3/6] Apply stricter quoting to macros defined in acinclude.m4
-
-Refer to the automake manual for details on why recent versions of aclocal are
- more strict:
- https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
----
- acinclude.m4 | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 163a446..9d3308e 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1,4 +1,4 @@
--AC_DEFUN(AC_COMPILER_WFLAGS,
-+AC_DEFUN([AC_COMPILER_WFLAGS],
- [
- 	# Remove -g from compile flags, we will add via CFG variable if
- 	# we need it.
-@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS,
- 	# check for GNU compiler, and use -Wall
- 	if test "$GCC" = "yes"; then
- 		C_WFLAGS="-Wall"
--		AC_DEFINE(USE_GNUCC)
-+		AC_DEFINE([USE_GNUCC])
- 	fi
- 	if test "$GXX" = "yes"; then
- 		CXX_WFLAGS="-Wall"
--		AC_DEFINE(USE_GNUCC)
-+		AC_DEFINE([USE_GNUCC])
- 	fi
--	AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
--	AC_SUBST(C_WFLAGS,$C_WFLAGS)
-+	AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS)
-+	AC_SUBST([C_WFLAGS],$C_WFLAGS)
- ])
- 
--AC_DEFUN(AC_COMPILER_PIC,
-+AC_DEFUN([AC_COMPILER_PIC],
- [
- 	echo 'void f(){}' > conftest.c
- 	if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then
-@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC,
- 	fi
- 	rm -f conftest*
- 
--	AC_SUBST(CXX_PIC,$CXX_PIC)
--	AC_SUBST(C_PIC,$C_PIC)
-+	AC_SUBST([CXX_PIC],$CXX_PIC)
-+	AC_SUBST([C_PIC],$C_PIC)
- ])
- 
- dnl
-@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with.  Use "c++ -shared"
- dnl in preference to "ld -shared" because it will link in required c++
- dnl run time support for us. 
- dnl
--AC_DEFUN(AC_LD_SHARED,
-+AC_DEFUN([AC_LD_SHARED],
- [
-   echo 'void g(); int main(){ g(); return 0; }' > conftest1.c
- 
-@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED,
-   fi
-   rm -f conftest* libconftest* 
- 
--  AC_SUBST(LD_SHARED,$LD_SHARED)
-+  AC_SUBST([LD_SHARED],$LD_SHARED)
- ])
- 
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
deleted file mode 100644
index a9cad1ef8a7a..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a4a7fdb81c7b78159541d1e027275b8b4893cc4a Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:03:34 +0100
-Subject: [PATCH 5/6] Compile everything with -fPIC if required
-
-Previously only objects directly compiled for shared objects were compiled
- with -fPIC, but static objects linked into shared objects also need this flag.
----
- config/generic.mak.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 699166b..3b671d7 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,7 +35,7 @@ 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) 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
deleted file mode 100644
index a21a12d354fa..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 216529de46898bdeda075f084f4f62c796bfef87 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:53:03 +0100
-Subject: [PATCH 4/6] Respect LDFLAGS provided to ./configure
-
----
- config/generic.mak.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 699166b..86b7fa2 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -38,7 +38,7 @@ SHLIB_CFLAGS	= @C_PIC@
- COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
- 
- SHLIB_LDFLAGS	= -shared 
--COMMON_LDFLAGS  = $(OPTIMIZATION) 
-+COMMON_LDFLAGS  = $(OPTIMIZATION) @LDFLAGS@
- 
- RPC_INCLUDES = @RPC_INCLUDES@
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
deleted file mode 100644
index 1569003d4e4d..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 52b4a972c164d6900584f147ba4bf73f02e0bbe7 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:25:41 +0100
-Subject: [PATCH 6/6] Fall back to libtirpc if libc does not provide rpc/rpc.h
-
----
- config/generic.mak.in |   4 +-
- configure             | 245 +++++++++++++++++++++++++++++++++++++++++++++++++-
- configure.in          |   6 ++
- ogdi-config.in        |   4 +-
- ogdi.pc.in            |   4 +-
- 5 files changed, 255 insertions(+), 8 deletions(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 3b671d7..6ff7e33 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,7 +35,7 @@ AR		= ar cr
- # Compilation and linking flags
- #
- SHLIB_CFLAGS	= @C_PIC@
--COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
-+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ @RPC_CFLAGS@
- 
- SHLIB_LDFLAGS	= -shared 
- COMMON_LDFLAGS  = $(OPTIMIZATION) 
-@@ -61,7 +61,7 @@ INST_BIN	= @bindir@
- #
- #RPC_LINKLIB	= -lrpcsvc -lnsl -lsocket
- #RPC_LINKLIB	=	-ldl -ldbmalloc
--RPC_LINKLIB	=	@LIBS@
-+RPC_LINKLIB	=	@LIBS@ @RPC_LIBS@
- 
- #
- # Endian definition, could be little or big
-diff --git a/configure b/configure
-index d7acc10..c6459e0 100755
---- a/configure
-+++ b/configure
-@@ -634,6 +634,8 @@ PROJ_INCLUDE
- PROJ_SETTING
- BIG_ENDIAN
- RPC_INCLUDES
-+RPC_LIBS
-+RPC_CFLAGS
- EGREP
- GREP
- CPP
-@@ -643,6 +645,9 @@ CXX_PIC
- C_WFLAGS
- CXX_WFLAGS
- HAVE_ICONV
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
-+PKG_CONFIG
- OBJEXT
- EXEEXT
- ac_ct_CC
-@@ -714,7 +719,12 @@ CFLAGS
- LDFLAGS
- LIBS
- CPPFLAGS
--CPP'
-+PKG_CONFIG
-+PKG_CONFIG_PATH
-+PKG_CONFIG_LIBDIR
-+CPP
-+RPC_CFLAGS
-+RPC_LIBS'
- 
- 
- # Initialize some variables set by options.
-@@ -1343,7 +1353,14 @@ Some influential environment variables:
-   LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-+  PKG_CONFIG  path to pkg-config utility
-+  PKG_CONFIG_PATH
-+              directories to add to pkg-config's search path
-+  PKG_CONFIG_LIBDIR
-+              path overriding pkg-config's built-in search path
-   CPP         C preprocessor
-+  RPC_CFLAGS  C compiler flags for RPC, overriding pkg-config
-+  RPC_LIBS    linker flags for RPC, overriding pkg-config
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -2867,6 +2884,126 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	else
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+fi
-+
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if ${ac_cv_lib_dl_dlopen+:} false; then :
-@@ -3045,7 +3182,6 @@ HAVE_ICONV=$HAVE_ICONV
- 
- 
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3443,6 +3579,111 @@ fi
- done
- 
- 
-+for ac_header in rpc/rpc.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
-+if test "x$ac_cv_header_rpc_rpc_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_RPC_RPC_H 1
-+_ACEOF
-+
-+else
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5
-+$as_echo_n "checking for libtirpc... " >&6; }
-+
-+if test -n "$RPC_CFLAGS"; then
-+    pkg_cv_RPC_CFLAGS="$RPC_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$RPC_LIBS"; then
-+    pkg_cv_RPC_LIBS="$RPC_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        RPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`
-+        else
-+	        RPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$RPC_PKG_ERRORS" >&5
-+
-+	as_fn_error $? "Package requirements (libtirpc) were not met:
-+
-+$RPC_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables RPC_CFLAGS
-+and RPC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables RPC_CFLAGS
-+and RPC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+	RPC_CFLAGS=$pkg_cv_RPC_CFLAGS
-+	RPC_LIBS=$pkg_cv_RPC_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+fi
-+
-+done
-+
-+
- for ac_header in rpc/pmap_clnt.h float.h dlfcn.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff --git a/configure.in b/configure.in
-index 68b1c92..d5fe134 100644
---- a/configure.in
-+++ b/configure.in
-@@ -23,6 +23,7 @@ fi
- 
- dnl Checks for programs.
- AC_PROG_CC
-+PKG_PROG_PKG_CONFIG
- 
- dnl We always want to check /usr/local for stuff.
- dnl LIBS="$LIBS -L/usr/local/lib"
-@@ -38,6 +39,11 @@ AC_COMPILER_WFLAGS
- AC_COMPILER_PIC
- AC_LD_SHARED
- 
-+dnl ---------------------------------------------------------------------------
-+dnl	Do we have rpc/rpc.h
-+dnl ---------------------------------------------------------------------------
-+AC_CHECK_HEADERS([rpc/rpc.h],,
-+	[PKG_CHECK_MODULES([RPC], [libtirpc])])
- 
- dnl ---------------------------------------------------------------------------
- dnl	Do we have rpc/pmap_clnt.h, float.h, dlfcn.h?
-diff --git a/ogdi-config.in b/ogdi-config.in
-index f3c9a03..c6dfc50 100644
---- a/ogdi-config.in
-+++ b/ogdi-config.in
-@@ -13,8 +13,8 @@ exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- includedir="@includedir@/ogdi"
- libs="-logdi"
--all_libs="-logdi -lproj -lexpat -lz"
--I_opts="-I${includedir}"
-+all_libs="-logdi -lproj -lexpat -lz @RPC_LIBS@"
-+I_opts="-I${includedir} @RPC_CFLAGS@"
- L_opts=""
- R_opts=""
- cppflags=""
-diff --git a/ogdi.pc.in b/ogdi.pc.in
-index 8b919de..1f290d9 100644
---- a/ogdi.pc.in
-+++ b/ogdi.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: ogdi
- Description: Open Geographic Datastore Interface
- Version: @OGDI_VERSION@
--Cflags: -I${includedir}/ogdi
-+Cflags: -I${includedir}/ogdi @RPC_CFLAGS@
- Libs: -L${libdir} -logdi
--Libs.private: -lproj -lexpat -lz
-+Libs.private: -lproj -lexpat -lz @RPC_LIBS@
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
deleted file mode 100644
index c98390c440de..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ogdi-3.2.0.beta2.old/makefile ogdi-3.2.0.beta2/makefile
---- ogdi-3.2.0.beta2.old/makefile	2011-06-17 12:45:53.171219473 +0200
-+++ ogdi-3.2.0.beta2/makefile	2011-06-17 12:46:34.013708870 +0200
-@@ -17,7 +17,7 @@
- #
- # Sub-directories that need to be built
- #
--subdirs	= external vpflib ogdi contrib
-+subdirs	= vpflib ogdi contrib
- 
- ifneq ($(PROJ_SETTING),external)
- subdirs := proj $(subdirs) 
-diff -urN ogdi-3.2.0.beta2.old/ogdi/makefile ogdi-3.2.0.beta2/ogdi/makefile
---- ogdi-3.2.0.beta2.old/ogdi/makefile	2011-06-17 12:45:53.174219434 +0200
-+++ ogdi-3.2.0.beta2/ogdi/makefile	2011-06-17 12:47:38.814898744 +0200
-@@ -15,7 +15,7 @@
- #
- # Sub-directories that need to be built
- #
--subdirs	= include c-api glutil attr_driver datum_driver driver gltpd examples
-+subdirs	= include c-api glutil attr_driver datum_driver driver gltpd
- 
- #
- # Default target to build everything in all sub-directories
diff --git a/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
deleted file mode 100644
index 7de1803045b3..000000000000
--- a/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_/.}
-inherit 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="
-	net-libs/libtirpc
-	dev-libs/expat
-	>=sci-libs/proj-4.9.0:=
-	<sci-libs/proj-6.0.0:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
-	"${FILESDIR}"/${P}-acinclude.patch
-	"${FILESDIR}"/${P}-aclocal.patch
-	"${FILESDIR}"/${P}-endianess.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-optimisation.patch
-	"${FILESDIR}"/${P}-rpc.patch
-	"${FILESDIR}"/${P}-tcl.patch
-)
-
-src_prepare() {
-	default
-	rm -r external || die
-	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-expat \
-		--with-zlib
-}
-
-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
-	einstalldocs
-}
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index a355b84b1d17..8c064938d77e 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="