[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/, dev-libs/m_cli2/, dev-libs/M_CLI2/

[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/, dev-libs/m_cli2/, dev-libs/M_CLI2/

[Sergey Torokhov]

commit:     334cea92526c35a0ba95ae65e7edfd2c182f925a
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Apr 18 22:56:33 2023 +0000
Commit:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Tue Apr 18 22:57:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=334cea92

dev-libs/m_cli2: rename to M_CLI2 to follow upstream naming

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 .../M_CLI2-1.0.0_p20221116-r1.ebuild}                          | 10 +++++-----
 dev-libs/{m_cli2 => M_CLI2}/Manifest                           |  2 +-
 dev-libs/{m_cli2 => M_CLI2}/metadata.xml                       |  0
 dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch                    |  2 +-
 dev-util/fpm/{fpm-0.7.0-r1.ebuild => fpm-0.7.0-r2.ebuild}      |  8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild b/dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild
similarity index 81%
rename from dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild
rename to dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild
index 4097351e9..e7522a112 100644
--- a/dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild
+++ b/dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ m_cli2_sha="90a1a146e19c8ad37b0469b8cbd04bc28eb67a50"
 
 DESCRIPTION="M_CLI2 - parse Unix-like command line arguments from Fortran"
 HOMEPAGE="https://github.com/urbanjost/M_CLI2"
-SRC_URI="https://github.com/urbanjost/M_CLI2/archive/${m_cli2_sha}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/urbanjost/${PN}/archive/${m_cli2_sha}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -20,7 +20,7 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/M_CLI2-${m_cli2_sha}/src"
+S="${WORKDIR}/${PN}-${m_cli2_sha}/src"
 
 src_prepare() {
 	default
@@ -34,7 +34,7 @@ src_compile() {
 		*gfortran* )
 			emake clean
 			emake F90=$(tc-getFC) gfortran
-			$(tc-getFC) -Wl,-soname,lib"${PN}".so.1 ${LDFLAGS} -shared -o lib"${PN}".so.1 M_CLI2.o;;
+			$(tc-getFC) -Wl,-soname,lib"${PN}".so.1 ${LDFLAGS} -shared -o lib"${PN}".so.1 ${PN}.o;;
 		* )
 			die "Sorry, only GNU gfortran is currently supported in the ebuild" ;;
 	esac
@@ -46,7 +46,7 @@ src_test() {
 
 src_install() {
 	insinto "/usr/include/${PN}"
-	doins "${PN}.mod"
+	doins "m_cli2.mod"
 	dolib.so "lib${PN}.so.1"
 	dosym  "lib${PN}.so.1" "/usr/$(get_libdir)/lib${PN}.so"
 }

diff --git a/dev-libs/m_cli2/Manifest b/dev-libs/M_CLI2/Manifest
similarity index 79%
rename from dev-libs/m_cli2/Manifest
rename to dev-libs/M_CLI2/Manifest
index a4c3673e0..493367e93 100644
--- a/dev-libs/m_cli2/Manifest
+++ b/dev-libs/M_CLI2/Manifest
@@ -1 +1 @@
-DIST m_cli2-1.0.0_p20221116.tar.gz 13771712 BLAKE2B a97eb944e7a117f821822a6018d27e666ad9e761cc0d0c6901ae384b1d1d19002ee117d22695e7cfbca62e8038adcdc11d902af58f15a61f44a0e3850b8547b5 SHA512 47ede587a6fd10a8f68deae0df0eb380a51499ed15b736905054619eefd25f018189f656384fa8d72093f622e0a9871cfdea81796a9f9071e797086182f8bd57
+DIST M_CLI2-1.0.0_p20221116.tar.gz 13771712 BLAKE2B a97eb944e7a117f821822a6018d27e666ad9e761cc0d0c6901ae384b1d1d19002ee117d22695e7cfbca62e8038adcdc11d902af58f15a61f44a0e3850b8547b5 SHA512 47ede587a6fd10a8f68deae0df0eb380a51499ed15b736905054619eefd25f018189f656384fa8d72093f622e0a9871cfdea81796a9f9071e797086182f8bd57

diff --git a/dev-libs/m_cli2/metadata.xml b/dev-libs/M_CLI2/metadata.xml
similarity index 100%
rename from dev-libs/m_cli2/metadata.xml
rename to dev-libs/M_CLI2/metadata.xml

diff --git a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch
index 08000553f..8d0685e3e 100644
--- a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch
+++ b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch
@@ -15,7 +15,7 @@ diff -Naur a/fpm.toml b/fpm.toml
 -rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24"
 +[build]
 +external-modules = ["tomlf", "m_cli2"]
-+link = ["toml-f","m_cli2"]
++link = ["toml-f","M_CLI2"]
  
  [[test]]
  name = "cli-test"

diff --git a/dev-util/fpm/fpm-0.7.0-r1.ebuild b/dev-util/fpm/fpm-0.7.0-r2.ebuild
similarity index 93%
rename from dev-util/fpm/fpm-0.7.0-r1.ebuild
rename to dev-util/fpm/fpm-0.7.0-r2.ebuild
index ab52e3b87..fba8f63c4 100644
--- a/dev-util/fpm/fpm-0.7.0-r1.ebuild
+++ b/dev-util/fpm/fpm-0.7.0-r2.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-libs/toml-f:0/2
-	dev-libs/m_cli2
+	dev-libs/M_CLI2
 "
 
 RDEPEND="
@@ -88,7 +88,7 @@ src_compile() {
 	"$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die
 
 	# Use the bootstrap binary to build the feature complete fpm version
-	"${BSDIR}"/fpm build --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \
+	"${BSDIR}"/fpm build --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \
 		--c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \
 		--cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \
 		--archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" || die
@@ -100,7 +100,7 @@ src_compile() {
 }
 
 src_test() {
-	"${BSDIR}"/fpm test --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \
+	"${BSDIR}"/fpm test --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \
 		--c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \
 		--cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \
 		--archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die
@@ -109,7 +109,7 @@ src_test() {
 src_install() {
 	# Set prefix and pass all used env flags to avoid recompiling with default values
 	"${BSDIR}"/fpm install --prefix "${ED}/usr" \
-		--compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \
+		--compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \
 		--c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \
 		--cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \
 		--archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die