[gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/ - gentoo-commits

From:	"Tiziano Müller" <dev-zero@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/
Date:	Sat, 13 Apr 2019 16:38:18
Message-Id:	`1555173472.697e3c0695aa214f2734434077326f929456ac19.dev-zero@gentoo`

1

commit:     697e3c0695aa214f2734434077326f929456ac19

2

Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>

3

AuthorDate: Sat Apr 13 16:35:46 2019 +0000

4

Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>

5

CommitDate: Sat Apr 13 16:37:52 2019 +0000

6

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

7

8

net-wireless/blueman: fix DHCP server dir & kernel config check

9

10

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

11

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

12

Package-Manager: Portage-2.3.62, Repoman-2.3.12

13

Signed-off-by: Tiziano Müller <dev-zero <AT> gentoo.org>

14

15

 ...eman-9999.ebuild => blueman-2.1_alpha3-r1.ebuild} | 20 +++++++++++---------

16

 net-wireless/blueman/blueman-9999.ebuild             | 18 +++++++++---------

17

 2 files changed, 20 insertions(+), 18 deletions(-)

18

19

diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild

20

similarity index 91%

21

copy from net-wireless/blueman/blueman-9999.ebuild

22

copy to net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild

23

index c05adb445a6..80488b8450b 100644

24

--- a/net-wireless/blueman/blueman-9999.ebuild

25

+++ b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild

26

@@ -1,9 +1,9 @@

27

-# Copyright 1999-2018 Gentoo Authors

28

+# Copyright 1999-2019 Gentoo Authors

29

 # Distributed under the terms of the GNU General Public License v2

30

31

-EAPI="6"

32

+EAPI="7"

33

34

-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )

35

+PYTHON_COMPAT=( python3_{5,6,7} )

36

 inherit gnome2-utils linux-info python-single-r1 systemd

37

38

 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"

39

@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then

40

 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"

41

 	KEYWORDS=""

42

 else

43

-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"

44

+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"

45

 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"

46

fi

47

48

@@ -22,15 +22,15 @@ LICENSE="GPL-3"

49

 SLOT="0"

50

 IUSE="appindicator network nls policykit pulseaudio"

51

52

-COMMON_DEPEND="

53

+DEPEND="

54

 	dev-python/pygobject:3[${PYTHON_USEDEP}]

55

 	>=net-wireless/bluez-5:=

56

 	${PYTHON_DEPS}"

57

-DEPEND="${COMMON_DEPEND}

58

+BDEPEND="

59

 	dev-python/cython[${PYTHON_USEDEP}]

60

 	virtual/pkgconfig

61

 	nls? ( dev-util/intltool sys-devel/gettext )"

62

-RDEPEND="${COMMON_DEPEND}

63

+RDEPEND="${DEPEND}

64

 	dev-python/dbus-python[${PYTHON_USEDEP}]

65

 	dev-python/pycairo[${PYTHON_USEDEP}]

66

 	sys-apps/dbus

67

@@ -59,18 +59,19 @@ RDEPEND="${COMMON_DEPEND}

68

 	!net-wireless/gnome-bluetooth

69

"

70

71

+S=${WORKDIR}/${P/_/.}

72

+

73

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

74

75

 pkg_pretend() {

76

 	if use network; then

77

 		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES

78

 			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"

79

-		linux-info_pkg_setup

80

+		check_extra_config

81

fi

82

}

83

84

 pkg_setup() {

85

-	pkg_pretend

86

 	python-single-r1_pkg_setup

87

}

88

89

@@ -86,6 +87,7 @@ src_configure() {

90

 		--disable-static

91

 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"

92

 		--with-systemduserunitdir="$(systemd_get_userunitdir)"

93

+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"

94

 		$(use_enable appindicator)

95

 		$(use_enable policykit polkit)

96

 		$(use_enable nls)

97

98

diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild

99

index c05adb445a6..d7fc408394e 100644

100

--- a/net-wireless/blueman/blueman-9999.ebuild

101

+++ b/net-wireless/blueman/blueman-9999.ebuild

102

@@ -1,9 +1,9 @@

103

-# Copyright 1999-2018 Gentoo Authors

104

+# Copyright 1999-2019 Gentoo Authors

105

 # Distributed under the terms of the GNU General Public License v2

106

107

-EAPI="6"

108

+EAPI="7"

109

110

-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )

111

+PYTHON_COMPAT=( python3_{5,6,7} )

112

 inherit gnome2-utils linux-info python-single-r1 systemd

113

114

 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"

115

@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then

116

 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"

117

 	KEYWORDS=""

118

 else

119

-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"

120

+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"

121

 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"

122

fi

123

124

@@ -22,15 +22,15 @@ LICENSE="GPL-3"

125

 SLOT="0"

126

 IUSE="appindicator network nls policykit pulseaudio"

127

128

-COMMON_DEPEND="

129

+DEPEND="

130

 	dev-python/pygobject:3[${PYTHON_USEDEP}]

131

 	>=net-wireless/bluez-5:=

132

 	${PYTHON_DEPS}"

133

-DEPEND="${COMMON_DEPEND}

134

+BDEPEND="

135

 	dev-python/cython[${PYTHON_USEDEP}]

136

 	virtual/pkgconfig

137

 	nls? ( dev-util/intltool sys-devel/gettext )"

138

-RDEPEND="${COMMON_DEPEND}

139

+RDEPEND="${DEPEND}

140

 	dev-python/dbus-python[${PYTHON_USEDEP}]

141

 	dev-python/pycairo[${PYTHON_USEDEP}]

142

 	sys-apps/dbus

143

@@ -65,12 +65,11 @@ pkg_pretend() {

144

 	if use network; then

145

 		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES

146

 			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"

147

-		linux-info_pkg_setup

148

+		check_extra_config

149

fi

150

}

151

152

 pkg_setup() {

153

-	pkg_pretend

154

 	python-single-r1_pkg_setup

155

}

156

157

@@ -86,6 +85,7 @@ src_configure() {

158

 		--disable-static

159

 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"

160

 		--with-systemduserunitdir="$(systemd_get_userunitdir)"

161

+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"

162

 		$(use_enable appindicator)

163

 		$(use_enable policykit polkit)

164

 		$(use_enable nls)

1	commit: 697e3c0695aa214f2734434077326f929456ac19
2	Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
3	AuthorDate: Sat Apr 13 16:35:46 2019 +0000
4	Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
5	CommitDate: Sat Apr 13 16:37:52 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697e3c06
7
8	net-wireless/blueman: fix DHCP server dir & kernel config check
9
10	Closes: https://bugs.gentoo.org/596634
11	Closes: https://bugs.gentoo.org/628924
12	Package-Manager: Portage-2.3.62, Repoman-2.3.12
13	Signed-off-by: Tiziano Müller <dev-zero <AT> gentoo.org>
14
15	...eman-9999.ebuild => blueman-2.1_alpha3-r1.ebuild} \| 20 +++++++++++---------
16	net-wireless/blueman/blueman-9999.ebuild \| 18 +++++++++---------
17	2 files changed, 20 insertions(+), 18 deletions(-)
18
19	diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
20	similarity index 91%
21	copy from net-wireless/blueman/blueman-9999.ebuild
22	copy to net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
23	index c05adb445a6..80488b8450b 100644
24	--- a/net-wireless/blueman/blueman-9999.ebuild
25	+++ b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
26	@@ -1,9 +1,9 @@
27	-# Copyright 1999-2018 Gentoo Authors
28	+# Copyright 1999-2019 Gentoo Authors
29	# Distributed under the terms of the GNU General Public License v2
30
31	-EAPI="6"
32	+EAPI="7"
33
34	-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
35	+PYTHON_COMPAT=( python3_{5,6,7} )
36	inherit gnome2-utils linux-info python-single-r1 systemd
37
38	DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
39	@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
40	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
41	KEYWORDS=""
42	else
43	- SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
44	+ SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
45	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
46	fi
47
48	@@ -22,15 +22,15 @@ LICENSE="GPL-3"
49	SLOT="0"
50	IUSE="appindicator network nls policykit pulseaudio"
51
52	-COMMON_DEPEND="
53	+DEPEND="
54	dev-python/pygobject:3[${PYTHON_USEDEP}]
55	>=net-wireless/bluez-5:=
56	${PYTHON_DEPS}"
57	-DEPEND="${COMMON_DEPEND}
58	+BDEPEND="
59	dev-python/cython[${PYTHON_USEDEP}]
60	virtual/pkgconfig
61	nls? ( dev-util/intltool sys-devel/gettext )"
62	-RDEPEND="${COMMON_DEPEND}
63	+RDEPEND="${DEPEND}
64	dev-python/dbus-python[${PYTHON_USEDEP}]
65	dev-python/pycairo[${PYTHON_USEDEP}]
66	sys-apps/dbus
67	@@ -59,18 +59,19 @@ RDEPEND="${COMMON_DEPEND}
68	!net-wireless/gnome-bluetooth
69	"
70
71	+S=${WORKDIR}/${P/_/.}
72	+
73	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
74
75	pkg_pretend() {
76	if use network; then
77	local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
78	~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
79	- linux-info_pkg_setup
80	+ check_extra_config
81	fi
82	}
83
84	pkg_setup() {
85	- pkg_pretend
86	python-single-r1_pkg_setup
87	}
88
89	@@ -86,6 +87,7 @@ src_configure() {
90	--disable-static
91	--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
92	--with-systemduserunitdir="$(systemd_get_userunitdir)"
93	+ --with-dhcp-config="/etc/dhcp/dhcpd.conf"
94	$(use_enable appindicator)
95	$(use_enable policykit polkit)
96	$(use_enable nls)
97
98	diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
99	index c05adb445a6..d7fc408394e 100644
100	--- a/net-wireless/blueman/blueman-9999.ebuild
101	+++ b/net-wireless/blueman/blueman-9999.ebuild
102	@@ -1,9 +1,9 @@
103	-# Copyright 1999-2018 Gentoo Authors
104	+# Copyright 1999-2019 Gentoo Authors
105	# Distributed under the terms of the GNU General Public License v2
106
107	-EAPI="6"
108	+EAPI="7"
109
110	-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
111	+PYTHON_COMPAT=( python3_{5,6,7} )
112	inherit gnome2-utils linux-info python-single-r1 systemd
113
114	DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
115	@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
116	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
117	KEYWORDS=""
118	else
119	- SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
120	+ SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
121	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
122	fi
123
124	@@ -22,15 +22,15 @@ LICENSE="GPL-3"
125	SLOT="0"
126	IUSE="appindicator network nls policykit pulseaudio"
127
128	-COMMON_DEPEND="
129	+DEPEND="
130	dev-python/pygobject:3[${PYTHON_USEDEP}]
131	>=net-wireless/bluez-5:=
132	${PYTHON_DEPS}"
133	-DEPEND="${COMMON_DEPEND}
134	+BDEPEND="
135	dev-python/cython[${PYTHON_USEDEP}]
136	virtual/pkgconfig
137	nls? ( dev-util/intltool sys-devel/gettext )"
138	-RDEPEND="${COMMON_DEPEND}
139	+RDEPEND="${DEPEND}
140	dev-python/dbus-python[${PYTHON_USEDEP}]
141	dev-python/pycairo[${PYTHON_USEDEP}]
142	sys-apps/dbus
143	@@ -65,12 +65,11 @@ pkg_pretend() {
144	if use network; then
145	local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
146	~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
147	- linux-info_pkg_setup
148	+ check_extra_config
149	fi
150	}
151
152	pkg_setup() {
153	- pkg_pretend
154	python-single-r1_pkg_setup
155	}
156
157	@@ -86,6 +85,7 @@ src_configure() {
158	--disable-static
159	--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
160	--with-systemduserunitdir="$(systemd_get_userunitdir)"
161	+ --with-dhcp-config="/etc/dhcp/dhcpd.conf"
162	$(use_enable appindicator)
163	$(use_enable policykit polkit)
164	$(use_enable nls)

Gentoo Archives: gentoo-commits