gentoo Easter resync : 12.04.2020

3 files changed, 87 insertions, 0 deletions

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index a0edb68e45bc..fc1a00bafd29 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -7,6 +7,9 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435
 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
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
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 000000000000..208bfb2bb023
--- /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 000000000000..a355b84b1d17
--- /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
+}