Gentoo Archives: gentoo-commits

From: Sergey Torokhov <torokhov-s-a@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/, x11-libs/gtk-fortran/files/
Date: Sat, 29 Oct 2022 22:15:00
Message-Id: 1667081630.f83445e50da9fc1860afcd677f6bac13c3935584.SergeyTorokhov@gentoo
1 commit: f83445e50da9fc1860afcd677f6bac13c3935584
2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Sat Oct 29 22:13:50 2022 +0000
4 Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
5 CommitDate: Sat Oct 29 22:13:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f83445e5
7
8 x11-libs/gtk-fortran: drop 3.24.18; fix 'https' in metadata.xml
9
10 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
11
12 x11-libs/gtk-fortran/Manifest | 1 -
13 .../gtk-fortran-3.24.18_skip-static-build.patch | 32 ------------
14 x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild | 60 ----------------------
15 x11-libs/gtk-fortran/metadata.xml | 2 +-
16 4 files changed, 1 insertion(+), 94 deletions(-)
17
18 diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
19 index 010a18a62..e7bda029d 100644
20 --- a/x11-libs/gtk-fortran/Manifest
21 +++ b/x11-libs/gtk-fortran/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
24 DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 4b18d21e0479496caea386450fc16c12d20ad3491932b331890b5d7328c704799f8dd288c4a1d0d2e34f0957f0bdca316f820850b80c4ff8d2b66ce3673fe5ec SHA512 4e1cd522ca80db01a1058d6c58b4a6e3e63e6b1d510e2ee5fd0b8f8aa9f9dc8e433d203781c908065571c4c1a6d9686c22eec879b396352b12fa82b604855c86
25 DIST gtk-fortran-4.1.0.tar.gz 4100843 BLAKE2B c11658472c4f2ad9916f8f421f0d1c48b9ec7874e9e4075f2247e7cfb33ed69946e644aa9a460d63ff676c075b76caf4c70bd09532dda53b4d2035c88b3c1c61 SHA512 cd4628a56b2a03f7e958d4284c595b573ab84ac6c630cfae4f3ed13bb6d19a66246cb6adac8b05104f562406a467c03841cf350f8482e7e9f8fd596de4f4c873
26
27 diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
28 deleted file mode 100644
29 index fb7cdd2cc..000000000
30 --- a/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
34 ---- a/src/CMakeLists.txt
35 -+++ b/src/CMakeLists.txt
36 -@@ -73,17 +73,16 @@
37 - endif()
38 -
39 - #======================================================
40 --# Defining the static and shared gtk-fortran libraries:
41 -+# Defining the shared gtk-fortran libraries:
42 - #======================================================
43 - add_library(gtk-fortran_object OBJECT ${sources})
44 - # To build position independent shared libraries:
45 - set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE)
46 -
47 --add_library(gtk-fortran_static STATIC $<TARGET_OBJECTS:gtk-fortran_object>)
48 - add_library(gtk-fortran_shared SHARED $<TARGET_OBJECTS:gtk-fortran_object>)
49 - target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES})
50 -
51 --set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES
52 -+set_target_properties(gtk-fortran_shared PROPERTIES
53 - OUTPUT_NAME ${gtk_V_fortran}
54 - VERSION "0.1"
55 - SOVERSION "0.1")
56 -@@ -131,7 +130,7 @@
57 - #==================
58 - # Files to install:
59 - #==================
60 --install(TARGETS gtk-fortran_static gtk-fortran_shared
61 -+install(TARGETS gtk-fortran_shared
62 - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
63 - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
64 - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
65
66 diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
67 deleted file mode 100644
68 index b83521beb..000000000
69 --- a/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
70 +++ /dev/null
71 @@ -1,60 +0,0 @@
72 -# Copyright 1999-2021 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=7
76 -
77 -CMAKE_MAKEFILE_GENERATOR="emake"
78 -FORTRAN_STANDARD=2003
79 -
80 -inherit cmake fortran-2
81 -
82 -DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
83 -HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
84 -SRC_URI="https://github.com/vmagnin/${PN}/archive/v20.04.gtk${PV}.tar.gz -> ${P}.tar.gz"
85 -
86 -S="${WORKDIR}/${PN}-20.04.gtk${PV}"
87 -
88 -LICENSE="GPL-3"
89 -SLOT="3"
90 -KEYWORDS="~amd64 ~x86"
91 -
92 -IUSE="examples high-level plplot static-libs"
93 -REQUIRED_USE="plplot? ( high-level )"
94 -
95 -RDEPEND="
96 - x11-libs/gtk+:3
97 - plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] )
98 -"
99 -DEPEND="${RDEPEND}"
100 -BDEPEND="
101 - virtual/fortran
102 - virtual/pkgconfig
103 -"
104 -
105 -DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" )
106 -
107 -pkg_setup() {
108 - fortran-2_pkg_setup
109 -}
110 -
111 -src_prepare() {
112 - default
113 - # Fix library installation path, disable 'sketcher' build, pass LDFLAGS
114 - sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \
115 - -e "s: add_subdirectory(sketcher)::" \
116 - -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die
117 -
118 - use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch"
119 -
120 - cmake_src_prepare
121 -}
122 -
123 -src_configure() {
124 - mycmakeargs+=(
125 - -DEXCLUDE_PLPLOT=$(usex plplot false true)
126 - -DNO_BUILD_HL=$(usex high-level false true)
127 - -DINSTALL_EXAMPLES=$(usex examples)
128 - -DNO_BUILD_EXAMPLES=true
129 - )
130 - cmake_src_configure
131 -}
132
133 diff --git a/x11-libs/gtk-fortran/metadata.xml b/x11-libs/gtk-fortran/metadata.xml
134 index f7bfd06ff..ca3bdc69a 100644
135 --- a/x11-libs/gtk-fortran/metadata.xml
136 +++ b/x11-libs/gtk-fortran/metadata.xml
137 @@ -1,5 +1,5 @@
138 <?xml version="1.0" encoding="UTF-8"?>
139 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
140 +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
141 <pkgmetadata>
142 <maintainer type="person">
143 <email>torokhov-s-a@××××××.ru</email>