[gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-9999.ebuild openrc-0.2.5.ebuild - gentoo-commits

From:	"Mike Frysinger (vapier)" <vapier@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-9999.ebuild openrc-0.2.5.ebuild
Date:	Sat, 31 May 2008 07:05:06
Message-Id:	`E1K2L99-00042q-4L@stork.gentoo.org`

1

vapier      08/05/31 07:04:59

2

3

  Modified:             ChangeLog openrc-9999.ebuild openrc-0.2.5.ebuild

4

  Log:

5

  Do the timezone upgrade before moving the clock conf.d as pointed out by Hopeless #222867.

6

  (Portage version: 2.2_pre5.spank.spunk)

7

8

Revision  Changes    Path

9

1.38                 sys-apps/openrc/ChangeLog

10

11

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.38&view=markup

12

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.38&content-type=text/plain

13

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.37&r2=1.38

14

15

Index: ChangeLog

16

===================================================================

17

RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v

18

retrieving revision 1.37

19

retrieving revision 1.38

20

diff -u -r1.37 -r1.38

21

--- ChangeLog	29 May 2008 13:47:47 -0000	1.37

22

+++ ChangeLog	31 May 2008 07:04:58 -0000	1.38

23

@@ -1,6 +1,11 @@

24

 # ChangeLog for sys-apps/openrc

25

 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2

26

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.37 2008/05/29 13:47:47 cardoe Exp $

27

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.38 2008/05/31 07:04:58 vapier Exp $

28

+

29

+  31 May 2008; Mike Frysinger <vapier@g.o> openrc-0.2.5.ebuild,

30

+  openrc-9999.ebuild:

31

+  Do the timezone upgrade before moving the clock conf.d as pointed out by

32

+  Hopeless #222867.

33

34

 *openrc-0.2.5 (29 May 2008)

1.34                 sys-apps/openrc/openrc-9999.ebuild

40

41

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.34&view=markup

42

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.34&content-type=text/plain

43

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.33&r2=1.34

44

45

Index: openrc-9999.ebuild

46

===================================================================

47

RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v

48

retrieving revision 1.33

49

retrieving revision 1.34

50

diff -u -r1.33 -r1.34

51

--- openrc-9999.ebuild	5 May 2008 03:54:32 -0000	1.33

52

+++ openrc-9999.ebuild	31 May 2008 07:04:58 -0000	1.34

53

@@ -1,6 +1,6 @@

54

 # Copyright 1999-2008 Gentoo Foundation

55

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

56

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.33 2008/05/05 03:54:32 vapier Exp $

57

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.34 2008/05/31 07:04:58 vapier Exp $

58

59

 inherit eutils flag-o-matic multilib toolchain-funcs

60

61

@@ -127,6 +127,14 @@

62

 	mv "${D}"/etc/conf.d/net "${T}"/

63

 	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/

64

65

+	# upgrade timezone file ... do it before moving clock

66

+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then

67

+		(

68

+		source "${ROOT}"/etc/conf.d/clock

69

+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone

70

+		)

71

+	fi

72

+

73

 	# /etc/conf.d/clock moved to /etc/conf.d/hwclock

74

 	local clock

75

 	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"

76

@@ -149,14 +157,6 @@

77

 		elog "and delete /etc/conf.d/rc"

78

fi

79

80

-	# upgrade timezone file

81

-	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then

82

-		(

83

-		source "${ROOT}"/etc/conf.d/clock

84

-		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone

85

-		)

86

-	fi

87

-

88

 	# force net init.d scripts into symlinks

89

 	for f in "${ROOT}"/etc/init.d/net.* ; do

90

 		[[ -e ${f} ]] || continue # catch net.* not matching anything

1.2                  sys-apps/openrc/openrc-0.2.5.ebuild

95

96

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?rev=1.2&view=markup

97

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?rev=1.2&content-type=text/plain

98

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?r1=1.1&r2=1.2

99

100

Index: openrc-0.2.5.ebuild

101

===================================================================

102

RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v

103

retrieving revision 1.1

104

retrieving revision 1.2

105

diff -u -r1.1 -r1.2

106

--- openrc-0.2.5.ebuild	29 May 2008 13:47:47 -0000	1.1

107

+++ openrc-0.2.5.ebuild	31 May 2008 07:04:58 -0000	1.2

108

@@ -1,6 +1,6 @@

109

 # Copyright 1999-2008 Gentoo Foundation

110

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

111

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.1 2008/05/29 13:47:47 cardoe Exp $

112

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.2 2008/05/31 07:04:58 vapier Exp $

113

114

 inherit eutils flag-o-matic multilib toolchain-funcs

115

116

@@ -127,6 +127,14 @@

117

 	mv "${D}"/etc/conf.d/net "${T}"/

118

 	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/

119

120

+	# upgrade timezone file ... do it before moving clock

121

+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then

122

+		(

123

+		source "${ROOT}"/etc/conf.d/clock

124

+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone

125

+		)

126

+	fi

127

+

128

 	# /etc/conf.d/clock moved to /etc/conf.d/hwclock

129

 	local clock

130

 	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"

131

@@ -149,14 +157,6 @@

132

 		elog "and delete /etc/conf.d/rc"

133

fi

134

135

-	# upgrade timezone file

136

-	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then

137

-		(

138

-		source "${ROOT}"/etc/conf.d/clock

139

-		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone

140

-		)

141

-	fi

142

-

143

 	# force net init.d scripts into symlinks

144

 	for f in "${ROOT}"/etc/init.d/net.* ; do

145

 		[[ -e ${f} ]] || continue # catch net.* not matching anything

--

150

gentoo-commits@l.g.o mailing list

1	vapier 08/05/31 07:04:59
2
3	Modified: ChangeLog openrc-9999.ebuild openrc-0.2.5.ebuild
4	Log:
5	Do the timezone upgrade before moving the clock conf.d as pointed out by Hopeless #222867.
6	(Portage version: 2.2_pre5.spank.spunk)
7
8	Revision Changes Path
9	1.38 sys-apps/openrc/ChangeLog
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.38&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.38&content-type=text/plain
13	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.37&r2=1.38
14
15	Index: ChangeLog
16	===================================================================
17	RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
18	retrieving revision 1.37
19	retrieving revision 1.38
20	diff -u -r1.37 -r1.38
21	--- ChangeLog 29 May 2008 13:47:47 -0000 1.37
22	+++ ChangeLog 31 May 2008 07:04:58 -0000 1.38
23	@@ -1,6 +1,11 @@
24	# ChangeLog for sys-apps/openrc
25	# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.37 2008/05/29 13:47:47 cardoe Exp $
27	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.38 2008/05/31 07:04:58 vapier Exp $
28	+
29	+ 31 May 2008; Mike Frysinger <vapier@g.o> openrc-0.2.5.ebuild,
30	+ openrc-9999.ebuild:
31	+ Do the timezone upgrade before moving the clock conf.d as pointed out by
32	+ Hopeless #222867.
33
34	*openrc-0.2.5 (29 May 2008)
35
36
37
38
39	1.34 sys-apps/openrc/openrc-9999.ebuild
40
41	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.34&view=markup
42	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.34&content-type=text/plain
43	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.33&r2=1.34
44
45	Index: openrc-9999.ebuild
46	===================================================================
47	RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
48	retrieving revision 1.33
49	retrieving revision 1.34
50	diff -u -r1.33 -r1.34
51	--- openrc-9999.ebuild 5 May 2008 03:54:32 -0000 1.33
52	+++ openrc-9999.ebuild 31 May 2008 07:04:58 -0000 1.34
53	@@ -1,6 +1,6 @@
54	# Copyright 1999-2008 Gentoo Foundation
55	# Distributed under the terms of the GNU General Public License v2
56	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.33 2008/05/05 03:54:32 vapier Exp $
57	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.34 2008/05/31 07:04:58 vapier Exp $
58
59	inherit eutils flag-o-matic multilib toolchain-funcs
60
61	@@ -127,6 +127,14 @@
62	mv "${D}"/etc/conf.d/net "${T}"/
63	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
64
65	+ # upgrade timezone file ... do it before moving clock
66	+ if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
67	+ (
68	+ source "${ROOT}"/etc/conf.d/clock
69	+ [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
70	+ )
71	+ fi
72	+
73	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
74	local clock
75	use kernel_FreeBSD && clock="adjkerntz" \|\| clock="hwclock"
76	@@ -149,14 +157,6 @@
77	elog "and delete /etc/conf.d/rc"
78	fi
79
80	- # upgrade timezone file
81	- if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
82	- (
83	- source "${ROOT}"/etc/conf.d/clock
84	- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
85	- )
86	- fi
87	-
88	# force net init.d scripts into symlinks
89	for f in "${ROOT}"/etc/init.d/net.* ; do
90	[[ -e ${f} ]] \|\| continue # catch net.* not matching anything
91
92
93
94	1.2 sys-apps/openrc/openrc-0.2.5.ebuild
95
96	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?rev=1.2&view=markup
97	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?rev=1.2&content-type=text/plain
98	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild?r1=1.1&r2=1.2
99
100	Index: openrc-0.2.5.ebuild
101	===================================================================
102	RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v
103	retrieving revision 1.1
104	retrieving revision 1.2
105	diff -u -r1.1 -r1.2
106	--- openrc-0.2.5.ebuild 29 May 2008 13:47:47 -0000 1.1
107	+++ openrc-0.2.5.ebuild 31 May 2008 07:04:58 -0000 1.2
108	@@ -1,6 +1,6 @@
109	# Copyright 1999-2008 Gentoo Foundation
110	# Distributed under the terms of the GNU General Public License v2
111	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.1 2008/05/29 13:47:47 cardoe Exp $
112	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.2 2008/05/31 07:04:58 vapier Exp $
113
114	inherit eutils flag-o-matic multilib toolchain-funcs
115
116	@@ -127,6 +127,14 @@
117	mv "${D}"/etc/conf.d/net "${T}"/
118	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
119
120	+ # upgrade timezone file ... do it before moving clock
121	+ if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
122	+ (
123	+ source "${ROOT}"/etc/conf.d/clock
124	+ [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
125	+ )
126	+ fi
127	+
128	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
129	local clock
130	use kernel_FreeBSD && clock="adjkerntz" \|\| clock="hwclock"
131	@@ -149,14 +157,6 @@
132	elog "and delete /etc/conf.d/rc"
133	fi
134
135	- # upgrade timezone file
136	- if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
137	- (
138	- source "${ROOT}"/etc/conf.d/clock
139	- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
140	- )
141	- fi
142	-
143	# force net init.d scripts into symlinks
144	for f in "${ROOT}"/etc/init.d/net.* ; do
145	[[ -e ${f} ]] \|\| continue # catch net.* not matching anything
146
147
148
149	--
150	gentoo-commits@l.g.o mailing list

Gentoo Archives: gentoo-commits