[gentoo-commits] gentoo-x86 commit in sys-apps/slocate: slocate-2.7-r8.ebuild slocate-3.1-r1.ebuild ChangeLog - gentoo-commits

From:	"Mike Frysinger (vapier)" <vapier@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in sys-apps/slocate: slocate-2.7-r8.ebuild slocate-3.1-r1.ebuild ChangeLog
Date:	Sun, 02 Dec 2007 20:03:20
Message-Id:	`E1Iyv22-0007qr-CJ@stork.gentoo.org`

1

vapier      07/12/02 20:03:14

2

3

  Modified:             slocate-2.7-r8.ebuild slocate-3.1-r1.ebuild

4

                        ChangeLog

5

  Log:

6

  Allow people to have both slocate and locate groups at the same time #200949 by Timothy Stotts.

7

  (Portage version: 2.1.4_rc4)

8

9

Revision  Changes    Path

10

1.16                 sys-apps/slocate/slocate-2.7-r8.ebuild

11

12

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&view=markup

13

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&content-type=text/plain

14

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?r1=1.15&r2=1.16

15

16

Index: slocate-2.7-r8.ebuild

17

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

18

RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v

19

retrieving revision 1.15

20

retrieving revision 1.16

21

diff -u -r1.15 -r1.16

22

--- slocate-2.7-r8.ebuild	23 Jul 2007 05:25:47 -0000	1.15

23

+++ slocate-2.7-r8.ebuild	2 Dec 2007 20:03:13 -0000	1.16

24

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

25

 # Copyright 1999-2007 Gentoo Foundation

26

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

27

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.15 2007/07/23 05:25:47 vapier Exp $

28

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.16 2007/12/02 20:03:13 vapier Exp $

29

30

 inherit flag-o-matic eutils

31

32

@@ -20,7 +20,7 @@

33

 	!sys-apps/rlocate"

34

35

 pkg_setup() {

36

-	if [[ -n $(egetent group slocate) ]] ; then

37

+	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then

38

 		eerror "The 'slocate' group has been renamed to 'locate'."

39

 		eerror "You seem to already have a 'slocate' group."

40

 		eerror "Please rename it:"

1.3                  sys-apps/slocate/slocate-3.1-r1.ebuild

45

46

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.3&view=markup

47

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.3&content-type=text/plain

48

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?r1=1.2&r2=1.3

49

50

Index: slocate-3.1-r1.ebuild

51

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

52

RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v

53

retrieving revision 1.2

54

retrieving revision 1.3

55

diff -u -r1.2 -r1.3

56

--- slocate-3.1-r1.ebuild	23 Jul 2007 05:25:47 -0000	1.2

57

+++ slocate-3.1-r1.ebuild	2 Dec 2007 20:03:13 -0000	1.3

58

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

59

 # Copyright 1999-2007 Gentoo Foundation

60

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

61

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.2 2007/07/23 05:25:47 vapier Exp $

62

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.3 2007/12/02 20:03:13 vapier Exp $

63

64

 inherit flag-o-matic eutils

65

66

@@ -18,7 +18,7 @@

67

 	!sys-apps/rlocate"

68

69

 pkg_setup() {

70

-	if [[ -n $(egetent group slocate) ]] ; then

71

+	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then

72

 		eerror "The 'slocate' group has been renamed to 'locate'."

73

 		eerror "You seem to already have a 'slocate' group."

74

 		eerror "Please rename it:"

1.74                 sys-apps/slocate/ChangeLog

79

80

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

81

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

82

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?r1=1.73&r2=1.74

83

84

Index: ChangeLog

85

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

86

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

87

retrieving revision 1.73

88

retrieving revision 1.74

89

diff -u -r1.73 -r1.74

90

--- ChangeLog	25 Aug 2007 18:20:37 -0000	1.73

91

+++ ChangeLog	2 Dec 2007 20:03:13 -0000	1.74

92

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

93

 # ChangeLog for sys-apps/slocate

94

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

95

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.73 2007/08/25 18:20:37 vapier Exp $

96

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.74 2007/12/02 20:03:13 vapier Exp $

97

+

98

+  02 Dec 2007; Mike Frysinger <vapier@g.o> slocate-2.7-r8.ebuild,

99

+  slocate-3.1-r1.ebuild:

100

+  Allow people to have both slocate and locate groups at the same time #200949

101

+  by Timothy Stotts.

102

103

   25 Aug 2007; Mike Frysinger <vapier@g.o>

104

   files/slocate-3.1-cron.patch:

--

109

gentoo-commits@g.o mailing list

1	vapier 07/12/02 20:03:14
2
3	Modified: slocate-2.7-r8.ebuild slocate-3.1-r1.ebuild
4	ChangeLog
5	Log:
6	Allow people to have both slocate and locate groups at the same time #200949 by Timothy Stotts.
7	(Portage version: 2.1.4_rc4)
8
9	Revision Changes Path
10	1.16 sys-apps/slocate/slocate-2.7-r8.ebuild
11
12	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&view=markup
13	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&content-type=text/plain
14	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?r1=1.15&r2=1.16
15
16	Index: slocate-2.7-r8.ebuild
17	===================================================================
18	RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v
19	retrieving revision 1.15
20	retrieving revision 1.16
21	diff -u -r1.15 -r1.16
22	--- slocate-2.7-r8.ebuild 23 Jul 2007 05:25:47 -0000 1.15
23	+++ slocate-2.7-r8.ebuild 2 Dec 2007 20:03:13 -0000 1.16
24	@@ -1,6 +1,6 @@
25	# Copyright 1999-2007 Gentoo Foundation
26	# Distributed under the terms of the GNU General Public License v2
27	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.15 2007/07/23 05:25:47 vapier Exp $
28	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.16 2007/12/02 20:03:13 vapier Exp $
29
30	inherit flag-o-matic eutils
31
32	@@ -20,7 +20,7 @@
33	!sys-apps/rlocate"
34
35	pkg_setup() {
36	- if [[ -n $(egetent group slocate) ]] ; then
37	+ if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
38	eerror "The 'slocate' group has been renamed to 'locate'."
39	eerror "You seem to already have a 'slocate' group."
40	eerror "Please rename it:"
41
42
43
44	1.3 sys-apps/slocate/slocate-3.1-r1.ebuild
45
46	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.3&view=markup
47	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?rev=1.3&content-type=text/plain
48	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild?r1=1.2&r2=1.3
49
50	Index: slocate-3.1-r1.ebuild
51	===================================================================
52	RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v
53	retrieving revision 1.2
54	retrieving revision 1.3
55	diff -u -r1.2 -r1.3
56	--- slocate-3.1-r1.ebuild 23 Jul 2007 05:25:47 -0000 1.2
57	+++ slocate-3.1-r1.ebuild 2 Dec 2007 20:03:13 -0000 1.3
58	@@ -1,6 +1,6 @@
59	# Copyright 1999-2007 Gentoo Foundation
60	# Distributed under the terms of the GNU General Public License v2
61	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.2 2007/07/23 05:25:47 vapier Exp $
62	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.3 2007/12/02 20:03:13 vapier Exp $
63
64	inherit flag-o-matic eutils
65
66	@@ -18,7 +18,7 @@
67	!sys-apps/rlocate"
68
69	pkg_setup() {
70	- if [[ -n $(egetent group slocate) ]] ; then
71	+ if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
72	eerror "The 'slocate' group has been renamed to 'locate'."
73	eerror "You seem to already have a 'slocate' group."
74	eerror "Please rename it:"
75
76
77
78	1.74 sys-apps/slocate/ChangeLog
79
80	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.74&view=markup
81	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.74&content-type=text/plain
82	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?r1=1.73&r2=1.74
83
84	Index: ChangeLog
85	===================================================================
86	RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v
87	retrieving revision 1.73
88	retrieving revision 1.74
89	diff -u -r1.73 -r1.74
90	--- ChangeLog 25 Aug 2007 18:20:37 -0000 1.73
91	+++ ChangeLog 2 Dec 2007 20:03:13 -0000 1.74
92	@@ -1,6 +1,11 @@
93	# ChangeLog for sys-apps/slocate
94	# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
95	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.73 2007/08/25 18:20:37 vapier Exp $
96	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.74 2007/12/02 20:03:13 vapier Exp $
97	+
98	+ 02 Dec 2007; Mike Frysinger <vapier@g.o> slocate-2.7-r8.ebuild,
99	+ slocate-3.1-r1.ebuild:
100	+ Allow people to have both slocate and locate groups at the same time #200949
101	+ by Timothy Stotts.
102
103	25 Aug 2007; Mike Frysinger <vapier@g.o>
104	files/slocate-3.1-cron.patch:
105
106
107
108	--
109	gentoo-commits@g.o mailing list

Gentoo Archives: gentoo-commits