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

2024-04-08 Thread Andrew Ammerlaan
commit: 14ce272e1095bad87359dd74f43f9d5f26a94fe7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Apr  8 18:24:37 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Apr  8 18:48:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ce272e

sci-libs/ogdi: add missing remote-id

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ogdi/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/ogdi/metadata.xml b/sci-libs/ogdi/metadata.xml
index c51ca5360917..429161d45435 100644
--- a/sci-libs/ogdi/metadata.xml
+++ b/sci-libs/ogdi/metadata.xml
@@ -7,5 +7,6 @@
   
   
 ogdi
+libogdi/ogdi
   
 



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

2024-04-05 Thread Andrew Ammerlaan
commit: f05911cd1a46ac7b974ddcd9d09fec1a911373ac
Author: NHOrus  yahoo  com>
AuthorDate: Thu Apr  4 12:12:37 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Apr  5 07:39:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05911cd

sci-libs/ogdi: Fix C99 errors

Closes: https://bugs.gentoo.org/886460
Signed-off-by: NHOrus  yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36095
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../ogdi/files/ogdi-4.1.0-c99-conversions.patch | 21 +
 sci-libs/ogdi/ogdi-4.1.0-r1.ebuild  |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch 
b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch
new file mode 100644
index ..476f77b938ef
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch
@@ -0,0 +1,21 @@
+--- a/vpflib/vpfprop.c 2024-04-04 12:03:43.682864289 +
 b/vpflib/vpfprop.c 2024-04-04 12:07:30.498441728 +
+@@ -840,7 +840,8 @@
+ #endif
+ 
+ {
+-  int32 ncov,i,j,k,n;
++  char ncov;
++  int32 i,j,k,n;
+   char path[255];
+   char **ptr, **coverages, **subset, **fcnames=(char **)NULL;
+ 
+@@ -1447,7 +1447,7 @@
+  int32 *nfc )
+ #else
+char **coverage_feature_class_names (library_path, coverage, nfc)
+-  char *library_path, coverage;
++  char *library_path, *coverage;
+   int32 *nfc;
+ #endif
+ 

diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild 
b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
index e449cbd2f7e3..c0eb8f3c5dff 100644
--- a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.0-endianess.patch
"${FILESDIR}"/${PN}-3.2.0-optimisation.patch
"${FILESDIR}"/${PN}-3.2.0-tcl.patch
+   "${FILESDIR}"/${P}-c99-conversions.patch
 )
 
 src_prepare() {



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

2022-06-30 Thread Sam James
commit: 2ec63885bb34c88c2b0bcbb26752ec119485f928
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 30 19:05:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 30 19:05:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec63885

sci-libs/ogdi: install .pc file

Closes: https://bugs.gentoo.org/848015
Signed-off-by: Sam James  gentoo.org>

 sci-libs/ogdi/{ogdi-4.1.0.ebuild => ogdi-4.1.0-r1.ebuild} | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild 
b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
similarity index 91%
rename from sci-libs/ogdi/ogdi-4.1.0.ebuild
rename to sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
index 8a821d13f953..72f6e8d93cd2 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,8 +53,16 @@ src_compile() {
 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*
+
+   insinto "/usr/$(get_libdir)/pkgconfig"
+   doins ogdi.pc
+
+   dobin ogdi-config
+
einstalldocs
 }



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

2021-08-14 Thread Marek Szuba
commit: 19d726ba3bcdf45dfdae044d0b06913b9a3b382c
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Aug 14 22:07:42 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Aug 14 23:15:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d726ba

sci-libs/ogdi: keyword 4.1.0 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 8c064938d77..8a821d13f95 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="



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

2020-04-13 Thread Andreas Sturmlechner
commit: 4a35fed092fae57746166099bc9f14d95d6446d5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 13 16:59:10 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 13 18:46:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a35fed0

sci-libs/ogdi: Drop 3.2.0-r1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ogdi/Manifest |   1 -
 sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch |  18 -
 sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch   |  77 
 sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch  |  27 --
 sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch   |  25 --
 sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch   | 390 -
 sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch |  24 --
 sci-libs/ogdi/ogdi-3.2.0-r1.ebuild |  78 -
 8 files changed, 640 deletions(-)

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 3e06551d6aa..e7e89450ed6 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,2 +1 @@
-DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 
535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca
 SHA512 
b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B 
d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a
 SHA512 
abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859

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 6952e7d349d..000
--- 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 
-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 bc39b7753d3..000
--- 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 
-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_SHA

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

2020-04-13 Thread Agostino Sarubbo
commit: 25e2773f514565ffe19ce1b74fb0007548e35fe9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 16:53:20 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 16:53:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e2773f

sci-libs/ogdi: x86 stable wrt bug #716928

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 9d2a378d530..8c064938d77 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="



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

2020-04-12 Thread Agostino Sarubbo
commit: 43e5124c3f1186353e6f8777e4a5bfd4e24b2a3f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Apr 12 07:29:40 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Apr 12 07:29:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e5124c

sci-libs/ogdi: amd64 stable wrt bug #716928

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index a355b84b1d1..9d2a378d530 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="



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

2020-04-11 Thread Agostino Sarubbo
commit: 526ed24dae884092e85e3ff04491ee2ac0996ffa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 16:10:33 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 16:10:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526ed24d

sci-libs/ogdi: ppc64 stable wrt bug #716928

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 6d9fb465948..a355b84b1d1 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="



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

2020-04-11 Thread Agostino Sarubbo
commit: 11c6fb19e7371120da79a7c4894f86a1d2999009
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 11 16:00:06 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 11 16:00:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c6fb19

sci-libs/ogdi: ppc stable wrt bug #716928

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 851be8f0794..6d9fb465948 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="



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

2020-04-10 Thread Mart Raudsepp
commit: 13812851b869880c291506656487015f9c57692f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 10 19:55:26 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 10 19:55:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13812851

sci-libs/ogdi: arm64 stable (bug #716928)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 sci-libs/ogdi/ogdi-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index b51bd57ebf3..851be8f0794 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="



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

2020-04-10 Thread Andreas Sturmlechner
commit: 064fcfbe59e7d0b0519994cc434a597fc3f97d32
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 10 11:14:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 10 11:30:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064fcfbe

sci-libs/ogdi: 4.1.0 version bump

Bug: https://bugs.gentoo.org/699838
Closes: https://bugs.gentoo.org/706190
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ogdi/Manifest   |  1 +
 sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch | 24 +++
 sci-libs/ogdi/ogdi-4.1.0.ebuild  | 60 
 3 files changed, 85 insertions(+)

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index e10d38f7e8a..3e06551d6aa 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1 +1,2 @@
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 
535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca
 SHA512 
b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
+DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B 
d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a
 SHA512 
abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859

diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch 
b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
new file mode 100644
index 000..208bfb2bb02
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
@@ -0,0 +1,24 @@
+diff -urN a/makefile b/makefile
+--- a/makefile
 b/makefile
+@@ -17,7 +17,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs   = external vpflib ogdi contrib
++subdirs   = vpflib ogdi contrib
+ 
+ #
+ # Default target to build everything in all sub-directories
+diff -urN a/ogdi/makefile b/ogdi/makefile
+--- a/ogdi/makefile
 b/ogdi/makefile
+@@ -15,7 +15,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs   = include c-api glutil attr_driver driver gltpd examples
++subdirs   = include c-api glutil attr_driver driver gltpd
+ 
+ #
+ # Default target to build everything in all sub-directories

diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
new file mode 100644
index 000..b51bd57ebf3
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net/ https://github.com/libogdi/ogdi";
+SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+   dev-libs/expat
+   net-libs/libtirpc:=
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog NEWS README )
+
+PATCHES=(
+   "${FILESDIR}"/${P}-subdirs.patch
+   "${FILESDIR}"/${PN}-3.2.0-endianess.patch
+   "${FILESDIR}"/${PN}-3.2.0-optimisation.patch
+   "${FILESDIR}"/${PN}-3.2.0-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-expat \
+   --with-zlib
+}
+
+src_compile() {
+   # bug #299239
+   emake -j1
+}
+
+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*
+   einstalldocs
+}



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

2019-12-28 Thread Andreas Sturmlechner
commit: 0452eff68c3a95f0e22a604ced402b9bacafc3e6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 28 23:49:16 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 29 00:20:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0452eff6

sci-libs/ogdi: Restrict to https://bugs.gentoo.org/686086
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ogdi/ogdi-3.2.0-r1.ebuild | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild 
b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
new file mode 100644
index 000..7de1803045b
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
@@ -0,0 +1,78 @@
+# 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:=
+   

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

2019-12-28 Thread Andreas Sturmlechner
commit: 371ce54e28866752778d51471caabcd868c57172
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 28 23:49:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 29 00:20:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371ce54e

sci-libs/ogdi: Drop 3.2.0 (r0)

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

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 74 -
 1 file changed, 74 deletions(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
deleted file mode 100644
index 7f42ae15c1e..000
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="
-   net-libs/libtirpc
-   dev-libs/expat
-   >=sci-libs/proj-4.9.0
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-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 -rf external
-   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
-}



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

2019-12-28 Thread Andreas Sturmlechner
commit: 92a6aec7d300f7681223194ea170a71db5ef7258
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 28 22:34:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 29 00:20:02 2019 +
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  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..000
--- 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..000
--- 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..000
--- 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.h2007-03-27 17:35:24.0 
+0200
-+++ ogdi-dfsg/vpflib/include/machine.h 2007-03-27 17:41:16.0 +0200
-@@ -15,10 +15,11 @@
- longoutput;
- } xBYTE_ORDER;
- 
--#if SYS_BIG_ENDIAN == 1
--#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
--#else
-+#include 
-+#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..000
--- 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"; }; th

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

2019-05-16 Thread Aaron Bauman
commit: f009dcd1af8e1a962ab920852317032f7f4aba81
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu May 16 19:26:43 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 16 19:27:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f009dcd1

sci-libs/ogdi: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index 1473c674acc..da6e21103bd 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-06-13 Thread Aaron Bauman
commit: 2ece8faf84cd521c1914cf1237279ad571e13e74
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 13 17:55:47 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jun 13 21:15:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ece8faf

sci-libs/ogdi: remove unused patch

 sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch | 177 --
 1 file changed, 177 deletions(-)

diff --git a/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch 
b/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch
deleted file mode 100644
index 33fb5610319..000
--- a/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Only in ogdi-3.1.5.orig: bin
-Only in ogdi-3.1.5.orig/config: Linux.mak
-Only in ogdi-3.1.5.orig: config.cache
-Only in ogdi-3.1.5.orig: config.log
-Only in ogdi-3.1.5.orig: config.status
-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
-diff -ur ogdi-3.1.5/external/expat/makefile 
ogdi-3.1.5.orig/external/expat/makefile
 ogdi-3.1.5/external/expat/makefile 2001-08-27 14:11:10.0 +
-+++ ogdi-3.1.5.orig/external/expat/makefile2005-08-01 18:57:49.020052368 
+
-@@ -36,7 +36,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) \
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
-   -DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
- 
- ifeq ($(BIG_ENDIAN),1)
-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
-diff -ur ogdi-3.1.5/external/zlib/makefile 
ogdi-3.1.5.orig/external/zlib/makefile
 ogdi-3.1.5/external/zlib/makefile  2001-04-19 05:26:46.0 +
-+++ ogdi-3.1.5.orig/external/zlib/makefile 2005-08-01 18:58:47.984088472 
+
-@@ -46,7 +46,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- #
- # Primary target
-Only in ogdi-3.1.5.orig/lib: Linux
-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
 ogdi-3.1.5/ogdi/c-api/makefile 2001-04-19 05:29:31.0 +
-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile2005-08-01 18:53:51.936094608 
+
-@@ -23,7 +23,7 @@
-   $(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
-   $(EXPAT_INCLUDE)
- 
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
-   $(PROJ_STATICLIB) $(MATH_LINKLIB)
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile 
ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
 ogdi-3.1.5/ogdi/datum_driver/canada/makefile   2001-02-19 
04:12:21.0 +
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile  2005-08-01 
19:03:00.932634448 +
-@@ -17,7 +17,7 @@
- SOURCES = nadconv.c dtcanada.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= 
- 
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile 
ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
 ogdi-3.1.5/ogdi/datum_driver/usa/makefile  2001-02-19 04:12:21.0 
+
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile 2005-08-01 
19:03:24.883993288 +
-@@ -17,7 +17,7 @@
- SOURCES = dtusa.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(PROJ_STATICLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile 
ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
 ogdi-3.1.5/ogdi/driver/adrg/makefile   2001-06-22 16:37:50.0 
+
-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile  2005-08-01 19:06:07.422283712 
+
-@@ -18,7 +18,7 @@
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
- 
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB) 
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile 
ogdi-3.1.5.orig/ogdi/driver/dted/makefile
 ogdi-3.1.5/ogdi/driver/dted/makefile   2001-02-19 04:12:21.0 
+
-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile  2005-08-01 19:06:31.460629328 
+
-@@ -17,7 +17,7 @@
- SOURCES = dted.c utils.c object.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 

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

2018-06-02 Thread Aaron Bauman
commit: f48ee2fcb865734a664954a9a5e58497eab44d37
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jun  3 00:07:05 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jun  3 02:58:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48ee2fc

sci-libs/ogdi: drop old EAPI

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/ogdi/Manifest |  1 -
 sci-libs/ogdi/ogdi-3.1.5-r1.ebuild | 50 --
 2 files changed, 51 deletions(-)

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 03fca35e180..d2b94841f4a 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,3 +1,2 @@
-DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B 
ec60b620823b0ac77823b4c41f828d7edb8651d4ddfdb377c98030b0d58b723b7488d27fff80fc35f7b5040e13022bc8d54e266ec0e2ec2271d96a8902237ccc
 SHA512 
fd77106a25b07bbaba23cab2e9e5298d7df62faf50c9ead72c4def683c4097717559b816a476ddfa16823f23d418a474ec49937b961ba06f606880f3338d6cfd
 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/ogdi-3.1.5-r1.ebuild 
b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
deleted file mode 100644
index 55b9b5f1325..000
--- a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="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=""
-IUSE=""
-
-DEPEND="
-   

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

2018-05-20 Thread Mikle Kolyada
commit: b5132d4bcf95417b620f21f817cec8706e633a8e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May 20 11:12:51 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May 20 11:13:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5132d4b

sci-libs/ogdi: ppc stable wrt bug #649484

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index bdb3f530f1a..1473c674acc 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-04-25 Thread Matt Turner
commit: ebd2146f4b93acfccd8f0c42a874e612f55ca4ab
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Apr 26 05:17:15 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 26 05:17:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd2146f

sci-libs/ogdi: Dropped alpha keywords, bug 649484

 sci-libs/ogdi/ogdi-3.2.0.ebuild   | 2 +-
 sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index f1c34bf7714..bdb3f530f1a 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="

diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild 
b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index a9a42137ca1..4e7a9c4adf8 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-04-15 Thread Thomas Deutschmann
commit: b851f49ea969afd6006291b7d3fcfe3f28031058
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Apr 15 18:55:07 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Apr 15 18:57:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851f49e

sci-libs/ogdi: x86 stable (bug #649484)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index 42fb0b16cb2..f1c34bf7714 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux 
~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-04-15 Thread Sergei Trofimovich
commit: 328aba03b7c54ab3288a9859120df5ad4a81f7fc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr 15 18:40:06 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 15 18:40:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328aba03

sci-libs/ogdi: stable 3.2.0 for ppc64, bug #649484

Bug: https://bugs.gentoo.org/649484
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index c41771a9a70..42fb0b16cb2 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86 ~amd64-linux 
~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-04-14 Thread Aaron Bauman
commit: 12511df1334f03ea9816113f5775ecd33586bbc5
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Apr 14 17:37:05 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Apr 14 17:37:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12511df1

sci-libs/ogdi: amd64 stable

Bug: https://bugs.gentoo.org/649484
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-libs/ogdi/ogdi-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index e844f7644e5..c41771a9a70 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2018-03-03 Thread Andreas Hüttel
commit: dac2e018aad56ee395e1a5160bba19e68caa29ea
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Mar  3 21:05:14 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Mar  3 21:05:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac2e018

sci-libs/ogdi: Version bump, adapted from Dennis Schridde's overlay

Bug: https://bugs.gentoo.org/371389
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/ogdi/Manifest|   1 +
 sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch|  18 +
 sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch  |  77 +
 sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch|  34 ++
 sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch |  27 ++
 sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch  |  25 ++
 sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch |  13 +
 sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch  | 390 ++
 sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch  |  14 +
 sci-libs/ogdi/ogdi-3.2.0.ebuild   |  74 
 10 files changed, 673 insertions(+)

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index ceaa0a96ccd..03fca35e180 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,2 +1,3 @@
 DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B 
ec60b620823b0ac77823b4c41f828d7edb8651d4ddfdb377c98030b0d58b723b7488d27fff80fc35f7b5040e13022bc8d54e266ec0e2ec2271d96a8902237ccc
 SHA512 
fd77106a25b07bbaba23cab2e9e5298d7df62faf50c9ead72c4def683c4097717559b816a476ddfa16823f23d418a474ec49937b961ba06f606880f3338d6cfd
 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.2.0-acinclude.patch 
b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
new file mode 100644
index 000..6952e7d349d
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
@@ -0,0 +1,18 @@
+From 9e56a8be9e228b466d6464f09349a8ea2c3ec637 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde 
+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
new file mode 100644
index 000..bc39b7753d3
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
@@ -0,0 +1,77 @@
+From 2f8d760ac4470e22f2f4965aa3282ea21ffa1f17 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde 
+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 

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

2017-07-20 Thread Sergei Trofimovich
commit: e94a97af0295056c316bc5f75d1ab4c3a0b458ef
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jul 20 20:11:13 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jul 20 20:57:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94a97af

sci-libs/ogdi: ia64 keyworded, bug #10

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild 
b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index ee977f1f6c8..a9a42137ca1 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2017-07-17 Thread Alexis Ballier
commit: 51ae05b9452d76c223a8483900bc76c38cbffa05
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jul 17 09:41:22 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jul 17 09:43:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ae05b9

sci-libs/ogdi: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild 
b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index c9620fe66ba..ee977f1f6c8 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="



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

2017-01-29 Thread David Seifert
commit: f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Jan 29 09:13:48 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 29 20:09:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59566aa

sci-libs/ogdi: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3709

 sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch  | 177 -
 sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch |  13 --
 2 files changed, 190 deletions(-)

diff --git a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch 
b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
deleted file mode 100644
index 33fb561..
--- a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Only in ogdi-3.1.5.orig: bin
-Only in ogdi-3.1.5.orig/config: Linux.mak
-Only in ogdi-3.1.5.orig: config.cache
-Only in ogdi-3.1.5.orig: config.log
-Only in ogdi-3.1.5.orig: config.status
-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
-diff -ur ogdi-3.1.5/external/expat/makefile 
ogdi-3.1.5.orig/external/expat/makefile
 ogdi-3.1.5/external/expat/makefile 2001-08-27 14:11:10.0 +
-+++ ogdi-3.1.5.orig/external/expat/makefile2005-08-01 18:57:49.020052368 
+
-@@ -36,7 +36,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) \
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
-   -DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
- 
- ifeq ($(BIG_ENDIAN),1)
-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
-diff -ur ogdi-3.1.5/external/zlib/makefile 
ogdi-3.1.5.orig/external/zlib/makefile
 ogdi-3.1.5/external/zlib/makefile  2001-04-19 05:26:46.0 +
-+++ ogdi-3.1.5.orig/external/zlib/makefile 2005-08-01 18:58:47.984088472 
+
-@@ -46,7 +46,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- #
- # Primary target
-Only in ogdi-3.1.5.orig/lib: Linux
-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
 ogdi-3.1.5/ogdi/c-api/makefile 2001-04-19 05:29:31.0 +
-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile2005-08-01 18:53:51.936094608 
+
-@@ -23,7 +23,7 @@
-   $(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
-   $(EXPAT_INCLUDE)
- 
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
-   $(PROJ_STATICLIB) $(MATH_LINKLIB)
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile 
ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
 ogdi-3.1.5/ogdi/datum_driver/canada/makefile   2001-02-19 
04:12:21.0 +
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile  2005-08-01 
19:03:00.932634448 +
-@@ -17,7 +17,7 @@
- SOURCES = nadconv.c dtcanada.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= 
- 
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile 
ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
 ogdi-3.1.5/ogdi/datum_driver/usa/makefile  2001-02-19 04:12:21.0 
+
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile 2005-08-01 
19:03:24.883993288 +
-@@ -17,7 +17,7 @@
- SOURCES = dtusa.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(PROJ_STATICLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile 
ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
 ogdi-3.1.5/ogdi/driver/adrg/makefile   2001-06-22 16:37:50.0 
+
-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile  2005-08-01 19:06:07.422283712 
+
-@@ -18,7 +18,7 @@
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PROJ_INCLUDE)
- 
--CFLAGS= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB) 
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile 
ogdi-3.1.5.orig/ogdi/driver/dted/makefile
 ogdi-3.1.5/ogdi/driver/dted/makefile   2001-02-19 04:12:21.0 
+
-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile  2005-08-01 19:06:31.460629328 
+
-@@ -17,7 +17,7 @@
- SOURCES = dted.c utils.c object.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) 
$(PR