[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2024-05-05 Thread Julien Roy
commit: d43712eb2aa69cf1085ca185109df832141e0913
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  5 14:50:53 2024 +
Commit: Julien Roy  jroy  ca>
CommitDate: Sun May  5 14:50:53 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d43712eb

x11-libs/gtk-fortran: 4.5.0 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index b8ae265fa1..4f59aa219c 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 
9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766
 SHA512 
3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1
 DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 
23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d
 SHA512 
4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a4001ac26c04453e15c345
+DIST gtk-fortran-4.5.0.tar.gz 4450701 BLAKE2B 
af34b2ce5b9d91dd61121580dd1ec84e29411269f131fc6df4b95012fae30555a8d08bf147e07ad459bba11c5b3b92fd6d3925f92a318ca47822e86ad2a57b29
 SHA512 
2fa0957c6367fbcc29050a540700e975ca9356530047c229b6302cf3017d352dce57f4f06fcc52471fce9d7ffdc260ff7ee1cf662e6f2cc029245010d6e9084a

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild
new file mode 100644
index 00..a1b763fb8f
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2024-05-05 Thread Julien Roy
commit: 227cf753c9505f201e83a144c1a243adedd407b9
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  5 14:48:16 2024 +
Commit: Julien Roy  jroy  ca>
CommitDate: Sun May  5 14:48:16 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=227cf753

x11-libs/gtk-fortran: drop old 4.3.0, 4.4.0

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  2 -
 x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild | 71 ---
 x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild | 71 ---
 3 files changed, 144 deletions(-)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index dd71f485fc..b8ae265fa1 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,4 +1,2 @@
 DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 
9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766
 SHA512 
3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1
-DIST gtk-fortran-4.3.0.tar.gz 4270611 BLAKE2B 
6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab61010c5440e668f623fc6ec88a590ccb83ff32
 SHA512 
0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c
-DIST gtk-fortran-4.4.0.tar.gz 4442859 BLAKE2B 
de24779cc457d92fdcc5e7cc3e37dc3dd9f557b799e4186e6e03b1c39ce3520d3cc0896817810936644839491a9b0886ed77b60ba22cc30f1b31c4d66adcfe23
 SHA512 
c597875fe6163e82348b5464ad08fb11bfc9c4e64d04b49d47ccd9ef58ba0771db1ea201f1fc6265967b1689e29bc3bec1f089032b548ebe07a88a5f3c1b
 DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 
23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d
 SHA512 
4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a4001ac26c04453e15c345

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild
deleted file mode 100644
index 01663bcd6d..00
--- a/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 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
-}

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild
deleted file mode 100644
index 7a016cdfc7..00
--- a/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 

[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2024-05-05 Thread Julien Roy
commit: abe2f26c921004879121f87521dc992bef5b3451
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  5 14:51:38 2024 +
Commit: Julien Roy  jroy  ca>
CommitDate: Sun May  5 14:51:38 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=abe2f26c

x11-libs/gtk-fortran: 4.6.0 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 4f59aa219c..4fa033d11a 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/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.4.1.tar.gz 4443829 BLAKE2B 
23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d
 SHA512 
4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a4001ac26c04453e15c345
 DIST gtk-fortran-4.5.0.tar.gz 4450701 BLAKE2B 
af34b2ce5b9d91dd61121580dd1ec84e29411269f131fc6df4b95012fae30555a8d08bf147e07ad459bba11c5b3b92fd6d3925f92a318ca47822e86ad2a57b29
 SHA512 
2fa0957c6367fbcc29050a540700e975ca9356530047c229b6302cf3017d352dce57f4f06fcc52471fce9d7ffdc260ff7ee1cf662e6f2cc029245010d6e9084a
+DIST gtk-fortran-4.6.0.tar.gz 4697411 BLAKE2B 
c72b00407979e40e77ebd622d019e872d17c1e42b77b085556e283c203b89b25fc02a516bfe5785891ae39c757c562d2ead18df8d71a795f9472fbca840dde7b
 SHA512 
64d33fccb2867ef56ff9cbf4cf407b82f862e0c4bb7fb4dbdbaa0fd5d77bfcbee787f5030f62016687cf83e067c1dd4d8f25fef2e77c23d3b67f80ff8cbf0103

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild
new file mode 100644
index 00..a1b763fb8f
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2023-09-12 Thread David Roman
commit: 1dcd4dd56aa63d4853bac37c288ae254bfee01f3
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Sep 12 13:34:07 2023 +
Commit: David Roman  gmail  com>
CommitDate: Tue Sep 12 13:34:07 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1dcd4dd5

x11-libs/gtk-fortran: 4.4.1 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-4.4.1.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index a0c1039429..dd71f485fc 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/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 
6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab61010c5440e668f623fc6ec88a590ccb83ff32
 SHA512 
0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c
 DIST gtk-fortran-4.4.0.tar.gz 4442859 BLAKE2B 
de24779cc457d92fdcc5e7cc3e37dc3dd9f557b799e4186e6e03b1c39ce3520d3cc0896817810936644839491a9b0886ed77b60ba22cc30f1b31c4d66adcfe23
 SHA512 
c597875fe6163e82348b5464ad08fb11bfc9c4e64d04b49d47ccd9ef58ba0771db1ea201f1fc6265967b1689e29bc3bec1f089032b548ebe07a88a5f3c1b
+DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 
23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d
 SHA512 
4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a4001ac26c04453e15c345

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.4.1.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.4.1.ebuild
new file mode 100644
index 00..7a016cdfc7
--- /dev/null
+++ b/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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2022-12-05 Thread Viorel Munteanu
commit: fdbef56ff4e6d98b217aad54f2f1890abbedf7d8
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Dec  3 16:26:13 2022 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sat Dec  3 16:26:13 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fdbef56f

x11-libs/gtk-fortran: drop old 3.24.30-r1, 4.1.0-r1, 4.2.1

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest  |  3 -
 x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild | 71 --
 x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild   | 71 --
 x11-libs/gtk-fortran/gtk-fortran-4.2.1.ebuild  | 71 --
 4 files changed, 216 deletions(-)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index e7f5003fd..f9174fd44 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,5 +1,2 @@
-DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 
4b18d21e0479496caea386450fc16c12d20ad3491932b331890b5d7328c704799f8dd288c4a1d0d2e34f0957f0bdca316f820850b80c4ff8d2b66ce3673fe5ec
 SHA512 
4e1cd522ca80db01a1058d6c58b4a6e3e63e6b1d510e2ee5fd0b8f8aa9f9dc8e433d203781c908065571c4c1a6d9686c22eec879b396352b12fa82b604855c86
 DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 
9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766
 SHA512 
3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1
-DIST gtk-fortran-4.1.0.tar.gz 4100843 BLAKE2B 
c11658472c4f2ad9916f8f421f0d1c48b9ec7874e9e4075f2247e7cfb33ed69946e644aa9a460d63ff676c075b76caf4c70bd09532dda53b4d2035c88b3c1c61
 SHA512 
cd4628a56b2a03f7e958d4284c595b573ab84ac6c630cfae4f3ed13bb6d19a66246cb6adac8b05104f562406a467c03841cf350f8482e7e9f8fd596de4f4c873
-DIST gtk-fortran-4.2.1.tar.gz 4111001 BLAKE2B 
9cfeb8ef0fff6ab215cc421107ad643370d96ccfdfaac062af46e1793742d53ffcb11169db88a12711fea5309f2d339c2716be20e3e36fe3cc762864c611e732
 SHA512 
ea2650208f453e8292df1d4e05460b221146ff44e50513702eb5ad4b689d40f6bbd0935d1d617845e3927d25ff3f069a08032b89035d06e5ad688f7d281a2cd9
 DIST gtk-fortran-4.3.0.tar.gz 4270611 BLAKE2B 
6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab61010c5440e668f623fc6ec88a590ccb83ff32
 SHA512 
0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c

diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
deleted file mode 100644
index e8bf7a4aa..0
--- a/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 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="3"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples high-level plplot static-libs test"
-REQUIRED_USE="plplot? ( high-level )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   x11-libs/gtk+:3
-   plplot? ( >=sci-libs/plplot-5.13.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
-}

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
deleted file mode 100644
index 1e6bf531f..0
--- a/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU 

[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2022-11-16 Thread Florian Schmaus
commit: b3b111af7f620928875e674a420356dff8a96bd0
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Nov 14 11:17:32 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Nov 14 11:17:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b3b111af

x11-lib/gtk-fortran: 4.3.0 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index a55470946..e7f5003fd 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -2,3 +2,4 @@ DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 
4b18d21e0479496caea386450fc16c12
 DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 
9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766
 SHA512 
3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1
 DIST gtk-fortran-4.1.0.tar.gz 4100843 BLAKE2B 
c11658472c4f2ad9916f8f421f0d1c48b9ec7874e9e4075f2247e7cfb33ed69946e644aa9a460d63ff676c075b76caf4c70bd09532dda53b4d2035c88b3c1c61
 SHA512 
cd4628a56b2a03f7e958d4284c595b573ab84ac6c630cfae4f3ed13bb6d19a66246cb6adac8b05104f562406a467c03841cf350f8482e7e9f8fd596de4f4c873
 DIST gtk-fortran-4.2.1.tar.gz 4111001 BLAKE2B 
9cfeb8ef0fff6ab215cc421107ad643370d96ccfdfaac062af46e1793742d53ffcb11169db88a12711fea5309f2d339c2716be20e3e36fe3cc762864c611e732
 SHA512 
ea2650208f453e8292df1d4e05460b221146ff44e50513702eb5ad4b689d40f6bbd0935d1d617845e3927d25ff3f069a08032b89035d06e5ad688f7d281a2cd9
+DIST gtk-fortran-4.3.0.tar.gz 4270611 BLAKE2B 
6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab61010c5440e668f623fc6ec88a590ccb83ff32
 SHA512 
0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild
new file mode 100644
index 0..01663bcd6
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/

2021-10-27 Thread Florian Schmaus
commit: 2268e58d2c0e577d6c35c4eb1683cb7fce0be95d
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Oct 27 00:08:26 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Oct 27 00:09:40 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2268e58d

x11-libs/gtk-fortran: change version numbering. Add SLOT

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest | 2 +-
 ...ic-build.patch => gtk-fortran-3.24.18_skip-static-build.patch} | 0
 .../{gtk-fortran-20.04.ebuild => gtk-fortran-3.24.18.ebuild}  | 8 
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 260c8d2b8..ee062a8a9 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1 @@
-DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
+DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5

diff --git 
a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch 
b/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
similarity index 100%
rename from x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
rename to x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch

diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
similarity index 87%
rename from x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
index 02d8cd0a1..e0c095bfb 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,12 @@ inherit cmake fortran-2
 
 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}.gtk3.24.18.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/vmagnin/${PN}/archive/v20.04.gtk${PV}.tar.gz -> 
${P}.tar.gz"
 
-S="${WORKDIR}/${P}.gtk3.24.18"
+S="${WORKDIR}/${PN}-20.04.gtk${PV}"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="3"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="examples high-level plplot static-libs"



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2021-10-27 Thread Florian Schmaus
commit: 347c3d914b7e2cd7e77841d4b86ad49a0a877d7a
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Oct 27 00:13:13 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Oct 27 00:13:13 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=347c3d91

x11-libs/gtk-fortran: 4.1.0 version bump, new SLOT

SLOT="4" depends on gui-libs/gtk:4 instead of x11-libs/gtk+:3
and could be installed independently of x11-libs/gtk-fortran:3

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild | 64 +++
 2 files changed, 65 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 67d6d1499..010a18a62 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
 DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 
4b18d21e0479496caea386450fc16c12d20ad3491932b331890b5d7328c704799f8dd288c4a1d0d2e34f0957f0bdca316f820850b80c4ff8d2b66ce3673fe5ec
 SHA512 
4e1cd522ca80db01a1058d6c58b4a6e3e63e6b1d510e2ee5fd0b8f8aa9f9dc8e433d203781c908065571c4c1a6d9686c22eec879b396352b12fa82b604855c86
+DIST gtk-fortran-4.1.0.tar.gz 4100843 BLAKE2B 
c11658472c4f2ad9916f8f421f0d1c48b9ec7874e9e4075f2247e7cfb33ed69946e644aa9a460d63ff676c075b76caf4c70bd09532dda53b4d2035c88b3c1c61
 SHA512 
cd4628a56b2a03f7e958d4284c595b573ab84ac6c630cfae4f3ed13bb6d19a66246cb6adac8b05104f562406a467c03841cf350f8482e7e9f8fd596de4f4c873

diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
new file mode 100644
index 0..b95e91696
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_STANDARD=2003
+
+inherit cmake fortran-2
+
+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"
+REQUIRED_USE="plplot? ( high-level )"
+
+RDEPEND="
+   gui-libs/gtk:4
+   plplot? ( >=sci-libs/plplot-5.13.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 and disable 'sketcher' build
+   sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR 
$(get_libdir):" \
+   -e "s:add_subdirectory(sketcher)::" 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_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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2021-10-27 Thread Florian Schmaus
commit: 709dab81c97bef47a2b1cea9fb0db62e71b839ac
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Oct 27 00:11:18 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Oct 27 00:11:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=709dab81

x11-libs/gtk-fortran: 3.24.30 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest   |  1 +
 x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild | 64 +
 2 files changed, 65 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index ee062a8a9..67d6d1499 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1,2 @@
 DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
+DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 
4b18d21e0479496caea386450fc16c12d20ad3491932b331890b5d7328c704799f8dd288c4a1d0d2e34f0957f0bdca316f820850b80c4ff8d2b66ce3673fe5ec
 SHA512 
4e1cd522ca80db01a1058d6c58b4a6e3e63e6b1d510e2ee5fd0b8f8aa9f9dc8e433d203781c908065571c4c1a6d9686c22eec879b396352b12fa82b604855c86

diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
new file mode 100644
index 0..243d4c8fb
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_STANDARD=2003
+
+inherit cmake fortran-2
+
+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="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples high-level plplot static-libs"
+REQUIRED_USE="plplot? ( high-level )"
+
+RDEPEND="
+   x11-libs/gtk+:3
+   plplot? ( >=sci-libs/plplot-5.13.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 and disable 'sketcher' build
+   sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR 
$(get_libdir):" \
+   -e "s:add_subdirectory(sketcher)::" 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_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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/

2021-04-24 Thread Theo Anderson
commit: 9ed66356cae4e3204511fdf7196e8410136c32d4
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Apr 24 11:44:17 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Sat Apr 24 11:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9ed66356

x11-libs/gtk-fortran: drop 19.04

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest  |  1 -
 .../files/gtk-fortran-NO_BUILD_HL-option.patch | 96 --
 x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild  | 79 --
 x11-libs/gtk-fortran/metadata.xml  |  1 -
 4 files changed, 177 deletions(-)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index bf51ff021..260c8d2b8 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,2 +1 @@
-DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 
728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d
 SHA512 
58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394
 DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5

diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch 
b/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch
deleted file mode 100644
index 6ead9ceaa..0
--- a/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2019-04-24 10:53:11.0 +0300
-+++ b/CMakeLists.txt   2020-04-13 07:05:14.0 +0300
-@@ -194,7 +194,7 @@
- # As a temporary (?) workaround, we are now using pkg-config.
- # If a CMake error occurs, add -D EXCLUDE_PLPLOT=true to your CMake command.
- 
#===
--if (NOT EXCLUDE_PLPLOT)
-+if (NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
- find_package(PkgConfig REQUIRED)
- 
- pkg_check_modules(PLPLOT-FORTRAN REQUIRED plplot-fortran)
-@@ -211,9 +211,9 @@
- include_directories(${PLPLOT_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
- set(CMAKE_REQUIRED_INCLUDES "${PLPLOT-FORTRAN_INCLUDE_DIRS}")
--else(NOT EXCLUDE_PLPLOT)
-+else(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
- message(STATUS "PLPLOT Excluded as command option")
--endif(NOT EXCLUDE_PLPLOT)
-+endif(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
- 
- 
- 
#===
-@@ -223,10 +223,10 @@
- add_subdirectory(test)
- add_subdirectory(examples)
- 
--if(${GTKv} GREATER 2)
--add_subdirectory(sketcher)
--endif()
--
--if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
--add_subdirectory(plplot)
--endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
-+if(NOT NO_BUILD_HL)
-+if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
-+add_subdirectory(plplot)
-+endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
-+else(NOT NO_BUILD_HL)
-+message(STATUS "High Level API Excluded as command option")
-+endif(NOT NO_BUILD_HL)
-diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
 a/src/CMakeLists.txt   2019-04-24 10:53:11.0 +0300
-+++ b/src/CMakeLists.txt   2020-04-13 11:28:22.0 +0300
-@@ -33,28 +33,33 @@
- "gdk-pixbuf-auto.f90"
- "glib-auto.f90"
- "gtk.f90"
--"gtk-hl.f90"
--"gtk-hl-container.f90"
--"gtk-hl-button.f90"
--"gtk-hl-entry.f90"
--"gtk-hl-tree.f90"
--"gtk-hl-menu.f90"
--"gtk-hl-combobox.f90"
--"gtk-hl-spin-slider.f90"
--"gtk-hl-chooser.f90"
--"gtk-hl-dialog.f90"
--"gtk-hl-progress.f90"
--"gtk-hl-accelerator.f90"
--"gtk-hl-infobar.f90"
--"gtk-hl-assistant.f90"
--"gtk-hl-misc.f90"
--"gtk-draw-hl.f90"
- "gtk-sup.f90"
--"gdk-pixbuf-hl.f90"
- "pango-auto.f90"
- "gdkevents-auto${GTKv}.f90"
- )
- 
-+if(NOT NO_BUILD_HL)
-+set(sources ${sources}
-+"gtk-hl.f90"
-+"gtk-hl-container.f90"
-+"gtk-hl-button.f90"
-+"gtk-hl-entry.f90"
-+"gtk-hl-tree.f90"
-+"gtk-hl-menu.f90"
-+"gtk-hl-combobox.f90"
-+"gtk-hl-spin-slider.f90"
-+"gtk-hl-chooser.f90"
-+"gtk-hl-dialog.f90"
-+"gtk-hl-progress.f90"
-+"gtk-hl-accelerator.f90"
-+"gtk-hl-infobar.f90"
-+"gtk-hl-assistant.f90"
-+"gtk-hl-misc.f90"
-+"gtk-draw-hl.f90"
-+"gdk-pixbuf-hl.f90"
-+)
-+endif(NOT NO_BUILD_HL)
-+
- if (CMAKE_HOST_WIN32)
-   set(sources
- ${sources}

diff --git a/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild 

[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/

2021-04-24 Thread Theo Anderson
commit: 203e6852f620e793c5662129ca6e5a911496f652
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Apr 24 11:49:24 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Sat Apr 24 11:49:24 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=203e6852

x11-libs/gtk-fortran: add USE="static-libs" conditional patch

Closes: https://bugs.gentoo.org/781812

Signed-off-by: Sergey Torokhov  yandex.ru>

 .../gtk-fortran-20.04_skip-static-build.patch  | 32 ++
 x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild  |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git 
a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch 
b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
new file mode 100644
index 0..fb7cdd2cc
--- /dev/null
+++ b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
@@ -0,0 +1,32 @@
+diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -73,17 +73,16 @@
+ endif()
+ 
+ #==
+-# Defining the static and shared gtk-fortran libraries:
++# Defining the shared gtk-fortran libraries:
+ #==
+ add_library(gtk-fortran_object OBJECT ${sources})
+ # To build position independent shared libraries:
+ set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE 
TRUE)
+ 
+-add_library(gtk-fortran_static STATIC $)
+ add_library(gtk-fortran_shared SHARED $)
+ target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES})
+ 
+-set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES 
++set_target_properties(gtk-fortran_shared PROPERTIES 
+   OUTPUT_NAME ${gtk_V_fortran}
+   VERSION "0.1"
+   SOVERSION "0.1")
+@@ -131,7 +130,7 @@
+ #==
+ # Files to install:
+ #==
+-install(TARGETS gtk-fortran_static gtk-fortran_shared
++install(TARGETS gtk-fortran_shared
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
index 8bb1099e1..02d8cd0a1 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="examples high-level plplot"
+IUSE="examples high-level plplot static-libs"
 REQUIRED_USE="plplot? ( high-level )"
 
 RDEPEND="
@@ -43,6 +43,8 @@ src_prepare() {
sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR 
$(get_libdir):" \
-e "s:add_subdirectory(sketcher)::" CMakeLists.txt || die
 
+   use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch"
+
cmake_src_prepare
 }
 



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2020-05-18 Thread Andrew Ammerlaan
commit: 3d4875121f487b3f2b197bed5bf3b062592cfb0c
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon May 18 15:51:44 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon May 18 15:58:01 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d487512

x11-libs/gtk-fortran: 20.04 version bump

In this ebuild:

- The "high-level" build option patch is dropped due to
  this is implemented in source code of this version;
  The disabling "sketch" build part is moved "sed"
  command call while patching "CMakeLists.txt" file.

- The "doc" USE-flag is dropped as "doxygen" target was
  removed by upstream.

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest |  1 +
 x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild | 57 +++
 2 files changed, 58 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index b52b032..bf51ff0 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1,2 @@
 DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 
728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d
 SHA512 
58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394
+DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 
45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c
 SHA512 
b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5

diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
new file mode 100644
index 000..8bb1099
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_STANDARD=2003
+
+inherit cmake fortran-2
+
+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}.gtk3.24.18.tar.gz -> 
${P}.tar.gz"
+
+S="${WORKDIR}/${P}.gtk3.24.18"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples high-level plplot"
+REQUIRED_USE="plplot? ( high-level )"
+
+RDEPEND="
+   x11-libs/gtk+:3
+   plplot? ( >=sci-libs/plplot-5.13.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 and disable 'sketcher' build
+   sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR 
$(get_libdir):" \
+   -e "s:add_subdirectory(sketcher)::" 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
+}



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/

2020-04-13 Thread Andrew Ammerlaan
commit: e47c4327ffe7fb08a5be152b7baeaaeccfa5da4e
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Apr 13 08:55:36 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Apr 13 08:57:10 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e47c4327

x11-libs/gtk-fortran: Add NO_BUILD_HL cmake option. Disable build gtkf-sketcher

-Patch is disable building of 'gtkf-sketcher' - it isn't installed
and has now documentation.

- Add upstream 'NO_BUILD_HL' cmake option to disable build of
high-level interface to gtk-fortran that is used by plplot interface
(and gtkf-sketcher) and currently causes the TEXTREL QA warnings.

Signed-off-by: Sergey Torokhov  yandex.ru>

 .../files/gtk-fortran-NO_BUILD_HL-option.patch | 96 ++
 x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild  |  9 +-
 x11-libs/gtk-fortran/metadata.xml  |  1 +
 3 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch 
b/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch
new file mode 100644
index 000..6ead9ce
--- /dev/null
+++ b/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch
@@ -0,0 +1,96 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2019-04-24 10:53:11.0 +0300
 b/CMakeLists.txt   2020-04-13 07:05:14.0 +0300
+@@ -194,7 +194,7 @@
+ # As a temporary (?) workaround, we are now using pkg-config.
+ # If a CMake error occurs, add -D EXCLUDE_PLPLOT=true to your CMake command.
+ 
#===
+-if (NOT EXCLUDE_PLPLOT)
++if (NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
+ find_package(PkgConfig REQUIRED)
+ 
+ pkg_check_modules(PLPLOT-FORTRAN REQUIRED plplot-fortran)
+@@ -211,9 +211,9 @@
+ include_directories(${PLPLOT_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
+ set(CMAKE_REQUIRED_INCLUDES "${PLPLOT-FORTRAN_INCLUDE_DIRS}")
+-else(NOT EXCLUDE_PLPLOT)
++else(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
+ message(STATUS "PLPLOT Excluded as command option")
+-endif(NOT EXCLUDE_PLPLOT)
++endif(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
+ 
+ 
+ 
#===
+@@ -223,10 +223,10 @@
+ add_subdirectory(test)
+ add_subdirectory(examples)
+ 
+-if(${GTKv} GREATER 2)
+-add_subdirectory(sketcher)
+-endif()
+-
+-if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
+-add_subdirectory(plplot)
+-endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
++if(NOT NO_BUILD_HL)
++if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
++add_subdirectory(plplot)
++endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
++else(NOT NO_BUILD_HL)
++message(STATUS "High Level API Excluded as command option")
++endif(NOT NO_BUILD_HL)
+diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt   2019-04-24 10:53:11.0 +0300
 b/src/CMakeLists.txt   2020-04-13 11:28:22.0 +0300
+@@ -33,28 +33,33 @@
+ "gdk-pixbuf-auto.f90"
+ "glib-auto.f90"
+ "gtk.f90"
+-"gtk-hl.f90"
+-"gtk-hl-container.f90"
+-"gtk-hl-button.f90"
+-"gtk-hl-entry.f90"
+-"gtk-hl-tree.f90"
+-"gtk-hl-menu.f90"
+-"gtk-hl-combobox.f90"
+-"gtk-hl-spin-slider.f90"
+-"gtk-hl-chooser.f90"
+-"gtk-hl-dialog.f90"
+-"gtk-hl-progress.f90"
+-"gtk-hl-accelerator.f90"
+-"gtk-hl-infobar.f90"
+-"gtk-hl-assistant.f90"
+-"gtk-hl-misc.f90"
+-"gtk-draw-hl.f90"
+ "gtk-sup.f90"
+-"gdk-pixbuf-hl.f90"
+ "pango-auto.f90"
+ "gdkevents-auto${GTKv}.f90"
+ )
+ 
++if(NOT NO_BUILD_HL)
++set(sources ${sources}
++"gtk-hl.f90"
++"gtk-hl-container.f90"
++"gtk-hl-button.f90"
++"gtk-hl-entry.f90"
++"gtk-hl-tree.f90"
++"gtk-hl-menu.f90"
++"gtk-hl-combobox.f90"
++"gtk-hl-spin-slider.f90"
++"gtk-hl-chooser.f90"
++"gtk-hl-dialog.f90"
++"gtk-hl-progress.f90"
++"gtk-hl-accelerator.f90"
++"gtk-hl-infobar.f90"
++"gtk-hl-assistant.f90"
++"gtk-hl-misc.f90"
++"gtk-draw-hl.f90"
++"gdk-pixbuf-hl.f90"
++)
++endif(NOT NO_BUILD_HL)
++
+ if (CMAKE_HOST_WIN32)
+   set(sources
+ ${sources}

diff --git a/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
index 18d44cd..3363341 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
@@ -18,7 +18,8 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc examples plplot"
+IUSE="doc examples high-level plplot"
+REQUIRED_USE="plplot? ( high-level )"
 
 RDEPEND="
x11-libs/gtk+:3
@@ -43,6 +44,11 @@ pkg_setup() {
 
 src_prepare() {
default
+   # Patching here because of failed via PATCHES due to different line 
endings in files.
+   # Patch is disable 

[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2020-04-13 Thread Andrew Ammerlaan
commit: 20d1209ac8b21eb5feeca206f0c78ffe0cac2f98
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Apr 13 01:29:23 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Apr 13 01:29:23 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20d1209a

x11-libs/gtk-fortran: Add DOCS with CHANGELOG.md. Remove "append-flags -no-pie"

Add "CAHNGELOG.md" to DOCS variable with explicit README* files.

The using of "append-flags -no-pie" doesn't resove completely the issue
with TEXTREL and prevent to use then package on hardened.
The flag-o-matic.eclass removed as well.

Fix quote the variables.

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
index 03e1391..174fb1c 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 FORTRAN_STANDARD=2003
 
-inherit cmake flag-o-matic fortran-2
+inherit cmake fortran-2
 
 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
 HOMEPAGE="https://github.com/vmagnin/gtk-fortran;
@@ -35,6 +35,8 @@ BDEPEND="
virtual/pkgconfig
 "
 
+DOCS=( "README.md" "README-high-level" "CHANGELOG.md" )
+
 pkg_setup() {
fortran-2_pkg_setup
 }
@@ -56,11 +58,6 @@ src_configure() {
-DINSTALL_EXAMPLES=$(usex examples)
-DNO_BUILD_EXAMPLES=true
)
-   # Try to fix (fix similar warnings only for static library):
-   # 
/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: 
CMakeFiles/gtk-fortran_object.dir/gtk-hl-assistant.f90.o:
-   # warning: relocation against `hl_gtk_assistant_destroy' in read-only 
section `.rodata'
-   # 
/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: 
warning: creating a DT_TEXTREL in object
-   append-flags -no-pie
cmake_src_configure
 }
 
@@ -71,5 +68,5 @@ src_compile() {
 
 src_install() {
cmake_src_install
-   use doc && dodoc -r ${BUILD_DIR}/html && rm 
${D}/usr/share/doc/${P}/html/{*.map,*.md5}
+   use doc && dodoc -r "${BUILD_DIR}"/html && rm 
"${D}/usr/share/doc/${P}"/html/{*.map,*.md5}
 }



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2020-04-13 Thread Andrew Ammerlaan
commit: 036c61a3faec1fa011323085374d6284ac95f46f
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Apr 13 01:46:29 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Apr 13 01:46:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=036c61a3

x11-libs/gtk-fortran: Change versioning scheme

According to CHANGELOG.md the version of gtk-fortran is 19.04
instead of 3.24.8 (the last refers gtk+ version).

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest | 2 +-
 .../{gtk-fortran-3.24.8.ebuild => gtk-fortran-19.04.ebuild}   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index f1deb79..b52b032 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1 @@
-DIST gtk-fortran-3.24.8.tar.gz 4164311 BLAKE2B 
728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d
 SHA512 
58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394
+DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 
728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d
 SHA512 
58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394

diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
similarity index 92%
rename from x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
index 174fb1c..18d44cd 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild
@@ -10,9 +10,9 @@ inherit cmake fortran-2
 
 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/v19.04.gtk${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.gtk3.24.8.tar.gz -> 
${P}.tar.gz"
 
-S="${WORKDIR}/${PN}-19.04.gtk${PV}"
+S="${WORKDIR}/${P}.gtk3.24.8"
 
 LICENSE="GPL-3"
 SLOT="0"



[gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/

2020-04-12 Thread Andrew Ammerlaan
commit: 04dac6c32edc01124333a70700f740b80ca50932
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun Apr 12 10:11:55 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Apr 12 10:11:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04dac6c3

x11-libs/gtk-fortran: add new package

The gtk-fortran project aims to offer scientists programming in Fortran
a cross-platform library to build Graphical User Interfaces (GUI).
Gtk-fortran is a partial GTK / Fortran binding 100% written in Fortran,
thanks to the ISO_C_BINDING module for interoperability between C
and Fortran, which is a part of the Fortran 2003 standard.

Signed-off-by: Sergey Torokhov  yandex.ru>

 x11-libs/gtk-fortran/Manifest  |  1 +
 x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild | 75 ++
 x11-libs/gtk-fortran/metadata.xml  | 17 ++
 3 files changed, 93 insertions(+)

diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
new file mode 100644
index 000..f1deb79
--- /dev/null
+++ b/x11-libs/gtk-fortran/Manifest
@@ -0,0 +1 @@
+DIST gtk-fortran-3.24.8.tar.gz 4164311 BLAKE2B 
728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d
 SHA512 
58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394

diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild 
b/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
new file mode 100644
index 000..03e1391
--- /dev/null
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_STANDARD=2003
+
+inherit cmake flag-o-matic fortran-2
+
+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/v19.04.gtk${PV}.tar.gz -> 
${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-19.04.gtk${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples plplot"
+
+RDEPEND="
+   x11-libs/gtk+:3
+   plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] )
+"
+
+DEPEND="
+   ${RDEPEND}
+   doc? ( app-doc/doxygen[dot] )
+"
+
+BDEPEND="
+   virtual/fortran
+   virtual/pkgconfig
+"
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_prepare() {
+   default
+   # Fix library installation path
+   sed -i "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" 
CMakeLists.txt || die
+   # Fix "Some or all of the gtk libraries were not found. (missing: 
GTK3_GDKCONFIG_INCLUDE_DIR)",
+   # ref: https://github.com/vmagnin/gtk-fortran/commit/d3c1682
+   sed -i "s:GTK3_GDKCONFIG gdkconfig.h:GTK3_GDKCONFIG gdk/gdkconfig.h:" 
cmake/FindGTK3.cmake || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   mycmakeargs+=(
+   -DEXCLUDE_PLPLOT=$(usex plplot false true)
+   -DINSTALL_EXAMPLES=$(usex examples)
+   -DNO_BUILD_EXAMPLES=true
+   )
+   # Try to fix (fix similar warnings only for static library):
+   # 
/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: 
CMakeFiles/gtk-fortran_object.dir/gtk-hl-assistant.f90.o:
+   # warning: relocation against `hl_gtk_assistant_destroy' in read-only 
section `.rodata'
+   # 
/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: 
warning: creating a DT_TEXTREL in object
+   append-flags -no-pie
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+   use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+   cmake_src_install
+   use doc && dodoc -r ${BUILD_DIR}/html && rm 
${D}/usr/share/doc/${P}/html/{*.map,*.md5}
+}

diff --git a/x11-libs/gtk-fortran/metadata.xml 
b/x11-libs/gtk-fortran/metadata.xml
new file mode 100644
index 000..59ec49c
--- /dev/null
+++ b/x11-libs/gtk-fortran/metadata.xml
@@ -0,0 +1,17 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   torokhov-...@yandex.ru
+   Sergey Torokhov
+
+
+   Gtk-fortran is a partial GTK/Fortran binding aims to offer scientists 
programming in Fortran
+   a cross-platform library to build Graphical User Interfaces.
+
+
+   Build doxygen documentation
+   Install examples source code files
+   Build with sci-libs/plplot support
+
+