diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-09 18:06:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-09 18:06:27 +0000 |
| commit | 012d4be7d6f221b42f88fc8fc7435a61e5c59191 (patch) | |
| tree | 6f42d4cd3f86877ea8be8f0668b076a08b370f95 /sys-libs | |
| parent | old (diff) | |
| download | gentoo-2-012d4be7d6f221b42f88fc8fc7435a61e5c59191.tar.gz gentoo-2-012d4be7d6f221b42f88fc8fc7435a61e5c59191.tar.bz2 gentoo-2-012d4be7d6f221b42f88fc8fc7435a61e5c59191.zip | |
Tweak sys-libs/timezone-data dependency based on USE=vanilla #331775 by Alonso Schaich.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.11.2.ebuild | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.12.1.ebuild | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 75aa53bb00c8..865a0a252b88 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.703 2010/08/05 17:20:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.704 2010/08/09 18:06:27 vapier Exp $ + + 09 Aug 2010; Mike Frysinger <vapier@gentoo.org> glibc-2.11.2.ebuild, + glibc-2.12.1.ebuild: + Tweak sys-libs/timezone-data dependency based on USE=vanilla #331775 by + Alonso Schaich. *glibc-2.12.1 (05 Aug 2010) diff --git a/sys-libs/glibc/glibc-2.11.2.ebuild b/sys-libs/glibc/glibc-2.11.2.ebuild index 557fea85776a..ad930091284d 100644 --- a/sys-libs/glibc/glibc-2.11.2.ebuild +++ b/sys-libs/glibc/glibc-2.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.2.ebuild,v 1.12 2010/07/30 05:35:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.2.ebuild,v 1.13 2010/08/09 18:06:27 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -103,8 +103,10 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" else - DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c" - RDEPEND="${RDEPEND} sys-libs/timezone-data" + DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" + RDEPEND="${RDEPEND} + vanilla? ( !sys-libs/timezone-data ) + !vanilla? ( sys-libs/timezone-data )" fi SRC_URI=$( diff --git a/sys-libs/glibc/glibc-2.12.1.ebuild b/sys-libs/glibc/glibc-2.12.1.ebuild index 4d53f4aaa829..6e37981a8afe 100644 --- a/sys-libs/glibc/glibc-2.12.1.ebuild +++ b/sys-libs/glibc/glibc-2.12.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1.ebuild,v 1.1 2010/08/05 17:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1.ebuild,v 1.2 2010/08/09 18:06:27 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -103,8 +103,10 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" else - DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c" - RDEPEND="${RDEPEND} sys-libs/timezone-data" + DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" + RDEPEND="${RDEPEND} + vanilla? ( !sys-libs/timezone-data ) + !vanilla? ( sys-libs/timezone-data )" fi SRC_URI=$( |