diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-12-02 20:03:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-12-02 20:03:13 +0000 |
| commit | be93fe408d25af8f097015de12deade70dd30f07 (patch) | |
| tree | ee483d1149bfe886ff8dc9c5d5848df92cb3fb9c /sys-apps/slocate | |
| parent | Add masked release candidate for openoffice-bin-2.3.1 (diff) | |
| download | gentoo-2-be93fe408d25af8f097015de12deade70dd30f07.tar.gz gentoo-2-be93fe408d25af8f097015de12deade70dd30f07.tar.bz2 gentoo-2-be93fe408d25af8f097015de12deade70dd30f07.zip | |
Allow people to have both slocate and locate groups at the same time #200949 by Timothy Stotts.
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'sys-apps/slocate')
| -rw-r--r-- | sys-apps/slocate/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/slocate/slocate-2.7-r8.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/slocate/slocate-3.1-r1.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog index 9af267ae7a12..199c678ff0b7 100644 --- a/sys-apps/slocate/ChangeLog +++ b/sys-apps/slocate/ChangeLog @@ -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: diff --git a/sys-apps/slocate/slocate-2.7-r8.ebuild b/sys-apps/slocate/slocate-2.7-r8.ebuild index b07a1dd10fc8..4469b133351e 100644 --- a/sys-apps/slocate/slocate-2.7-r8.ebuild +++ b/sys-apps/slocate/slocate-2.7-r8.ebuild @@ -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 @@ RDEPEND="${DEPEND} !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:" diff --git a/sys-apps/slocate/slocate-3.1-r1.ebuild b/sys-apps/slocate/slocate-3.1-r1.ebuild index 977a0eeecbb2..e2c563f0fc3b 100644 --- a/sys-apps/slocate/slocate-3.1-r1.ebuild +++ b/sys-apps/slocate/slocate-3.1-r1.ebuild @@ -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 @@ RDEPEND="${DEPEND} !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:" |