[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ - gentoo-commits

From:	Johannes Huber <johu@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date:	Sat, 11 Jan 2020 09:45:48
Message-Id:	`1578735916.eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7.johu@gentoo`

1

commit:     eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7

2

Author:     Johannes Huber <johu <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jan  5 17:34:51 2020 +0000

4

Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>

5

CommitDate: Sat Jan 11 09:45:16 2020 +0000

6

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

7

8

net-irc/quassel: Migrate to GLEP 81 users

9

10

Package-Manager: Portage-2.3.84, Repoman-2.3.20

11

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

12

13

 ...uassel-9999.ebuild => quassel-0.13.1-r2.ebuild} | 26 +++++++++-------------

14

 net-irc/quassel/quassel-9999.ebuild                | 23 +++++--------------

15

 2 files changed, 16 insertions(+), 33 deletions(-)

16

17

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild

18

similarity index 89%

19

copy from net-irc/quassel/quassel-9999.ebuild

20

copy to net-irc/quassel/quassel-0.13.1-r2.ebuild

21

index cf1d88423f3..4732c5d2f11 100644

22

--- a/net-irc/quassel/quassel-9999.ebuild

23

+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild

24

@@ -3,7 +3,7 @@

25

26

 EAPI=7

27

28

-inherit cmake xdg-utils pax-utils systemd user

29

+inherit cmake xdg-utils pax-utils systemd

30

31

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

32

 	MY_P=${PN}-${PV/_/-}

33

@@ -23,6 +23,9 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +serve

34

 snorenotify +ssl syslog urlpreview X"

35

36

 SERVER_DEPEND="

37

+	acct-group/quassel

38

+	acct-user/quassel

39

+	dev-qt/qtscript:5

40

 	crypt? ( app-crypt/qca:2[ssl] )

41

 	ldap? ( net-nds/openldap )

42

 	postgres? ( dev-qt/qtsql:5[postgres] )

43

@@ -87,18 +90,12 @@ REQUIRED_USE="

44

 	syslog? ( || ( server monolithic ) )

45

"

46

47

-pkg_setup() {

48

-	if use server; then

49

-		QUASSEL_DIR=/var/lib/${PN}

50

-		QUASSEL_USER=${PN}

51

-		# create quassel:quassel user

52

-		enewgroup "${QUASSEL_USER}"

53

-		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"

54

-	fi

55

-}

56

+PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )

57

58

 src_configure() {

59

 	local mycmakeargs=(

60

+		-DUSE_QT4=OFF

61

+		-DUSE_QT5=ON

62

 		-DUSE_CCACHE=OFF

63

 		-DCMAKE_SKIP_RPATH=ON

64

 		-DEMBED_DATA=OFF

65

@@ -117,7 +114,7 @@ src_configure() {

66

)

67

68

 	if use server || use monolithic; then

69

-		mycmakeargs+=(  $(cmake_use_find_package crypt Qca-qt5) )

70

+		mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )

71

fi

72

73

 	cmake_src_configure

74

@@ -130,10 +127,6 @@ src_install() {

75

 		# needs PAX marking wrt bug#346255

76

 		pax-mark m "${ED}/usr/bin/quasselcore"

77

78

-		# prepare folders in /var/

79

-		keepdir "${QUASSEL_DIR}"

80

-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"

81

-

82

 		# init scripts & systemd unit

83

 		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore

84

 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore

85

@@ -171,13 +164,14 @@ pkg_postrm() {

86

 pkg_config() {

87

 	if use server && use ssl; then

88

 		# generate the pem file only when it does not already exist

89

+		QUASSEL_DIR=/var/lib/${PN}

90

 		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then

91

 			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""

92

 			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \

93

 				-keyout "${QUASSEL_DIR}/quasselCert.pem" \

94

 				-out "${QUASSEL_DIR}/quasselCert.pem"

95

 			# permissions for the key

96

-			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"

97

+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"

98

 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"

99

 		else

100

 			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."

101

102

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild

103

index cf1d88423f3..a8492974412 100644

104

--- a/net-irc/quassel/quassel-9999.ebuild

105

+++ b/net-irc/quassel/quassel-9999.ebuild

106

@@ -3,7 +3,7 @@

107

108

 EAPI=7

109

110

-inherit cmake xdg-utils pax-utils systemd user

111

+inherit cmake xdg-utils pax-utils systemd

112

113

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

114

 	MY_P=${PN}-${PV/_/-}

115

@@ -23,6 +23,8 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +serve

116

 snorenotify +ssl syslog urlpreview X"

117

118

 SERVER_DEPEND="

119

+	acct-group/quassel

120

+	acct-user/quassel

121

 	crypt? ( app-crypt/qca:2[ssl] )

122

 	ldap? ( net-nds/openldap )

123

 	postgres? ( dev-qt/qtsql:5[postgres] )

124

@@ -87,16 +89,6 @@ REQUIRED_USE="

125

 	syslog? ( || ( server monolithic ) )

126

"

127

128

-pkg_setup() {

129

-	if use server; then

130

-		QUASSEL_DIR=/var/lib/${PN}

131

-		QUASSEL_USER=${PN}

132

-		# create quassel:quassel user

133

-		enewgroup "${QUASSEL_USER}"

134

-		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"

135

-	fi

136

-}

137

-

138

 src_configure() {

139

 	local mycmakeargs=(

140

 		-DUSE_CCACHE=OFF

141

@@ -117,7 +109,7 @@ src_configure() {

142

)

143

144

 	if use server || use monolithic; then

145

-		mycmakeargs+=(  $(cmake_use_find_package crypt Qca-qt5) )

146

+		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )

147

fi

148

149

 	cmake_src_configure

150

@@ -130,10 +122,6 @@ src_install() {

151

 		# needs PAX marking wrt bug#346255

152

 		pax-mark m "${ED}/usr/bin/quasselcore"

153

154

-		# prepare folders in /var/

155

-		keepdir "${QUASSEL_DIR}"

156

-		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"

157

-

158

 		# init scripts & systemd unit

159

 		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore

160

 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore

161

@@ -171,13 +159,14 @@ pkg_postrm() {

162

 pkg_config() {

163

 	if use server && use ssl; then

164

 		# generate the pem file only when it does not already exist

165

+		QUASSEL_DIR=/var/lib/${PN}

166

 		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then

167

 			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""

168

 			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \

169

 				-keyout "${QUASSEL_DIR}/quasselCert.pem" \

170

 				-out "${QUASSEL_DIR}/quasselCert.pem"

171

 			# permissions for the key

172

-			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"

173

+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"

174

 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"

175

 		else

176

 			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."

1	commit: eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7
2	Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jan 5 17:34:51 2020 +0000
4	Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5	CommitDate: Sat Jan 11 09:45:16 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8e1d7c
7
8	net-irc/quassel: Migrate to GLEP 81 users
9
10	Package-Manager: Portage-2.3.84, Repoman-2.3.20
11	Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
12
13	...uassel-9999.ebuild => quassel-0.13.1-r2.ebuild} \| 26 +++++++++-------------
14	net-irc/quassel/quassel-9999.ebuild \| 23 +++++--------------
15	2 files changed, 16 insertions(+), 33 deletions(-)
16
17	diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
18	similarity index 89%
19	copy from net-irc/quassel/quassel-9999.ebuild
20	copy to net-irc/quassel/quassel-0.13.1-r2.ebuild
21	index cf1d88423f3..4732c5d2f11 100644
22	--- a/net-irc/quassel/quassel-9999.ebuild
23	+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
24	@@ -3,7 +3,7 @@
25
26	EAPI=7
27
28	-inherit cmake xdg-utils pax-utils systemd user
29	+inherit cmake xdg-utils pax-utils systemd
30
31	if [[ ${PV} != 9999 ]]; then
32	MY_P=${PN}-${PV/_/-}
33	@@ -23,6 +23,9 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +serve
34	snorenotify +ssl syslog urlpreview X"
35
36	SERVER_DEPEND="
37	+ acct-group/quassel
38	+ acct-user/quassel
39	+ dev-qt/qtscript:5
40	crypt? ( app-crypt/qca:2[ssl] )
41	ldap? ( net-nds/openldap )
42	postgres? ( dev-qt/qtsql:5[postgres] )
43	@@ -87,18 +90,12 @@ REQUIRED_USE="
44	syslog? ( \|\| ( server monolithic ) )
45	"
46
47	-pkg_setup() {
48	- if use server; then
49	- QUASSEL_DIR=/var/lib/${PN}
50	- QUASSEL_USER=${PN}
51	- # create quassel:quassel user
52	- enewgroup "${QUASSEL_USER}"
53	- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
54	- fi
55	-}
56	+PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
57
58	src_configure() {
59	local mycmakeargs=(
60	+ -DUSE_QT4=OFF
61	+ -DUSE_QT5=ON
62	-DUSE_CCACHE=OFF
63	-DCMAKE_SKIP_RPATH=ON
64	-DEMBED_DATA=OFF
65	@@ -117,7 +114,7 @@ src_configure() {
66	)
67
68	if use server \|\| use monolithic; then
69	- mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
70	+ mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
71	fi
72
73	cmake_src_configure
74	@@ -130,10 +127,6 @@ src_install() {
75	# needs PAX marking wrt bug#346255
76	pax-mark m "${ED}/usr/bin/quasselcore"
77
78	- # prepare folders in /var/
79	- keepdir "${QUASSEL_DIR}"
80	- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
81	-
82	# init scripts & systemd unit
83	newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
84	newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
85	@@ -171,13 +164,14 @@ pkg_postrm() {
86	pkg_config() {
87	if use server && use ssl; then
88	# generate the pem file only when it does not already exist
89	+ QUASSEL_DIR=/var/lib/${PN}
90	if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
91	einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
92	openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
93	-keyout "${QUASSEL_DIR}/quasselCert.pem" \
94	-out "${QUASSEL_DIR}/quasselCert.pem"
95	# permissions for the key
96	- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
97	+ chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
98	chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
99	else
100	einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
101
102	diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
103	index cf1d88423f3..a8492974412 100644
104	--- a/net-irc/quassel/quassel-9999.ebuild
105	+++ b/net-irc/quassel/quassel-9999.ebuild
106	@@ -3,7 +3,7 @@
107
108	EAPI=7
109
110	-inherit cmake xdg-utils pax-utils systemd user
111	+inherit cmake xdg-utils pax-utils systemd
112
113	if [[ ${PV} != 9999 ]]; then
114	MY_P=${PN}-${PV/_/-}
115	@@ -23,6 +23,8 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +serve
116	snorenotify +ssl syslog urlpreview X"
117
118	SERVER_DEPEND="
119	+ acct-group/quassel
120	+ acct-user/quassel
121	crypt? ( app-crypt/qca:2[ssl] )
122	ldap? ( net-nds/openldap )
123	postgres? ( dev-qt/qtsql:5[postgres] )
124	@@ -87,16 +89,6 @@ REQUIRED_USE="
125	syslog? ( \|\| ( server monolithic ) )
126	"
127
128	-pkg_setup() {
129	- if use server; then
130	- QUASSEL_DIR=/var/lib/${PN}
131	- QUASSEL_USER=${PN}
132	- # create quassel:quassel user
133	- enewgroup "${QUASSEL_USER}"
134	- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
135	- fi
136	-}
137	-
138	src_configure() {
139	local mycmakeargs=(
140	-DUSE_CCACHE=OFF
141	@@ -117,7 +109,7 @@ src_configure() {
142	)
143
144	if use server \|\| use monolithic; then
145	- mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
146	+ mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
147	fi
148
149	cmake_src_configure
150	@@ -130,10 +122,6 @@ src_install() {
151	# needs PAX marking wrt bug#346255
152	pax-mark m "${ED}/usr/bin/quasselcore"
153
154	- # prepare folders in /var/
155	- keepdir "${QUASSEL_DIR}"
156	- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
157	-
158	# init scripts & systemd unit
159	newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
160	newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
161	@@ -171,13 +159,14 @@ pkg_postrm() {
162	pkg_config() {
163	if use server && use ssl; then
164	# generate the pem file only when it does not already exist
165	+ QUASSEL_DIR=/var/lib/${PN}
166	if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
167	einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
168	openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
169	-keyout "${QUASSEL_DIR}/quasselCert.pem" \
170	-out "${QUASSEL_DIR}/quasselCert.pem"
171	# permissions for the key
172	- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
173	+ chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
174	chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
175	else
176	einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."

Gentoo Archives: gentoo-commits