diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-05 03:04:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-05 03:04:27 +0000 |
| commit | 2852b93917cd6e24c98a31ba0d7a5d2890f911a3 (patch) | |
| tree | e22690868292bc6f1647d2807165bb053b07ee33 /sys-libs/glibc | |
| parent | Version bump. (diff) | |
| download | historical-2852b93917cd6e24c98a31ba0d7a5d2890f911a3.tar.gz historical-2852b93917cd6e24c98a31ba0d7a5d2890f911a3.tar.bz2 historical-2852b93917cd6e24c98a31ba0d7a5d2890f911a3.zip | |
fix timezone-data DEPEND for cross builds
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r3.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.6.ebuild | 12 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index f307fedf5abe..dc167e9336bd 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -134,18 +134,18 @@ MD5 d0501b95beefec42d574b34ef0d0cecb glibc-2.3.4.20041102-r2.ebuild 41390 MD5 dcc9e5194707e88476804f3a43d65517 glibc-2.3.4.20050125-r1.ebuild 39583 MD5 2eb2b01004d8f68600c5e1aed8fed4ef glibc-2.3.5-r1.ebuild 40647 MD5 d3760592fdf5d357bf2a4efe96fd285d glibc-2.3.5-r2.ebuild 38973 -MD5 d51445264b99889b5e564aa776728fad glibc-2.3.5-r3.ebuild 39021 +MD5 62b1571d90f56340ba5e1a92b7e62b52 glibc-2.3.5-r3.ebuild 39065 MD5 702c30c61eb97343e09dfde1033342b6 glibc-2.3.5.20050421.ebuild 40128 MD5 7b8266a1773efaae98829ae076e68fe4 glibc-2.3.5.20050722.ebuild 39275 MD5 23af2c26bf05b7b899e05875ebc22af5 glibc-2.3.5.ebuild 40252 MD5 22fd599468cdef40f494d009951d0469 glibc-2.3.6-r1.ebuild 41910 MD5 49c5af9a3084311275b14d6c1f9b61a4 glibc-2.3.6-r2.ebuild 41912 -MD5 1690299a3906d44c52895a8739e0126d glibc-2.3.6.ebuild 40195 +MD5 4ea7e852a74de296a3883b7137452626 glibc-2.3.6.ebuild 40240 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDuhMUCRZPokWLroQRAtNRAJ9ZFgzxms8V8j91G99jz/TCEa2KWQCfezCt -PF25olL5/A3dloCwT7MVshw= -=zHjJ +iD8DBQFDvIz62+ySkm8kpY0RAoE8AJ9AcAvVewndWfcnPD2EAOkUIG+jWwCgscRi +L7dAJBF11nUw4T3EfYcRVNE= +=noU7 -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild index 1f7ca9a0ba2c..bb59a9d68ca1 100644 --- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.10 2005/12/17 00:46:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.11 2006/01/05 03:04:27 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1031,12 +1031,9 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1 >=sys-devel/binutils-2.15 >=sys-devel/gcc-config-1.3.9 virtual/os-headers - sys-libs/timezone-data nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" - -RDEPEND="sys-libs/timezone-data - nls? ( sys-devel/gettext ) +RDEPEND="nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then @@ -1049,6 +1046,9 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} ${CATEGORY}/linux-headers" fi fi +else + DEPEND="${DEPEND} sys-libs/timezone-data" + RDEPEND="${RDEPEND} sys-libs/timezone-data" fi pkg_setup() { diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild index ff5f5e833092..829055a0dded 100644 --- a/sys-libs/glibc/glibc-2.3.6.ebuild +++ b/sys-libs/glibc/glibc-2.3.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.9 2005/12/17 00:46:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.10 2006/01/05 03:04:27 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1047,12 +1047,9 @@ DEPEND=">=sys-devel/gcc-3.3.3 >=sys-devel/binutils-2.16.1 >=sys-devel/gcc-config-1.3.12 virtual/os-headers - sys-libs/timezone-data nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" - -RDEPEND="sys-libs/timezone-data - nls? ( sys-devel/gettext ) +RDEPEND="nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then @@ -1065,6 +1062,9 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} ${CATEGORY}/linux-headers" fi fi +else + DEPEND="${DEPEND} sys-libs/timezone-data" + RDEPEND="${RDEPEND} sys-libs/timezone-data" fi pkg_setup() { |