From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 9 Jul 2022 15:43:36 +0100
Subject: gentoo resync : 09.07.2022

---
 sci-libs/ogdi/Manifest             |  2 +-
 sci-libs/ogdi/ogdi-4.1.0-r1.ebuild | 68 ++++++++++++++++++++++++++++++++++++++
 sci-libs/ogdi/ogdi-4.1.0.ebuild    | 60 ---------------------------------
 3 files changed, 69 insertions(+), 61 deletions(-)
 create mode 100644 sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
 delete mode 100644 sci-libs/ogdi/ogdi-4.1.0.ebuild

(limited to 'sci-libs/ogdi')

diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 38cfecf35162..169bc705ac54 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -3,5 +3,5 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
-EBUILD ogdi-4.1.0.ebuild 1299 BLAKE2B b0c013ce813035f657f2e4630b2ee664be67d84a45d04e5419c61a6e30b28a6801040f31ab4dd412a23bf52ec3277315c07e49c58fdc84830bf04d488494a24b SHA512 517d39b3e64d1964b0af9c208c6db6779dd6cc7652b5dd5374768aba7233d726a6ad74bc0cf6b5d6982047a6bff95708bbc5dc8b64ecfe94f47fbfd21514e993
+EBUILD ogdi-4.1.0-r1.ebuild 1378 BLAKE2B 617e9ba313770b0a84b855fc26aaf715a1aaa8432c18f1ec3ed1fde28d5fc326336d0cb3acf49eeea21a3e1ed80fba3e83f215294c86bca5036eb0c0f1f2862a SHA512 6851b63d960b9da4c66f6d606f698cc809393e37cb09c0ab5c469f224594a937c13fa81ec503094067340a72706d8d5c77b958f67e47138227606bb2fce3b9d7
 MISC metadata.xml 338 BLAKE2B ebaad9e5a8ca2e2e604eab4fcf9c65774a5ee60eb5d937bd1b7e2f95f60f9d41f528ff8688cf85399cc9220b65fbeaaa8977937425733193dd57bf64c3880c00 SHA512 8408f1fdfa99c7ed449e0f14129ec260f9c166e16db9e775cc245735f733da3968a4ada840f2409d6fa8e7121e99e91dbe02fcf9ac28c5f8598e93db3298d551
diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..72f6e8d93cd2
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 ~riscv 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*
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins ogdi.pc
+
+	dobin ogdi-config
+
+	einstalldocs
+}
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
deleted file mode 100644
index 8a821d13f953..000000000000
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 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 ~riscv 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
-}
-- 
cgit v1.2.3