[gentoo-commits] repo/gentoo:master commit in: dev-java/gradle-bin/ - gentoo-commits

From:	Florian Schmaus <flow@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-java/gradle-bin/
Date:	Fri, 25 Jun 2021 10:41:03
Message-Id:	`1624617619.e619b4bf7bdc8bdfa5757e4730fbe5241d532fa0.flow@gentoo`

1

commit:     e619b4bf7bdc8bdfa5757e4730fbe5241d532fa0

2

Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>

3

AuthorDate: Fri Jun 25 10:25:05 2021 +0000

4

Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>

5

CommitDate: Fri Jun 25 10:40:19 2021 +0000

6

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

7

8

dev-java/gradle-bin: add 6.8.3 and 7.1, drop old

9

10

Unlike the dropped 6.3 ebuild, these ebuilds only install versioned

11

gradle symlinks in /usr/bin, e.g. /usr/bin/gradle-bin-7.1. The

12

/usr/bin/gradle symlink is managed by app-eselect/eselect-gradle.

13

14

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

15

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

16

17

 dev-java/gradle-bin/Manifest                       |  3 +-

18

 ...adle-bin-6.3.ebuild => gradle-bin-6.8.3.ebuild} | 38 ++++++++++++++--------

19

 ...gradle-bin-6.3.ebuild => gradle-bin-7.1.ebuild} | 38 ++++++++++++++--------

20

 3 files changed, 52 insertions(+), 27 deletions(-)

21

22

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest

23

index a76117f75ea..fec5d60f9a4 100644

24

--- a/dev-java/gradle-bin/Manifest

25

+++ b/dev-java/gradle-bin/Manifest

26

@@ -1 +1,2 @@

27

-DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d

28

+DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564

29

+DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01

30

31

diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild

32

similarity index 65%

33

copy from dev-java/gradle-bin/gradle-bin-6.3.ebuild

34

copy to dev-java/gradle-bin/gradle-bin-6.8.3.ebuild

35

index 1623bb9c3f3..dfbd1549205 100644

36

--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild

37

+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild

38

@@ -19,31 +19,43 @@ LICENSE="Apache-2.0"

39

 SLOT="${PV}"

40

 KEYWORDS="~amd64 ~x86"

41

42

+DEPEND="app-eselect/eselect-gradle"

43

 BDEPEND="app-arch/unzip"

44

-DEPEND=">=virtual/jre-1.8"

45

-RDEPEND=">=virtual/jdk-1.8"

46

+RDEPEND="

47

+	${DEPEND}

48

+	>=virtual/jre-1.8:*

49

+"

50

51

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

52

53

+src_compile() {

54

+	:

55

+}

56

+

57

 src_install() {

58

 	local gradle_dir="/usr/share/${PN}-${SLOT}"

59

60

-	insinto "${gradle_dir}"

61

-	doins -r lib/

62

-

63

-	exeinto "${gradle_dir}"/bin

64

-	doexe bin/${MY_PN}

65

-	dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"

66

+	if use source; then

67

+		java-pkg_dosrc src

68

+	fi

69

70

 	docinto html

71

 	dodoc -r docs/release-notes.html

72

-

73

-	if use doc ; then

74

+	if use doc; then

75

 		dodoc -r docs/{dsl,userguide}

76

 		java-pkg_dojavadoc docs/javadoc

77

fi

78

79

-	if use source ; then

80

-		java-pkg_dosrc src/*

81

-	fi

82

+	insinto "${gradle_dir}"

83

+	doins -r bin/ lib/

84

+	fperms 755 "${gradle_dir}/bin/gradle"

85

+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"

86

+}

87

+

88

+pkg_postinst() {

89

+	eselect gradle update ifunset

90

+}

91

+

92

+pkg_postrm() {

93

+	eselect gradle update ifunset

94

}

95

96

diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.ebuild

97

similarity index 65%

98

rename from dev-java/gradle-bin/gradle-bin-6.3.ebuild

99

rename to dev-java/gradle-bin/gradle-bin-7.1.ebuild

100

index 1623bb9c3f3..dfbd1549205 100644

101

--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild

102

+++ b/dev-java/gradle-bin/gradle-bin-7.1.ebuild

103

@@ -19,31 +19,43 @@ LICENSE="Apache-2.0"

104

 SLOT="${PV}"

105

 KEYWORDS="~amd64 ~x86"

106

107

+DEPEND="app-eselect/eselect-gradle"

108

 BDEPEND="app-arch/unzip"

109

-DEPEND=">=virtual/jre-1.8"

110

-RDEPEND=">=virtual/jdk-1.8"

111

+RDEPEND="

112

+	${DEPEND}

113

+	>=virtual/jre-1.8:*

114

+"

115

116

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

117

118

+src_compile() {

119

+	:

120

+}

121

+

122

 src_install() {

123

 	local gradle_dir="/usr/share/${PN}-${SLOT}"

124

125

-	insinto "${gradle_dir}"

126

-	doins -r lib/

127

-

128

-	exeinto "${gradle_dir}"/bin

129

-	doexe bin/${MY_PN}

130

-	dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"

131

+	if use source; then

132

+		java-pkg_dosrc src

133

+	fi

134

135

 	docinto html

136

 	dodoc -r docs/release-notes.html

137

-

138

-	if use doc ; then

139

+	if use doc; then

140

 		dodoc -r docs/{dsl,userguide}

141

 		java-pkg_dojavadoc docs/javadoc

142

fi

143

144

-	if use source ; then

145

-		java-pkg_dosrc src/*

146

-	fi

147

+	insinto "${gradle_dir}"

148

+	doins -r bin/ lib/

149

+	fperms 755 "${gradle_dir}/bin/gradle"

150

+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"

151

+}

152

+

153

+pkg_postinst() {

154

+	eselect gradle update ifunset

155

+}

156

+

157

+pkg_postrm() {

158

+	eselect gradle update ifunset

159

}

1	commit: e619b4bf7bdc8bdfa5757e4730fbe5241d532fa0
2	Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3	AuthorDate: Fri Jun 25 10:25:05 2021 +0000
4	Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5	CommitDate: Fri Jun 25 10:40:19 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e619b4bf
7
8	dev-java/gradle-bin: add 6.8.3 and 7.1, drop old
9
10	Unlike the dropped 6.3 ebuild, these ebuilds only install versioned
11	gradle symlinks in /usr/bin, e.g. /usr/bin/gradle-bin-7.1. The
12	/usr/bin/gradle symlink is managed by app-eselect/eselect-gradle.
13
14	Closes: https://bugs.gentoo.org/339574
15	Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
16
17	dev-java/gradle-bin/Manifest \| 3 +-
18	...adle-bin-6.3.ebuild => gradle-bin-6.8.3.ebuild} \| 38 ++++++++++++++--------
19	...gradle-bin-6.3.ebuild => gradle-bin-7.1.ebuild} \| 38 ++++++++++++++--------
20	3 files changed, 52 insertions(+), 27 deletions(-)
21
22	diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
23	index a76117f75ea..fec5d60f9a4 100644
24	--- a/dev-java/gradle-bin/Manifest
25	+++ b/dev-java/gradle-bin/Manifest
26	@@ -1 +1,2 @@
27	-DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
28	+DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
29	+DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01
30
31	diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
32	similarity index 65%
33	copy from dev-java/gradle-bin/gradle-bin-6.3.ebuild
34	copy to dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
35	index 1623bb9c3f3..dfbd1549205 100644
36	--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
37	+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
38	@@ -19,31 +19,43 @@ LICENSE="Apache-2.0"
39	SLOT="${PV}"
40	KEYWORDS="~amd64 ~x86"
41
42	+DEPEND="app-eselect/eselect-gradle"
43	BDEPEND="app-arch/unzip"
44	-DEPEND=">=virtual/jre-1.8"
45	-RDEPEND=">=virtual/jdk-1.8"
46	+RDEPEND="
47	+ ${DEPEND}
48	+ >=virtual/jre-1.8:*
49	+"
50
51	S="${WORKDIR}/${MY_P}"
52
53	+src_compile() {
54	+ :
55	+}
56	+
57	src_install() {
58	local gradle_dir="/usr/share/${PN}-${SLOT}"
59
60	- insinto "${gradle_dir}"
61	- doins -r lib/
62	-
63	- exeinto "${gradle_dir}"/bin
64	- doexe bin/${MY_PN}
65	- dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
66	+ if use source; then
67	+ java-pkg_dosrc src
68	+ fi
69
70	docinto html
71	dodoc -r docs/release-notes.html
72	-
73	- if use doc ; then
74	+ if use doc; then
75	dodoc -r docs/{dsl,userguide}
76	java-pkg_dojavadoc docs/javadoc
77	fi
78
79	- if use source ; then
80	- java-pkg_dosrc src/*
81	- fi
82	+ insinto "${gradle_dir}"
83	+ doins -r bin/ lib/
84	+ fperms 755 "${gradle_dir}/bin/gradle"
85	+ dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
86	+}
87	+
88	+pkg_postinst() {
89	+ eselect gradle update ifunset
90	+}
91	+
92	+pkg_postrm() {
93	+ eselect gradle update ifunset
94	}
95
96	diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
97	similarity index 65%
98	rename from dev-java/gradle-bin/gradle-bin-6.3.ebuild
99	rename to dev-java/gradle-bin/gradle-bin-7.1.ebuild
100	index 1623bb9c3f3..dfbd1549205 100644
101	--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
102	+++ b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
103	@@ -19,31 +19,43 @@ LICENSE="Apache-2.0"
104	SLOT="${PV}"
105	KEYWORDS="~amd64 ~x86"
106
107	+DEPEND="app-eselect/eselect-gradle"
108	BDEPEND="app-arch/unzip"
109	-DEPEND=">=virtual/jre-1.8"
110	-RDEPEND=">=virtual/jdk-1.8"
111	+RDEPEND="
112	+ ${DEPEND}
113	+ >=virtual/jre-1.8:*
114	+"
115
116	S="${WORKDIR}/${MY_P}"
117
118	+src_compile() {
119	+ :
120	+}
121	+
122	src_install() {
123	local gradle_dir="/usr/share/${PN}-${SLOT}"
124
125	- insinto "${gradle_dir}"
126	- doins -r lib/
127	-
128	- exeinto "${gradle_dir}"/bin
129	- doexe bin/${MY_PN}
130	- dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
131	+ if use source; then
132	+ java-pkg_dosrc src
133	+ fi
134
135	docinto html
136	dodoc -r docs/release-notes.html
137	-
138	- if use doc ; then
139	+ if use doc; then
140	dodoc -r docs/{dsl,userguide}
141	java-pkg_dojavadoc docs/javadoc
142	fi
143
144	- if use source ; then
145	- java-pkg_dosrc src/*
146	- fi
147	+ insinto "${gradle_dir}"
148	+ doins -r bin/ lib/
149	+ fperms 755 "${gradle_dir}/bin/gradle"
150	+ dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
151	+}
152	+
153	+pkg_postinst() {
154	+ eselect gradle update ifunset
155	+}
156	+
157	+pkg_postrm() {
158	+ eselect gradle update ifunset
159	}

Gentoo Archives: gentoo-commits