[gentoo-commits] proj/kde:master commit in: kde-base/kajongg/ - gentoo-commits

From:	Johannes Huber <johu@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/kde:master commit in: kde-base/kajongg/
Date:	Sun, 30 Jun 2013 15:03:18
Message-Id:	`1372604585.01063b22c4408ccf35c3803b5dbdf6f977993ecc.johu@gentoo`

1

commit:     01063b22c4408ccf35c3803b5dbdf6f977993ecc

2

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

3

AuthorDate: Sun Jun 30 15:03:05 2013 +0000

4

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

5

CommitDate: Sun Jun 30 15:03:05 2013 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=01063b22

7

8

[kde-base/kajongg] Migrate to python-single-r1 eclass.

9

10

Package-Manager: portage-2.2.0_alpha186

11

12

---

13

 kde-base/kajongg/kajongg-4.10.49.9999.ebuild | 14 ++++++++------

14

 kde-base/kajongg/kajongg-4.10.5.ebuild       | 16 +++++++++-------

15

 kde-base/kajongg/kajongg-4.10.90.ebuild      | 16 +++++++++-------

16

 kde-base/kajongg/kajongg-9999.ebuild         | 14 ++++++++------

17

 4 files changed, 34 insertions(+), 26 deletions(-)

18

19

diff --git a/kde-base/kajongg/kajongg-4.10.49.9999.ebuild b/kde-base/kajongg/kajongg-4.10.49.9999.ebuild

20

index fc58e71..528d562 100644

21

--- a/kde-base/kajongg/kajongg-4.10.49.9999.ebuild

22

+++ b/kde-base/kajongg/kajongg-4.10.49.9999.ebuild

23

@@ -5,17 +5,20 @@

24

 EAPI=5

25

26

 KDE_HANDBOOK="optional"

27

-PYTHON_DEPEND="2:2.6"

28

-inherit kde4-base python

29

+PYTHON_COMPAT=( python{2_6,2_7} )

30

+inherit python-single-r1 kde4-base

31

32

 DESCRIPTION="The classical Mah Jongg for four players"

33

 KEYWORDS=""

34

 IUSE="debug"

35

36

+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

37

+

38

 DEPEND="

39

+	${PYTHON_DEPS}

40

 	dev-db/sqlite:3

41

 	$(add_kdebase_dep libkdegames)

42

-	$(add_kdebase_dep pykde4)

43

+	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")

44

"

45

 RDEPEND="${DEPEND}

46

 	$(add_kdebase_dep libkmahjongg)

47

@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}

48

"

49

50

 pkg_setup() {

51

-	python_set_active_version 2

52

-	python_pkg_setup

53

+	python-single-r1_pkg_setup

54

 	kde4-base_pkg_setup

55

}

56

57

 src_prepare() {

58

-	python_convert_shebangs -r 2 src

59

+	python_fix_shebang src

60

 	kde4-base_src_prepare

61

}

62

63

diff --git a/kde-base/kajongg/kajongg-4.10.5.ebuild b/kde-base/kajongg/kajongg-4.10.5.ebuild

64

index c5b635b..5a63c63 100644

65

--- a/kde-base/kajongg/kajongg-4.10.5.ebuild

66

+++ b/kde-base/kajongg/kajongg-4.10.5.ebuild

67

@@ -5,17 +5,20 @@

68

 EAPI=5

69

70

 KDE_HANDBOOK="optional"

71

-PYTHON_DEPEND="2:2.6"

72

-inherit kde4-base python

73

+PYTHON_COMPAT=( python{2_6,2_7} )

74

+inherit python-single-r1 kde4-base

75

76

 DESCRIPTION="The classical Mah Jongg for four players"

77

-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"

78

+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"

79

 IUSE="debug"

80

81

+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

82

+

83

 DEPEND="

84

+	${PYTHON_DEPS}

85

 	dev-db/sqlite:3

86

 	$(add_kdebase_dep libkdegames)

87

-	$(add_kdebase_dep pykde4)

88

+	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")

89

"

90

 RDEPEND="${DEPEND}

91

 	$(add_kdebase_dep libkmahjongg)

92

@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}

93

"

94

95

 pkg_setup() {

96

-	python_set_active_version 2

97

-	python_pkg_setup

98

+	python-single-r1_pkg_setup

99

 	kde4-base_pkg_setup

100

}

101

102

 src_prepare() {

103

-	python_convert_shebangs -r 2 src

104

+	python_fix_shebang src

105

 	kde4-base_src_prepare

106

}

107

108

diff --git a/kde-base/kajongg/kajongg-4.10.90.ebuild b/kde-base/kajongg/kajongg-4.10.90.ebuild

109

index bae0410..d190ed8 100644

110

--- a/kde-base/kajongg/kajongg-4.10.90.ebuild

111

+++ b/kde-base/kajongg/kajongg-4.10.90.ebuild

112

@@ -5,17 +5,20 @@

113

 EAPI=5

114

115

 KDE_HANDBOOK="optional"

116

-PYTHON_DEPEND="2:2.6"

117

-inherit kde4-base python

118

+PYTHON_COMPAT=( python{2_6,2_7} )

119

+inherit python-single-r1 kde4-base

120

121

 DESCRIPTION="The classical Mah Jongg for four players"

122

-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"

123

+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

124

 IUSE="debug"

125

126

+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

127

+

128

 DEPEND="

129

+	${PYTHON_DEPS}

130

 	dev-db/sqlite:3

131

 	$(add_kdebase_dep libkdegames)

132

-	$(add_kdebase_dep pykde4)

133

+	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")

134

"

135

 RDEPEND="${DEPEND}

136

 	$(add_kdebase_dep libkmahjongg)

137

@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}

138

"

139

140

 pkg_setup() {

141

-	python_set_active_version 2

142

-	python_pkg_setup

143

+	python-single-r1_pkg_setup

144

 	kde4-base_pkg_setup

145

}

146

147

 src_prepare() {

148

-	python_convert_shebangs -r 2 src

149

+	python_fix_shebang src

150

 	kde4-base_src_prepare

151

}

152

153

diff --git a/kde-base/kajongg/kajongg-9999.ebuild b/kde-base/kajongg/kajongg-9999.ebuild

154

index fc58e71..528d562 100644

155

--- a/kde-base/kajongg/kajongg-9999.ebuild

156

+++ b/kde-base/kajongg/kajongg-9999.ebuild

157

@@ -5,17 +5,20 @@

158

 EAPI=5

159

160

 KDE_HANDBOOK="optional"

161

-PYTHON_DEPEND="2:2.6"

162

-inherit kde4-base python

163

+PYTHON_COMPAT=( python{2_6,2_7} )

164

+inherit python-single-r1 kde4-base

165

166

 DESCRIPTION="The classical Mah Jongg for four players"

167

 KEYWORDS=""

168

 IUSE="debug"

169

170

+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

171

+

172

 DEPEND="

173

+	${PYTHON_DEPS}

174

 	dev-db/sqlite:3

175

 	$(add_kdebase_dep libkdegames)

176

-	$(add_kdebase_dep pykde4)

177

+	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")

178

"

179

 RDEPEND="${DEPEND}

180

 	$(add_kdebase_dep libkmahjongg)

181

@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}

182

"

183

184

 pkg_setup() {

185

-	python_set_active_version 2

186

-	python_pkg_setup

187

+	python-single-r1_pkg_setup

188

 	kde4-base_pkg_setup

189

}

190

191

 src_prepare() {

192

-	python_convert_shebangs -r 2 src

193

+	python_fix_shebang src

194

 	kde4-base_src_prepare

195

}

1	commit: 01063b22c4408ccf35c3803b5dbdf6f977993ecc
2	Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jun 30 15:03:05 2013 +0000
4	Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5	CommitDate: Sun Jun 30 15:03:05 2013 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=01063b22
7
8	[kde-base/kajongg] Migrate to python-single-r1 eclass.
9
10	Package-Manager: portage-2.2.0_alpha186
11
12	---
13	kde-base/kajongg/kajongg-4.10.49.9999.ebuild \| 14 ++++++++------
14	kde-base/kajongg/kajongg-4.10.5.ebuild \| 16 +++++++++-------
15	kde-base/kajongg/kajongg-4.10.90.ebuild \| 16 +++++++++-------
16	kde-base/kajongg/kajongg-9999.ebuild \| 14 ++++++++------
17	4 files changed, 34 insertions(+), 26 deletions(-)
18
19	diff --git a/kde-base/kajongg/kajongg-4.10.49.9999.ebuild b/kde-base/kajongg/kajongg-4.10.49.9999.ebuild
20	index fc58e71..528d562 100644
21	--- a/kde-base/kajongg/kajongg-4.10.49.9999.ebuild
22	+++ b/kde-base/kajongg/kajongg-4.10.49.9999.ebuild
23	@@ -5,17 +5,20 @@
24	EAPI=5
25
26	KDE_HANDBOOK="optional"
27	-PYTHON_DEPEND="2:2.6"
28	-inherit kde4-base python
29	+PYTHON_COMPAT=( python{2_6,2_7} )
30	+inherit python-single-r1 kde4-base
31
32	DESCRIPTION="The classical Mah Jongg for four players"
33	KEYWORDS=""
34	IUSE="debug"
35
36	+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
37	+
38	DEPEND="
39	+ ${PYTHON_DEPS}
40	dev-db/sqlite:3
41	$(add_kdebase_dep libkdegames)
42	- $(add_kdebase_dep pykde4)
43	+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
44	"
45	RDEPEND="${DEPEND}
46	$(add_kdebase_dep libkmahjongg)
47	@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}
48	"
49
50	pkg_setup() {
51	- python_set_active_version 2
52	- python_pkg_setup
53	+ python-single-r1_pkg_setup
54	kde4-base_pkg_setup
55	}
56
57	src_prepare() {
58	- python_convert_shebangs -r 2 src
59	+ python_fix_shebang src
60	kde4-base_src_prepare
61	}
62
63	diff --git a/kde-base/kajongg/kajongg-4.10.5.ebuild b/kde-base/kajongg/kajongg-4.10.5.ebuild
64	index c5b635b..5a63c63 100644
65	--- a/kde-base/kajongg/kajongg-4.10.5.ebuild
66	+++ b/kde-base/kajongg/kajongg-4.10.5.ebuild
67	@@ -5,17 +5,20 @@
68	EAPI=5
69
70	KDE_HANDBOOK="optional"
71	-PYTHON_DEPEND="2:2.6"
72	-inherit kde4-base python
73	+PYTHON_COMPAT=( python{2_6,2_7} )
74	+inherit python-single-r1 kde4-base
75
76	DESCRIPTION="The classical Mah Jongg for four players"
77	-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
78	+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
79	IUSE="debug"
80
81	+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
82	+
83	DEPEND="
84	+ ${PYTHON_DEPS}
85	dev-db/sqlite:3
86	$(add_kdebase_dep libkdegames)
87	- $(add_kdebase_dep pykde4)
88	+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
89	"
90	RDEPEND="${DEPEND}
91	$(add_kdebase_dep libkmahjongg)
92	@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}
93	"
94
95	pkg_setup() {
96	- python_set_active_version 2
97	- python_pkg_setup
98	+ python-single-r1_pkg_setup
99	kde4-base_pkg_setup
100	}
101
102	src_prepare() {
103	- python_convert_shebangs -r 2 src
104	+ python_fix_shebang src
105	kde4-base_src_prepare
106	}
107
108	diff --git a/kde-base/kajongg/kajongg-4.10.90.ebuild b/kde-base/kajongg/kajongg-4.10.90.ebuild
109	index bae0410..d190ed8 100644
110	--- a/kde-base/kajongg/kajongg-4.10.90.ebuild
111	+++ b/kde-base/kajongg/kajongg-4.10.90.ebuild
112	@@ -5,17 +5,20 @@
113	EAPI=5
114
115	KDE_HANDBOOK="optional"
116	-PYTHON_DEPEND="2:2.6"
117	-inherit kde4-base python
118	+PYTHON_COMPAT=( python{2_6,2_7} )
119	+inherit python-single-r1 kde4-base
120
121	DESCRIPTION="The classical Mah Jongg for four players"
122	-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
123	+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
124	IUSE="debug"
125
126	+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
127	+
128	DEPEND="
129	+ ${PYTHON_DEPS}
130	dev-db/sqlite:3
131	$(add_kdebase_dep libkdegames)
132	- $(add_kdebase_dep pykde4)
133	+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
134	"
135	RDEPEND="${DEPEND}
136	$(add_kdebase_dep libkmahjongg)
137	@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}
138	"
139
140	pkg_setup() {
141	- python_set_active_version 2
142	- python_pkg_setup
143	+ python-single-r1_pkg_setup
144	kde4-base_pkg_setup
145	}
146
147	src_prepare() {
148	- python_convert_shebangs -r 2 src
149	+ python_fix_shebang src
150	kde4-base_src_prepare
151	}
152
153	diff --git a/kde-base/kajongg/kajongg-9999.ebuild b/kde-base/kajongg/kajongg-9999.ebuild
154	index fc58e71..528d562 100644
155	--- a/kde-base/kajongg/kajongg-9999.ebuild
156	+++ b/kde-base/kajongg/kajongg-9999.ebuild
157	@@ -5,17 +5,20 @@
158	EAPI=5
159
160	KDE_HANDBOOK="optional"
161	-PYTHON_DEPEND="2:2.6"
162	-inherit kde4-base python
163	+PYTHON_COMPAT=( python{2_6,2_7} )
164	+inherit python-single-r1 kde4-base
165
166	DESCRIPTION="The classical Mah Jongg for four players"
167	KEYWORDS=""
168	IUSE="debug"
169
170	+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
171	+
172	DEPEND="
173	+ ${PYTHON_DEPS}
174	dev-db/sqlite:3
175	$(add_kdebase_dep libkdegames)
176	- $(add_kdebase_dep pykde4)
177	+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
178	"
179	RDEPEND="${DEPEND}
180	$(add_kdebase_dep libkmahjongg)
181	@@ -23,12 +26,11 @@ RDEPEND="${DEPEND}
182	"
183
184	pkg_setup() {
185	- python_set_active_version 2
186	- python_pkg_setup
187	+ python-single-r1_pkg_setup
188	kde4-base_pkg_setup
189	}
190
191	src_prepare() {
192	- python_convert_shebangs -r 2 src
193	+ python_fix_shebang src
194	kde4-base_src_prepare
195	}

Gentoo Archives: gentoo-commits