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

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

[Michał Górny]

commit:     bf674d64ffee9855b42ceb571b2a3abe5f5b5b1c
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 18:59:58 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 10:04:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf674d64

sci-libs/dmlc-core: use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
index 351c6e894b2..adf78c82724 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Common bricks library for building distributed machine learning."
 HOMEPAGE="https://github.com/dmlc/dmlc-core"
 
 if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://github.com/dmlc/dmlc-core.git"
+	EGIT_REPO_URI="https://github.com/dmlc/${PN}.git"
 	inherit git-r3
 	KEYWORDS=""
 else

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

[Zac Medico]

commit:     41dbe8af7723489b98a12f6268113ccd20781cf1
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sat Dec 15 01:20:16 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 22:39:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dbe8af

sci-libs/dmlc-core: remove trailing whitespace

Closes: https://github.com/gentoo/gentoo/pull/10643
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sci-libs/dmlc-core/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/dmlc-core/metadata.xml b/sci-libs/dmlc-core/metadata.xml
index 7fb45e55273..a9cd5175551 100644
--- a/sci-libs/dmlc-core/metadata.xml
+++ b/sci-libs/dmlc-core/metadata.xml
@@ -15,5 +15,5 @@
   </upstream>
   <use>
     <flag name="s3">Support for the Amazon Simple Storage Service</flag>
-  </use>		
+  </use>
 </pkgmetadata>

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

[Sam James]

commit:     c9452adf40e872911ea7e6d630b11ad06c88cd75
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 00:15:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 00:19:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9452adf

sci-libs/dmlc-core: drop trailing full stop from DESCRIPTION

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
index 1d661c8dbc15..06b9ed11eaae 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit toolchain-funcs cmake-utils
 
-DESCRIPTION="Common bricks library for building distributed machine learning."
+DESCRIPTION="Common bricks library for building distributed machine learning"
 HOMEPAGE="https://github.com/dmlc/dmlc-core"
 
 if [[ ${PV} == *9999* ]] ; then

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

[Conrad Kostecki]

commit:     df7dca34da31ac9fde80e499851779c4c7ea5155
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 00:10:52 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 21:07:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7dca34

sci-libs/dmlc-core: fix DeprecatedInsinto

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
index 06b9ed11eaae..c8f88ae4220d 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.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=6
@@ -90,8 +90,7 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/doxygen/html
+		dodoc -r doc/doxygen/html
 		docompress -x /usr/share/doc/${PF}/html
 	fi
 }

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

[Sam James]

commit:     065fb013c767a2f6b3229091b64e92199270c78a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 00:32:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:32:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065fb013

sci-libs/dmlc-core: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/833305
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...0719.ebuild => dmlc-core-0_p20170719-r1.ebuild} | 45 +++++++++++++---------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
similarity index 72%
rename from sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
rename to sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
index c8f88ae4220d..991dc719c890 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs cmake-utils
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Common bricks library for building distributed machine learning"
 HOMEPAGE="https://github.com/dmlc/dmlc-core"
@@ -12,10 +12,11 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/dmlc/${PN}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="54db57d5d1b2a7b93319053011802888b827a539"
+	MY_COMMIT="54db57d5d1b2a7b93319053011802888b827a539"
 	inherit vcs-snapshot
+	SRC_URI="https://github.com/dmlc/dmlc-core/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://github.com/dmlc/dmlc-core/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="Apache-2.0"
@@ -28,9 +29,11 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="net-misc/curl[ssl]"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/gtest )
-"
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontutils
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-install-dirs.patch )
 
@@ -43,13 +46,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
-	# respect user flags (SSE2 does nothing more than adding -msse2)
-	# also doc install everything so remove
+	cmake_src_prepare
+
+	# Respect user flags (SSE2 does nothing more than adding -msse2)
+	# Also doc installs everything, so remove
 	sed -e '/-O3/d' \
 		-e '/check_cxx.*SSE2/d' \
 		-i CMakeLists.txt || die
-	# all these hacks below to allow testing
+
+	# All these hacks below to allow testing
 	sed -e 's|-O3||' -e 's|-lm|-lm -L$(LD_LIBRARY_PATH) -ldmlc|g' -i Makefile || die
 	sed -e "s|libdmlc.a||g" \
 		-i test/dmlc_test.mk test/unittest/dmlc_unittest.mk || die
@@ -66,15 +71,16 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DUSE_S3="$(usex s3)"
-		-DUSE_OPENMP="$(usex openmp)"
+		-DUSE_S3=$(usex s3)
+		-DUSE_OPENMP=$(usex openmp)
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
+
 	if use doc; then
 		doxygen doc/Doxyfile || die
 	fi
@@ -82,13 +88,16 @@ src_compile() {
 
 src_test() {
 	tc-export CXX
-	export LD_LIBRARY_PATH="${BUILD_DIR}"
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}"
+
 	emake test
+
 	test/unittest/dmlc_unittest || die
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
+
 	if use doc; then
 		dodoc -r doc/doxygen/html
 		docompress -x /usr/share/doc/${PF}/html

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

[Andrew Ammerlaan]

commit:     2dad60a86a3a0c7bbc038902f91d2076e7c88d9a
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 13 03:25:59 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 12:07:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dad60a8

sci-libs/dmlc-core: add 0.5

- add cpu_flags_x86_sse2 to IUSE

It's true it only adds an -m flag to CXXFLAGS but so do most uses of
CPU_FLAGS_X86.  Also, remove automagic from CMakeLists.txt and pass
-DSUPPORT_MSSE2 explicitly

- remove patch

Appears to be no longer needed.

- fix dependencies

Make gtest a proper bdep.  The presence of texlive-fontutils appears
irrelevant as the generated docs compare the same.  curl is only
needed for s3.

- fix testing

Portage doesn't set LD_LIBRARY_PATH resulting in a leading colon when
used in LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}". It builds
fine with just -L\"${BUILD_DIR}\" and testing runs fine with just
LD_LIBRARY_PATH="${BUILD_DIR}".

It doesn't appear to need tc-export CXX to find the correct
compiler.

GTEST_LIB needs to be changed to the correct libdir. Otherwise it
passes -L/lib/ triggering it to build in x86 mode and fail at linking
stage. Alter GTEST_INC also for good measure.

Pass -DGOOGLE_TEST for ctest testing, while also keeping non-ctest
tests.

Pass USE_CXX14_IF_AVAILABLE to cmake and change -std=c++11 to
-std=c++14 in the Makefile to support the latest gtest.

- use emake to build docs and tests in src_compile

`emake test` is more appropriate in src_compile.  And `emake doxygen`
works fine to generate docs.

- add little-endian tests

Pass DMLC_UNIT_TEST_LITTLE_ENDIAN for a few more tests.

Closes: https://bugs.gentoo.org/894038
Closes: https://github.com/gentoo/gentoo/pull/29572
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/dmlc-core/Manifest             |   1 +
 sci-libs/dmlc-core/dmlc-core-0.5.ebuild | 105 ++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/sci-libs/dmlc-core/Manifest b/sci-libs/dmlc-core/Manifest
index de2f9fd304d6..6eff176be348 100644
--- a/sci-libs/dmlc-core/Manifest
+++ b/sci-libs/dmlc-core/Manifest
@@ -1 +1,2 @@
+DIST dmlc-core-0.5.tar.gz 256340 BLAKE2B 1a2fd548c704e89adbba397b9f4306ad9439b969755bfd4fa24aad2e58855882dbe69b9c0550b830f8a81dfa41139e22c7ceed0ed707608e31fea1868b707ad4 SHA512 e8292bf71f9d7e31f17add69c984473f8f4d51768c5ac1451dceb9ff3c3e607dd85eea7fb3999f00cf34e962c5956ef1426713b7d8baa5fdbc3aa88e58bed66d
 DIST dmlc-core-0_p20170719.tar.gz 160242 BLAKE2B 2752968c831b5468cb926fbd2783098d1d66f5dd7f06b1abf138e165c637a3c16d477b04b709a05826528ee8e35ed61b563bdaae958fb91c78591dd57761a5f4 SHA512 2e2d79800839652772f07deb5ea3aa470cc5a18d2d0e480b8f4a1598aca72443546a438f3309708268cc49cf2d65684c3366cfc6c33c085baf1b804b4c04f02e

diff --git a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
new file mode 100644
index 000000000000..ae6cb41b64e6
--- /dev/null
+++ b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Common bricks library for building distributed machine learning"
+HOMEPAGE="https://github.com/dmlc/dmlc-core"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/dmlc/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/dmlc/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# hdfs needs big java hdfs not yet in portage
+# azure not yet in portage
+IUSE="cpu_flags_x86_sse2 doc openmp s3 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="s3? ( net-misc/curl[ssl] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )
+	test? ( dev-cpp/gtest )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/-O3/d' -e '/check_cxx_compiler_flag("-msse2"/d' \
+		-e '/check_cxx.*SSE2/d' \
+		-i CMakeLists.txt || die
+
+	# All these hacks below to allow testing
+	sed -e 's|-O3||' -e 's|-std=c++11|-std=c++14|' \
+		-e "s|-lm|-lm -L\"${BUILD_DIR}\" -ldmlc|g" \
+		-i Makefile || die
+	sed -e "s|libdmlc.a||g" \
+		-e "/^GTEST_LIB=/s|=.*|=/usr/$(get_libdir)|" \
+		-e "/^GTEST_INC=/s|=.*|=/usr/include|" \
+		-i test/dmlc_test.mk test/unittest/dmlc_unittest.mk || die
+	# Don't ever download gtest
+	sed -e 's/^if (NOT GTEST_FOUND)$/if (FALSE)/' \
+		-i test/unittest/CMakeLists.txt || die
+	cat <<-EOF > config.mk
+		USE_SSE=$(usex cpu_flags_x86_sse2 1 0)
+		WITH_FPIC=1
+		USE_OPENMP=$(usex openmp 1 0)
+		USE_S3=$(usex s3 1 0)
+		BUILD_TEST=$(usex test 1 0)
+		DMLC_CFLAGS=${CXXFLAGS}
+		DMLC_LDFLAGS=${LDFLAGS}
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_TEST=$(usex test)
+		-DSUPPORT_MSSE2=$(usex cpu_flags_x86_sse2)
+		-DUSE_CXX14_IF_AVAILABLE=YES # Newer gtest needs C++14 or later
+		-DUSE_S3=$(usex s3)
+		-DUSE_OPENMP=$(usex openmp)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && emake doxygen
+	use test && emake test
+}
+
+src_test() {
+	DMLC_UNIT_TEST_LITTLE_ENDIAN=$([[ $(tc-endian) == little ]] && echo 1 || echo 0) \
+	LD_LIBRARY_PATH="${BUILD_DIR}" \
+		test/unittest/dmlc_unittest || die
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r doc/doxygen/html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+}