[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ - gentoo-commits

From:	"Robin H. Johnson" <robbat2@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date:	Tue, 26 Sep 2017 17:03:26
Message-Id:	`1506445391.297a8ddb8996cb2a288c36fb8859b776b0b652b7.robbat2@gentoo`

1

commit:     297a8ddb8996cb2a288c36fb8859b776b0b652b7

2

Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

3

AuthorDate: Tue Sep 26 16:50:04 2017 +0000

4

Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

5

CommitDate: Tue Sep 26 17:03:11 2017 +0000

6

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

7

8

dev-vcs/git: make 9999 ebuilds share common code for easy of copy

9

10

Package-Manager: Portage-2.3.8, Repoman-2.3.3

11

12

 dev-vcs/git/git-9999-r1.ebuild | 27 +++++++++++++++++----------

13

 dev-vcs/git/git-9999-r2.ebuild | 27 +++++++++++++++++----------

14

 dev-vcs/git/git-9999-r3.ebuild | 27 +++++++++++++++++----------

15

 dev-vcs/git/git-9999.ebuild    | 27 +++++++++++++++++----------

16

 4 files changed, 68 insertions(+), 40 deletions(-)

17

18

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild

19

index b588ab74080..d079a65a75e 100644

20

--- a/dev-vcs/git/git-9999-r1.ebuild

21

+++ b/dev-vcs/git/git-9999-r1.ebuild

22

@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no

23

24

 # bug #329479: git-remote-testgit is not multiple-version aware

25

 PYTHON_COMPAT=( python2_7 )

26

-[[ ${PV} == *9999 ]] && SCM="git-r3"

27

-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

28

-# See https://git-scm.com/docs/gitworkflows#_graduation

29

-# In order of stability:

30

-# 9999-r0: maint

31

-# 9999-r1: master

32

-# 9999-r2: next

33

-# 9999-r3: pu

34

-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

35

-EGIT_BRANCH=master

36

 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"

37

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

38

+	SCM="git-r3"

39

+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

40

+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

41

+	# See https://git-scm.com/docs/gitworkflows#_graduation

42

+	# In order of stability:

43

+	# 9999-r0: maint

44

+	# 9999-r1: master

45

+	# 9999-r2: next

46

+	# 9999-r3: pu

47

+	case "${PVR}" in

48

+		9999) EGIT_BRANCH=maint ;;

49

+		9999-r1) EGIT_BRANCH=master ;;

50

+		9999-r2) EGIT_BRANCH=next;;

51

+		9999-r3) EGIT_BRANCH=pu ;;

52

+	esac

53

+fi

54

55

 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

56

57

58

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild

59

index 01272659efb..d079a65a75e 100644

60

--- a/dev-vcs/git/git-9999-r2.ebuild

61

+++ b/dev-vcs/git/git-9999-r2.ebuild

62

@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no

63

64

 # bug #329479: git-remote-testgit is not multiple-version aware

65

 PYTHON_COMPAT=( python2_7 )

66

-[[ ${PV} == *9999 ]] && SCM="git-r3"

67

-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

68

-# See https://git-scm.com/docs/gitworkflows#_graduation

69

-# In order of stability:

70

-# 9999-r0: maint

71

-# 9999-r1: master

72

-# 9999-r2: next

73

-# 9999-r3: pu

74

-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

75

-EGIT_BRANCH=next

76

 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"

77

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

78

+	SCM="git-r3"

79

+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

80

+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

81

+	# See https://git-scm.com/docs/gitworkflows#_graduation

82

+	# In order of stability:

83

+	# 9999-r0: maint

84

+	# 9999-r1: master

85

+	# 9999-r2: next

86

+	# 9999-r3: pu

87

+	case "${PVR}" in

88

+		9999) EGIT_BRANCH=maint ;;

89

+		9999-r1) EGIT_BRANCH=master ;;

90

+		9999-r2) EGIT_BRANCH=next;;

91

+		9999-r3) EGIT_BRANCH=pu ;;

92

+	esac

93

+fi

94

95

 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

96

97

98

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild

99

index 76bcaf24d0d..d079a65a75e 100644

100

--- a/dev-vcs/git/git-9999-r3.ebuild

101

+++ b/dev-vcs/git/git-9999-r3.ebuild

102

@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no

103

104

 # bug #329479: git-remote-testgit is not multiple-version aware

105

 PYTHON_COMPAT=( python2_7 )

106

-[[ ${PV} == *9999 ]] && SCM="git-r3"

107

-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

108

-# See https://git-scm.com/docs/gitworkflows#_graduation

109

-# In order of stability:

110

-# 9999-r0: maint

111

-# 9999-r1: master

112

-# 9999-r2: next

113

-# 9999-r3: pu

114

-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

115

-EGIT_BRANCH=pu

116

 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"

117

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

118

+	SCM="git-r3"

119

+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

120

+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

121

+	# See https://git-scm.com/docs/gitworkflows#_graduation

122

+	# In order of stability:

123

+	# 9999-r0: maint

124

+	# 9999-r1: master

125

+	# 9999-r2: next

126

+	# 9999-r3: pu

127

+	case "${PVR}" in

128

+		9999) EGIT_BRANCH=maint ;;

129

+		9999-r1) EGIT_BRANCH=master ;;

130

+		9999-r2) EGIT_BRANCH=next;;

131

+		9999-r3) EGIT_BRANCH=pu ;;

132

+	esac

133

+fi

134

135

 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

136

137

138

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild

139

index aa7cf5a5b93..d079a65a75e 100644

140

--- a/dev-vcs/git/git-9999.ebuild

141

+++ b/dev-vcs/git/git-9999.ebuild

142

@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no

143

144

 # bug #329479: git-remote-testgit is not multiple-version aware

145

 PYTHON_COMPAT=( python2_7 )

146

-[[ ${PV} == *9999 ]] && SCM="git-r3"

147

-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

148

-# See https://git-scm.com/docs/gitworkflows#_graduation

149

-# In order of stability:

150

-# 9999-r0: maint

151

-# 9999-r1: master

152

-# 9999-r2: next

153

-# 9999-r3: pu

154

-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

155

-EGIT_BRANCH=maint

156

 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"

157

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

158

+	SCM="git-r3"

159

+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"

160

+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.

161

+	# See https://git-scm.com/docs/gitworkflows#_graduation

162

+	# In order of stability:

163

+	# 9999-r0: maint

164

+	# 9999-r1: master

165

+	# 9999-r2: next

166

+	# 9999-r3: pu

167

+	case "${PVR}" in

168

+		9999) EGIT_BRANCH=maint ;;

169

+		9999-r1) EGIT_BRANCH=master ;;

170

+		9999-r2) EGIT_BRANCH=next;;

171

+		9999-r3) EGIT_BRANCH=pu ;;

172

+	esac

173

+fi

174

175

 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

1	commit: 297a8ddb8996cb2a288c36fb8859b776b0b652b7
2	Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3	AuthorDate: Tue Sep 26 16:50:04 2017 +0000
4	Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5	CommitDate: Tue Sep 26 17:03:11 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297a8ddb
7
8	dev-vcs/git: make 9999 ebuilds share common code for easy of copy
9
10	Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12	dev-vcs/git/git-9999-r1.ebuild \| 27 +++++++++++++++++----------
13	dev-vcs/git/git-9999-r2.ebuild \| 27 +++++++++++++++++----------
14	dev-vcs/git/git-9999-r3.ebuild \| 27 +++++++++++++++++----------
15	dev-vcs/git/git-9999.ebuild \| 27 +++++++++++++++++----------
16	4 files changed, 68 insertions(+), 40 deletions(-)
17
18	diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
19	index b588ab74080..d079a65a75e 100644
20	--- a/dev-vcs/git/git-9999-r1.ebuild
21	+++ b/dev-vcs/git/git-9999-r1.ebuild
22	@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no
23
24	# bug #329479: git-remote-testgit is not multiple-version aware
25	PYTHON_COMPAT=( python2_7 )
26	-[[ ${PV} == *9999 ]] && SCM="git-r3"
27	-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
28	-# See https://git-scm.com/docs/gitworkflows#_graduation
29	-# In order of stability:
30	-# 9999-r0: maint
31	-# 9999-r1: master
32	-# 9999-r2: next
33	-# 9999-r3: pu
34	-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
35	-EGIT_BRANCH=master
36	PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
37	+if [[ ${PV} == *9999 ]]; then
38	+ SCM="git-r3"
39	+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
40	+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
41	+ # See https://git-scm.com/docs/gitworkflows#_graduation
42	+ # In order of stability:
43	+ # 9999-r0: maint
44	+ # 9999-r1: master
45	+ # 9999-r2: next
46	+ # 9999-r3: pu
47	+ case "${PVR}" in
48	+ 9999) EGIT_BRANCH=maint ;;
49	+ 9999-r1) EGIT_BRANCH=master ;;
50	+ 9999-r2) EGIT_BRANCH=next;;
51	+ 9999-r3) EGIT_BRANCH=pu ;;
52	+ esac
53	+fi
54
55	inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
56
57
58	diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
59	index 01272659efb..d079a65a75e 100644
60	--- a/dev-vcs/git/git-9999-r2.ebuild
61	+++ b/dev-vcs/git/git-9999-r2.ebuild
62	@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no
63
64	# bug #329479: git-remote-testgit is not multiple-version aware
65	PYTHON_COMPAT=( python2_7 )
66	-[[ ${PV} == *9999 ]] && SCM="git-r3"
67	-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
68	-# See https://git-scm.com/docs/gitworkflows#_graduation
69	-# In order of stability:
70	-# 9999-r0: maint
71	-# 9999-r1: master
72	-# 9999-r2: next
73	-# 9999-r3: pu
74	-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
75	-EGIT_BRANCH=next
76	PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
77	+if [[ ${PV} == *9999 ]]; then
78	+ SCM="git-r3"
79	+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
80	+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
81	+ # See https://git-scm.com/docs/gitworkflows#_graduation
82	+ # In order of stability:
83	+ # 9999-r0: maint
84	+ # 9999-r1: master
85	+ # 9999-r2: next
86	+ # 9999-r3: pu
87	+ case "${PVR}" in
88	+ 9999) EGIT_BRANCH=maint ;;
89	+ 9999-r1) EGIT_BRANCH=master ;;
90	+ 9999-r2) EGIT_BRANCH=next;;
91	+ 9999-r3) EGIT_BRANCH=pu ;;
92	+ esac
93	+fi
94
95	inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
96
97
98	diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
99	index 76bcaf24d0d..d079a65a75e 100644
100	--- a/dev-vcs/git/git-9999-r3.ebuild
101	+++ b/dev-vcs/git/git-9999-r3.ebuild
102	@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no
103
104	# bug #329479: git-remote-testgit is not multiple-version aware
105	PYTHON_COMPAT=( python2_7 )
106	-[[ ${PV} == *9999 ]] && SCM="git-r3"
107	-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
108	-# See https://git-scm.com/docs/gitworkflows#_graduation
109	-# In order of stability:
110	-# 9999-r0: maint
111	-# 9999-r1: master
112	-# 9999-r2: next
113	-# 9999-r3: pu
114	-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
115	-EGIT_BRANCH=pu
116	PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
117	+if [[ ${PV} == *9999 ]]; then
118	+ SCM="git-r3"
119	+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
120	+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
121	+ # See https://git-scm.com/docs/gitworkflows#_graduation
122	+ # In order of stability:
123	+ # 9999-r0: maint
124	+ # 9999-r1: master
125	+ # 9999-r2: next
126	+ # 9999-r3: pu
127	+ case "${PVR}" in
128	+ 9999) EGIT_BRANCH=maint ;;
129	+ 9999-r1) EGIT_BRANCH=master ;;
130	+ 9999-r2) EGIT_BRANCH=next;;
131	+ 9999-r3) EGIT_BRANCH=pu ;;
132	+ esac
133	+fi
134
135	inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
136
137
138	diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
139	index aa7cf5a5b93..d079a65a75e 100644
140	--- a/dev-vcs/git/git-9999.ebuild
141	+++ b/dev-vcs/git/git-9999.ebuild
142	@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no
143
144	# bug #329479: git-remote-testgit is not multiple-version aware
145	PYTHON_COMPAT=( python2_7 )
146	-[[ ${PV} == *9999 ]] && SCM="git-r3"
147	-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
148	-# See https://git-scm.com/docs/gitworkflows#_graduation
149	-# In order of stability:
150	-# 9999-r0: maint
151	-# 9999-r1: master
152	-# 9999-r2: next
153	-# 9999-r3: pu
154	-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
155	-EGIT_BRANCH=maint
156	PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
157	+if [[ ${PV} == *9999 ]]; then
158	+ SCM="git-r3"
159	+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
160	+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
161	+ # See https://git-scm.com/docs/gitworkflows#_graduation
162	+ # In order of stability:
163	+ # 9999-r0: maint
164	+ # 9999-r1: master
165	+ # 9999-r2: next
166	+ # 9999-r3: pu
167	+ case "${PVR}" in
168	+ 9999) EGIT_BRANCH=maint ;;
169	+ 9999-r1) EGIT_BRANCH=master ;;
170	+ 9999-r2) EGIT_BRANCH=next;;
171	+ 9999-r3) EGIT_BRANCH=pu ;;
172	+ esac
173	+fi
174
175	inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}

Gentoo Archives: gentoo-commits