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

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

[Mike Frysinger (vapier)]

vapier      07/12/02 20:03:14

  Modified:             slocate-2.7-r8.ebuild slocate-3.1-r1.ebuild
                        ChangeLog
  Log:
  Allow people to have both slocate and locate groups at the same time #200949 by Timothy Stotts.
  (Portage version: 2.1.4_rc4)

Revision  Changes    Path
1.16                 sys-apps/slocate/slocate-2.7-r8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild?r1=1.15&r2=1.16

Index: slocate-2.7-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- slocate-2.7-r8.ebuild	23 Jul 2007 05:25:47 -0000	1.15
+++ slocate-2.7-r8.ebuild	2 Dec 2007 20:03:13 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.15 2007/07/23 05:25:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.16 2007/12/02 20:03:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,7 +20,7 @@
 	!sys-apps/rlocate"
 
 pkg_setup() {
-	if [[ -n $(egetent group slocate) ]] ; then
+	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
 		eerror "The 'slocate' group has been renamed to 'locate'."
 		eerror "You seem to already have a 'slocate' group."
 		eerror "Please rename it:"



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

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

Index: slocate-3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slocate-3.1-r1.ebuild	23 Jul 2007 05:25:47 -0000	1.2
+++ slocate-3.1-r1.ebuild	2 Dec 2007 20:03:13 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.2 2007/07/23 05:25:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.3 2007/12/02 20:03:13 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -18,7 +18,7 @@
 	!sys-apps/rlocate"
 
 pkg_setup() {
-	if [[ -n $(egetent group slocate) ]] ; then
+	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
 		eerror "The 'slocate' group has been renamed to 'locate'."
 		eerror "You seem to already have a 'slocate' group."
 		eerror "Please rename it:"



1.74                 sys-apps/slocate/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/slocate/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	25 Aug 2007 18:20:37 -0000	1.73
+++ ChangeLog	2 Dec 2007 20:03:13 -0000	1.74
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/slocate
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.73 2007/08/25 18:20:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.74 2007/12/02 20:03:13 vapier Exp $
+
+  02 Dec 2007; Mike Frysinger <vapier@gentoo.org> slocate-2.7-r8.ebuild,
+  slocate-3.1-r1.ebuild:
+  Allow people to have both slocate and locate groups at the same time #200949
+  by Timothy Stotts.
 
   25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
   files/slocate-3.1-cron.patch:



-- 
gentoo-commits@gentoo.org mailing list