From 590b9b7b03bf4651e099949e318755af7cfa81b8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 1 Aug 2021 22:03:23 +0100
Subject: gentoo resync : 01.08.2021

---
 sci-libs/cdf/Manifest            |   2 +-
 sci-libs/cdf/cdf-3.8.0-r1.ebuild | 135 +++++++++++++++++++++++++++++++++++++++
 sci-libs/cdf/cdf-3.8.0.ebuild    | 133 --------------------------------------
 3 files changed, 136 insertions(+), 134 deletions(-)
 create mode 100644 sci-libs/cdf/cdf-3.8.0-r1.ebuild
 delete mode 100644 sci-libs/cdf/cdf-3.8.0.ebuild

(limited to 'sci-libs/cdf')

diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 1d0963cade12..444860d31a07 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -9,5 +9,5 @@ DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a
 DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
 DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
 DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
-EBUILD cdf-3.8.0.ebuild 3247 BLAKE2B 1a803b6b61f99dde5075cbd3a1259ed93177e6c8a02bdc30bcdbb295ec1936360f1f11b646fbf4641a500d345f21126aa822adc08f0d429b56f95bb015b0ec4c SHA512 57c2263a5b96681c04fbc0472ad7e8db255b01ab6922037ba7af7c3fed3945f4860be75bcc5f90e5c685aa10fe913b153d7040887d9fa57dcff195494028c2e2
+EBUILD cdf-3.8.0-r1.ebuild 3243 BLAKE2B 38829e729888e48e6cb17169aca9f76acb89247e8da0ee6f7815f718c0df1cf3e332ccd4d47cf3cecb57601a16d186308b647d7a9b2f0a7f95234d34e077463f SHA512 7138664c012bd17c6219feb81493d295c36276e7eabdeef47957452df0b3c26829d3c0748a926b993b17fd614e4a83d0cfdca9e6bc76c6241353ac65af3e909f
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..5d8499adc51c
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multilib toolchain-funcs
+
+MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
+MY_P="${MY_DP}_$(ver_cut 3)"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="https://cdf.gsfc.nasa.gov"
+SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
+
+SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
+	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
+	doc? (
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
+	)"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.8:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+# respect cflags, ldflags, soname
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# use proper lib dir
+	sed -i \
+		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	PV_SO=${PV:0:1}
+	emake \
+		OS=linux \
+		AR=$(tc-getAR) \
+		CC=$(tc-getCC) \
+		LD=$(tc-getCC) \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
+		CURSES=$(usex ncurses) \
+		${myconf} \
+		all
+
+	if use java; then
+		export CDF_BASE="${S}"
+		export CDF_LIB="${S}/src/lib"
+		cd cdfjava/jni
+		$(tc-getCC) \
+			${CFLAGS} -fPIC \
+			-I${CDF_BASE}/src/include \
+			-I$(java-config -O)/include \
+			-I$(java-config -O)/include/linux \
+			-c cdfNativeLibrary.c \
+			-o cdfNativeLibrary.o \
+			|| die "compiling java lib failed"
+		$(tc-getCC) \
+			${LDFLAGS} \
+			-shared cdfNativeLibrary.o \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-L${CDF_LIB} -lcdf -lm \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir)
+	# -j1 (fragile non-autotooled make)
+	emake -j1 \
+		INSTALLDIR="${ED}/usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
+	dodoc Release.notes CHANGES.txt Welcome.txt
+	doenvd "${FILESDIR}"/50cdf
+
+	if use doc; then
+		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*
+	fi
+
+	if use java; then
+		cd cdfjava || die
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		java-pkg_dojar */*.jar
+		if use examples; then
+			docinto examples/java
+			dodoc examples/*
+		fi
+	fi
+
+	# move this to a better location
+	dodir "/usr/share/${PF}"
+	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
+}
diff --git a/sci-libs/cdf/cdf-3.8.0.ebuild b/sci-libs/cdf/cdf-3.8.0.ebuild
deleted file mode 100644
index 84faafaf9a4d..000000000000
--- a/sci-libs/cdf/cdf-3.8.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multilib toolchain-funcs
-
-MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
-MY_P="${MY_DP}_$(ver_cut 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-RESTRICT="bindist"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.8:= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-# respect cflags, ldflags, soname
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		CC=$(tc-getCC) \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			docinto /usr/share/doc/${PF}/examples/java
-			dodoc examples/*
-		fi
-	fi
-
-	# move this to a better location
-	dodir "/usr/share/${PF}"
-	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
-}
-- 
cgit v1.2.3