[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
Date:	Sat, 26 Feb 2022 02:30:07
Message-Id:	`1645842322.c025a5cc57243c1b2304fb250af235b012a95a53.sam@gentoo`

1

commit:     c025a5cc57243c1b2304fb250af235b012a95a53

2

Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>

3

AuthorDate: Wed Feb 23 20:47:38 2022 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Sat Feb 26 02:25:22 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c025a5cc

7

8

sci-geosciences/grass: version bump 8.0.1

9

10

Package-Manager: Portage-3.0.30, Repoman-3.0.3

11

Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>

12

Closes: https://github.com/gentoo/gentoo/pull/24332

13

Signed-off-by: Sam James <sam <AT> gentoo.org>

14

15

 sci-geosciences/grass/Manifest                     |  1 +

16

 .../{grass-9999.ebuild => grass-8.0.1.ebuild}      | 31 +++++++++++++++++-----

17

 sci-geosciences/grass/grass-9999.ebuild            | 24 +++++++++++++----

18

 3 files changed, 45 insertions(+), 11 deletions(-)

19

20

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest

21

index 4c2956704d54..fb06ff6d00f4 100644

22

--- a/sci-geosciences/grass/Manifest

23

+++ b/sci-geosciences/grass/Manifest

24

@@ -1,3 +1,4 @@

25

 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df

26

 DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303

27

 DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42

28

+DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f

29

30

diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild

31

similarity index 92%

32

copy from sci-geosciences/grass/grass-9999.ebuild

33

copy to sci-geosciences/grass/grass-8.0.1.ebuild

34

index d0b73c80b283..42780861df19 100644

35

--- a/sci-geosciences/grass/grass-9999.ebuild

36

+++ b/sci-geosciences/grass/grass-8.0.1.ebuild

37

@@ -3,21 +3,35 @@

38

39

 EAPI=8

40

41

-PYTHON_COMPAT=( python3_{8,9} )

42

+PYTHON_COMPAT=( python3_{8..10} )

43

 PYTHON_REQ_USE="sqlite"  # bug 572440

44

 WX_GTK_VER="3.0-gtk3"

45

46

-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg

47

+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg

48

49

 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"

50

 HOMEPAGE="https://grass.osgeo.org/"

51

-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"

52

53

 LICENSE="GPL-2"

54

-SLOT="0/8.1"

55

+SLOT="0/8.0"

56

+

57

 GVERSION=${SLOT#*/}

58

-MY_P="${PN}${GVERSION}"

59

-MY_PM="${MY_P/.}"

60

+MY_PM="${PN}${GVERSION}"

61

+MY_PM="${MY_PM/.}"

62

+

63

+if [[ ${PV} =~ "9999" ]]; then

64

+	inherit git-r3

65

+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"

66

+else

67

+	MY_P="${P/_rc/RC}"

68

+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"

69

+	if [[ ${PV} != *_rc* ]] ; then

70

+		KEYWORDS="~amd64 ~ppc ~x86"

71

+	fi

72

+

73

+	S="${WORKDIR}/${MY_P}"

74

+fi

75

+

76

 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"

77

 REQUIRED_USE="

78

 	${PYTHON_REQUIRED_USE}

79

@@ -76,6 +90,11 @@ BDEPEND="

80

 	virtual/pkgconfig

81

 	X? ( dev-lang/swig )"

82

83

+PATCHES=(

84

+	# bug 746590

85

+	"${FILESDIR}/${PN}-flock.patch"

86

+)

87

+

88

 pkg_setup() {

89

 	if use lapack; then

90

 		local mylapack=$(eselect lapack show)

91

92

diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild

93

index d0b73c80b283..31ad3a913914 100644

94

--- a/sci-geosciences/grass/grass-9999.ebuild

95

+++ b/sci-geosciences/grass/grass-9999.ebuild

96

@@ -3,21 +3,35 @@

97

98

 EAPI=8

99

100

-PYTHON_COMPAT=( python3_{8,9} )

101

+PYTHON_COMPAT=( python3_{8..10} )

102

 PYTHON_REQ_USE="sqlite"  # bug 572440

103

 WX_GTK_VER="3.0-gtk3"

104

105

-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg

106

+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg

107

108

 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"

109

 HOMEPAGE="https://grass.osgeo.org/"

110

-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"

111

112

 LICENSE="GPL-2"

113

 SLOT="0/8.1"

114

+

115

 GVERSION=${SLOT#*/}

116

-MY_P="${PN}${GVERSION}"

117

-MY_PM="${MY_P/.}"

118

+MY_PM="${PN}${GVERSION}"

119

+MY_PM="${MY_PM/.}"

120

+

121

+if [[ ${PV} =~ "9999" ]]; then

122

+	inherit git-r3

123

+	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"

124

+else

125

+	MY_P="${P/_rc/RC}"

126

+	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"

127

+	if [[ ${PV} != *_rc* ]] ; then

128

+		KEYWORDS="~amd64 ~ppc ~x86"

129

+	fi

130

+

131

+	S="${WORKDIR}/${MY_P}"

132

+fi

133

+

134

 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"

135

 REQUIRED_USE="

136

 	${PYTHON_REQUIRED_USE}

1	commit: c025a5cc57243c1b2304fb250af235b012a95a53
2	Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
3	AuthorDate: Wed Feb 23 20:47:38 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Sat Feb 26 02:25:22 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c025a5cc
7
8	sci-geosciences/grass: version bump 8.0.1
9
10	Package-Manager: Portage-3.0.30, Repoman-3.0.3
11	Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
12	Closes: https://github.com/gentoo/gentoo/pull/24332
13	Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15	sci-geosciences/grass/Manifest \| 1 +
16	.../{grass-9999.ebuild => grass-8.0.1.ebuild} \| 31 +++++++++++++++++-----
17	sci-geosciences/grass/grass-9999.ebuild \| 24 +++++++++++++----
18	3 files changed, 45 insertions(+), 11 deletions(-)
19
20	diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
21	index 4c2956704d54..fb06ff6d00f4 100644
22	--- a/sci-geosciences/grass/Manifest
23	+++ b/sci-geosciences/grass/Manifest
24	@@ -1,3 +1,4 @@
25	DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
26	DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
27	DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
28	+DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
29
30	diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
31	similarity index 92%
32	copy from sci-geosciences/grass/grass-9999.ebuild
33	copy to sci-geosciences/grass/grass-8.0.1.ebuild
34	index d0b73c80b283..42780861df19 100644
35	--- a/sci-geosciences/grass/grass-9999.ebuild
36	+++ b/sci-geosciences/grass/grass-8.0.1.ebuild
37	@@ -3,21 +3,35 @@
38
39	EAPI=8
40
41	-PYTHON_COMPAT=( python3_{8,9} )
42	+PYTHON_COMPAT=( python3_{8..10} )
43	PYTHON_REQ_USE="sqlite" # bug 572440
44	WX_GTK_VER="3.0-gtk3"
45
46	-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
47	+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
48
49	DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
50	HOMEPAGE="https://grass.osgeo.org/"
51	-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
52
53	LICENSE="GPL-2"
54	-SLOT="0/8.1"
55	+SLOT="0/8.0"
56	+
57	GVERSION=${SLOT#*/}
58	-MY_P="${PN}${GVERSION}"
59	-MY_PM="${MY_P/.}"
60	+MY_PM="${PN}${GVERSION}"
61	+MY_PM="${MY_PM/.}"
62	+
63	+if [[ ${PV} =~ "9999" ]]; then
64	+ inherit git-r3
65	+ EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
66	+else
67	+ MY_P="${P/_rc/RC}"
68	+ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
69	+ if [[ ${PV} != _rc ]] ; then
70	+ KEYWORDS="~amd64 ~ppc ~x86"
71	+ fi
72	+
73	+ S="${WORKDIR}/${MY_P}"
74	+fi
75	+
76	IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
77	REQUIRED_USE="
78	${PYTHON_REQUIRED_USE}
79	@@ -76,6 +90,11 @@ BDEPEND="
80	virtual/pkgconfig
81	X? ( dev-lang/swig )"
82
83	+PATCHES=(
84	+ # bug 746590
85	+ "${FILESDIR}/${PN}-flock.patch"
86	+)
87	+
88	pkg_setup() {
89	if use lapack; then
90	local mylapack=$(eselect lapack show)
91
92	diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
93	index d0b73c80b283..31ad3a913914 100644
94	--- a/sci-geosciences/grass/grass-9999.ebuild
95	+++ b/sci-geosciences/grass/grass-9999.ebuild
96	@@ -3,21 +3,35 @@
97
98	EAPI=8
99
100	-PYTHON_COMPAT=( python3_{8,9} )
101	+PYTHON_COMPAT=( python3_{8..10} )
102	PYTHON_REQ_USE="sqlite" # bug 572440
103	WX_GTK_VER="3.0-gtk3"
104
105	-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
106	+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
107
108	DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
109	HOMEPAGE="https://grass.osgeo.org/"
110	-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
111
112	LICENSE="GPL-2"
113	SLOT="0/8.1"
114	+
115	GVERSION=${SLOT#*/}
116	-MY_P="${PN}${GVERSION}"
117	-MY_PM="${MY_P/.}"
118	+MY_PM="${PN}${GVERSION}"
119	+MY_PM="${MY_PM/.}"
120	+
121	+if [[ ${PV} =~ "9999" ]]; then
122	+ inherit git-r3
123	+ EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
124	+else
125	+ MY_P="${P/_rc/RC}"
126	+ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
127	+ if [[ ${PV} != _rc ]] ; then
128	+ KEYWORDS="~amd64 ~ppc ~x86"
129	+ fi
130	+
131	+ S="${WORKDIR}/${MY_P}"
132	+fi
133	+
134	IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
135	REQUIRED_USE="
136	${PYTHON_REQUIRED_USE}

Gentoo Archives: gentoo-commits