diff options
author | Fabian Groffen <grobian@gentoo.org> | 2010-01-23 15:33:46 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2010-01-23 15:33:46 +0000 |
commit | 44438459615d2c13c54ee9731948f5316e41cba8 (patch) | |
tree | 5be0ffd215e866eb2cebb946b0f84047a4bccd55 /net-misc | |
parent | Stable on alpha, bug #297119 (diff) | |
download | gentoo-2-44438459615d2c13c54ee9731948f5316e41cba8.tar.gz gentoo-2-44438459615d2c13c54ee9731948f5316e41cba8.tar.bz2 gentoo-2-44438459615d2c13c54ee9731948f5316e41cba8.zip |
Don't user stuff in Prefix, marked ~ppc-macos and ~x86-macos, bug #298814
(Portage version: 2.2.00.15200-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/tokyotyrant/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/net-misc/tokyotyrant/ChangeLog b/net-misc/tokyotyrant/ChangeLog index e18432d2efd1..734180c539a9 100644 --- a/net-misc/tokyotyrant/ChangeLog +++ b/net-misc/tokyotyrant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/tokyotyrant # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tokyotyrant/ChangeLog,v 1.5 2010/01/06 23:26:59 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tokyotyrant/ChangeLog,v 1.6 2010/01/23 15:33:46 grobian Exp $ + + 23 Jan 2010; Fabian Groffen <grobian@gentoo.org> + tokyotyrant-1.1.39.ebuild: + Don't user stuff in Prefix, marked ~ppc-macos and ~x86-macos, bug #298814 06 Jan 2010; Patrick Lauer <patrick@gentoo.org> files/fix_testsuite.patch: Fixing patch for #299901, thanks to Johan Bergstroem diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild index 450e2b585d81..fbe28fc4219d 100644 --- a/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild +++ b/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild,v 1.1 2009/12/28 20:51:44 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tokyotyrant/tokyotyrant-1.1.39.ebuild,v 1.2 2010/01/23 15:33:46 grobian Exp $ EAPI=2 @@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos" IUSE="debug lua" DEPEND="dev-db/tokyocabinet @@ -22,8 +22,10 @@ DEPEND="dev-db/tokyocabinet RDEPEND="${DEPEND}" pkg_setup() { - enewgroup tyrant - enewuser tyrant -1 -1 /var/lib/${PN} tyrant + if use !prefix ; then + enewgroup tyrant + enewuser tyrant -1 -1 /var/lib/${PN} tyrant + fi } src_prepare() { @@ -43,7 +45,7 @@ src_install() { for x in /var/{lib,run,log}/${PN}; do dodir "${x}" || die "Install failed" - fowners tyrant:tyrant "${x}" + use prefix || fowners tyrant:tyrant "${x}" done newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed" |