Merge updates from master

dev-python/gbinder/gbinder-1.1.1-r11.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1
+
+if [[ ${PV} != *9999* ]]; then
+	MY_PN="${PN}-python"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/erfanoabdi/gbinder-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/erfanoabdi/gbinder-python.git"
+fi
+
+DESCRIPTION="Python bindings for libgbinder"
+HOMEPAGE="https://github.com/erfanoabdi/gbinder-python"
+LICENSE="GPL-3"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}"/gbinder-1.1.1-setuptools.patch
+)
+
+
+DEPEND="dev-libs/gbinder
+	dev-libs/libglibutil"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	=dev-python/cython-0*[${PYTHON_USEDEP}]
+	${DISTUTILS_DEPS}
+"
+
+python_configure_all () {
+	DISTUTILS_ARGS=( --cython )
+}

dev-vcs/gitqlient/Manifest

@@ -1,6 +1 @@
-DIST gitqlient-1.6.1.tar.gz 4971880 BLAKE2B b793dd406d1dff7aa193916a08dc5c10159eb54f79d2d9930b672aed5ee5d98fe3d6afb1869032bdeee1790b078a5fefa8064506353d56e870ea95bb24ebcc26 SHA512 e115c9fca6c8fe17b32d326a7f649d35ea55fd1f4c1df7c30962e9f07382d246cd23b8dbdbf6759620d1ba7ba9c48c7a391b2e0a730a58bba9f1ba6425a2da9e
-DIST gitqlient-1.6.2_pre20230519.tar.gz 4460989 BLAKE2B 1d78f1e9314df2e6519925fa88b7a69bb3c719333c0f687beaaef2ed8d7dbf4b1a364298bc4e5882f5301f6f6ca083668f1b417c7706c622369bccf2fb6cad1a SHA512 f9f83162ed83811604cd9b25a79160bb89997bdf53d930f7466c02d9c725b3300d282d86c83ac967fbcfe5c080b47e23ef4691d081f82c5356d17204867ed661
-DIST gitqlient-1.6.2_pre20230519_AuxiliarCustomWidgets.tar.gz 438806 BLAKE2B 67bf89225c661f63c8db72aad0c77213250b928394b65e1829a48994bde4856901287cc9d2f54070b16be8184b0219575ccb92fdfaedf7888d50e2f159dbcbb4 SHA512 2b2fc8e6cac17c60406c5e7ecef0d0a0eb330aec316132f207c39ba2908e169bdbd1b66196c0a8c574c7361bc12374c53167cec1886c6db19ca2aa9203937dc6
-DIST gitqlient-1.6.2_pre20230519_QLogger.tar.gz 20306 BLAKE2B 44bb82e964a2ca5fa5332056cbc868880d867e06da6f2a6e7684275910d9addd23c0c9f1dd20c21d90b75658306468865894848ea8338cfd5c8b0a3b8db92484 SHA512 97e717c78244d3da659b279e43bf6ea0d2033295dadf05cbb97b4640d55f0fa94ccac9c69e22798d7ba4ec12bcb7c9e5e8840bfdf62b118711d9a2da298b1515
-DIST gitqlient-1.6.2_pre20230519_QPinnableTabWidget.tar.gz 13442 BLAKE2B 8c4ee4f1329ec94792ea15402fb922a83e7cb38ff5bd8d5b2dfe26bd312cd898653fe1d7abc013bb76ba826c4d6db1803a31240a22a9fcbc0578bf2ded04fe4c SHA512 dab9220ac6dbd3795276d5432b4366aa124d6c147160452009341868b4c5af0644816070c8dc82178ff7fea5a13e92822182ed9cecbeba7deda45107c40c5e28
-DIST gitqlient-1.6.2_pre20230519_git.tar.gz 29744 BLAKE2B 9de7aa2ef301284f115aa641cb76faeb514e993c46eb8a47a26f331042cc30c17fbd7ffbbca17d3c4b2897f77890111a869edc58bcdbe32c63391288a052e567 SHA512 6fce2357bf54e96410e7023b7150f02a7c9e7b17b3df386db0de561fdf1874101880ec6f393052f2b7ea9fd634df9e59e3941d04310fd4b50c4dbf066fc4b8dc
+DIST gitqlient-1.6.2.tar.gz 4975350 BLAKE2B 86edd00f8b5647d9e9f7096f5306d330c66e0eb474447df94a320734126c37e370384ddf12fdec58764d57834c1a0b9489911db1b4f590368da1de904eafb51a SHA512 ca8c6c30b7acade8120afa9df568d6b61f4f521b13f5541bc136810a014d4ace30c54ca973ddd4a4368a6f59f22ec3d91b87bac8a6c9861953ac1ee0195d717e

dev-vcs/gitqlient/gitqlient-1.6.2.ebuild

@@ -32,10 +32,10 @@ src_prepare() {
 	default
 
 	# Drop 'fatal' warning on version detection via git command:
-	sed -i -e "/^GQ_SHA/d" \
-		-e "/VERSION =/s| \$\$system(git rev-parse --short HEAD)||" "${MY_PN}".pro || die
-
-	sed -i -e "s/Office/Development/" "${S}/src/resources/${PN}.desktop" || die
+	sed -i -e '/message("Submodule update:")/d' \
+		-e "/system(git submodule update --init --recursive)/d" \
+		-e "/GQ_SHA =/s| \$\$system(git rev-parse --short HEAD)||" \
+		-e "/VERSION =/s| \$\$system(git describe --abbrev=0)||" "${MY_PN}".pro || die
 }
 
 src_configure() {

dev-vcs/gitqlient/gitqlient-1.6.2_pre20230519.ebuild

@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature qmake-utils xdg
-
-MY_PN="GitQlient"
-gitqlient_sha="5a6175431261b99c0f9c37e2194f92a8bafe29f9"
-AuxiliarCustomWidgets_sha="f86e72abd442f73b1e3b10ac922908d03444f115"
-QLogger_sha="ce2f35bad6440a14802fed6c043323d4227ef9a9"
-QPinnableTabWidget_sha="40d0a02e5bdf2f49f9ea41ca533093b2808b0140"
-git_sha="fd6588d07bcbf77c86265392809b9a92ee3f8189"
-
-DESCRIPTION="Multi-platform Git client written with Qt"
-HOMEPAGE="https://github.com/francescmm/GitQlient"
-
-SRC_URI="
-	https://github.com/francescmm/${MY_PN}/archive/${gitqlient_sha}.tar.gz -> ${P}.tar.gz
-	https://github.com/francescmm/AuxiliarCustomWidgets/archive/${AuxiliarCustomWidgets_sha}.tar.gz \
-		-> ${P}_AuxiliarCustomWidgets.tar.gz
-	https://github.com/francescmm/QLogger/archive/${QLogger_sha}.tar.gz -> ${P}_QLogger.tar.gz
-	https://github.com/francescmm/QPinnableTabWidget/archive/${QPinnableTabWidget_sha}.tar.gz \
-		-> ${P}_QPinnableTabWidget.tar.gz
-	https://github.com/francescmm/git/archive/${git_sha}.tar.gz -> ${P}_git.tar.gz
-"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${MY_PN}-${gitqlient_sha}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"
-
-src_prepare() {
-	default
-
-	mv -T "${WORKDIR}/AuxiliarCustomWidgets-${AuxiliarCustomWidgets_sha}" "${S}/src/AuxiliarCustomWidgets" || die
-	mv -T "${WORKDIR}/QLogger-${QLogger_sha}" "${S}/src/QLogger" || die
-	mv -T "${WORKDIR}/QPinnableTabWidget-${QPinnableTabWidget_sha}" "${S}/src/QPinnableTabWidget" || die
-	mv -T "${WORKDIR}/git-${git_sha}" "${S}/src/git" || die
-
-	# Drop 'fatal' warning on version detection via git command:
-	sed -i -e '/message("Submodule update:")/d' \
-		-e "/system(git submodule update --init --recursive)/d" \
-		-e "/GQ_SHA =/s| \$\$system(git rev-parse --short HEAD)||" \
-		-e "/VERSION =/s| \$\$system(git describe --abbrev=0)||" "${MY_PN}".pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr "${MY_PN}".pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	optfeature "Terminal tab plugin support" x11-libs/qtermwidget
-	optfeature "GitServer plugin support" dev-vcs/gitqlient-gitserver-plugin
-	optfeature "Jenkins plugin support"  dev-vcs/gitqlient-jenkins-plugin
-	elog "To use plugins set PluginFolder in GitQlient settings Plugin tab to /usr/$(get_libdir)"
-	xdg_pkg_postinst
-}

x11-libs/gtk-fortran/Manifest

@@ -1,3 +1,4 @@
 DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766 SHA512 3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1
 DIST gtk-fortran-4.3.0.tar.gz 4270611 BLAKE2B 6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab610102222c5440e668f623fc6ec88a590ccb83ff32 SHA512 0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c
 DIST gtk-fortran-4.4.0.tar.gz 4442859 BLAKE2B de24779cc457d92fdcc5e7cc3e37dc3dd9f557b799e4186e6e03b1c39ce3520d3cc0896817810936644839491a9b0886ed77b60ba22cc30f1b31c4d66adcfe23 SHA512 c597875fe6163e82348b5464ad08fb11bfc9c4e64d04b49d47ccd9ef58ba0771db1ea201f1fc6265967b1689e29bc3bec1f089032b5111148ebe07a88a5f3c1b
+DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d SHA512 4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a33334001ac26c04453e15c345

x11-libs/gtk-fortran/gtk-fortran-4.4.1.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_STANDARD=2003
+VIRTUALX_REQUIRED="test"
+
+inherit cmake fortran-2 virtualx
+
+DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
+HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
+SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples high-level plplot static-libs test"
+REQUIRED_USE="plplot? ( high-level )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gui-libs/gtk:4
+	plplot? ( >=sci-libs/plplot-5.15.0[cairo,fortran] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/fortran
+	virtual/pkgconfig
+"
+
+DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	# Fix library installation path, disable 'sketcher' build, pass LDFLAGS
+	sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \
+		-e "s:    add_subdirectory(sketcher)::" \
+		-e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DEXCLUDE_PLPLOT=$(usex plplot false true)
+		-DNO_BUILD_HL=$(usex high-level false true)
+		-DINSTALL_EXAMPLES=$(usex examples)
+		-DNO_BUILD_EXAMPLES=true
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove static library here as it's used to build additional tools
+	if use !static-libs ; then
+		rm "${ED}/usr/$(get_libdir)/libgtk-${SLOT}-fortran.a" || die
+	fi
+}