summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-05-03 19:51:45 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-05-03 19:51:45 +0000
commit03707f4b62f58fd134e57ed4443410838239da62 (patch)
treeac4099f2c5b8a68170d40cf22a957f7c5d386d34 /sys-libs
parentDrop ppc-macos keyword, upstream dropped support for building on 10.5. Up th... (diff)
downloadhistorical-03707f4b62f58fd134e57ed4443410838239da62.tar.gz
historical-03707f4b62f58fd134e57ed4443410838239da62.tar.bz2
historical-03707f4b62f58fd134e57ed4443410838239da62.zip
New glibc now includes nss-db again, so block the old sys-libs/nss-db package.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/Manifest26
-rw-r--r--sys-libs/glibc/glibc-2.15-r1.ebuild5
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild5
-rw-r--r--sys-libs/nss-db/Manifest8
5 files changed, 18 insertions, 32 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 5ed75656b077..772c2ec0600d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.845 2012/05/03 02:07:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.846 2012/05/03 19:51:45 robbat2 Exp $
+
+ 03 May 2012; Robin H. Johnson <robbat2@gentoo.org> glibc-2.15-r1.ebuild,
+ glibc-9999.ebuild:
+ New glibc now includes nss-db again, so block the old sys-libs/nss-db package.
03 May 2012; Mike Frysinger <vapier@gentoo.org>
files/eblits/src_compile.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 819afaf2cc55..f79711b319a2 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb508bd3af2 SHA1 0e9330d57de714dd1ecd7040d3eabf4723cdee7c SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e
AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 RMD160 744bdbfb73f1dbced4cb33cb5aa92f3b41d3b4fb SHA1 21e0f83598f5342032a794315f0e3dac07f647da SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774
AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 RMD160 163e53f0f4f0bd003ef1c50a4eaaa8f4a82695fe SHA1 df23c6756114e1451e6f120723af1b621037c28e SHA256 dcf78c6524c222dbee907200a8878aff727e29d43a4962b977a16d85752e5c10
@@ -63,26 +60,9 @@ EBUILD glibc-2.13-r4.ebuild 8535 RMD160 1e9fa84c74b9c0ab09e06b84306b488d537bc00f
EBUILD glibc-2.14.1-r2.ebuild 8905 RMD160 fe5975027559e747fcc00af3b4d7e745a82c7945 SHA1 e63db5f11586a97a305affec605aa87f88056dbe SHA256 04cd638edd59c92597233edc14471780eead6287642656b812e19c8fe2c64a8e
EBUILD glibc-2.14.1-r3.ebuild 8898 RMD160 d8fe5578cc7245a99574f138e7470629fb38d742 SHA1 b665698b0dffd8d173c6e74fdfdc82dd46134fdf SHA256 88e3661ba31dbbaa0f66457b198f03dee8dead60a1cb9b6713861ddef109d411
EBUILD glibc-2.14.ebuild 8739 RMD160 0cf8007db758513dbe73ecb747182591923ea03b SHA1 b9fb14a5c62cc69e827037a7ea3acf56b62dc4e7 SHA256 8a2129dec1c258364aab30c9dc73d9e64e6f167e14f49a3160f41f4674ea714e
-EBUILD glibc-2.15-r1.ebuild 8515 RMD160 020288656fb7c7898460ec9b33425e7df37ede1c SHA1 aa6657f26db32ad2cadee19be7313a8a918a0390 SHA256 186814a0146fe9b66f3c140ca98dced22e5f141bce049df476615f0251456fd9
+EBUILD glibc-2.15-r1.ebuild 8534 RMD160 afadcdcac8632c2c2e325f3de8b10e78b73c60cf SHA1 d8b61619ee6fdb9cc6c07b2810d2056f32c34c30 SHA256 8c47428f1e7fb8e046d9a65ff362a35828f32c830b727dff684f445127bf9880
EBUILD glibc-2.9_p20081201-r3.ebuild 7680 RMD160 3baebfd0be6aed5c3d03fdbfd46a19a9dad83428 SHA1 958f7f408c36a584bf4f0151089d5e5dbdb838b5 SHA256 342058f41b7338fc4fdd9e0ba5b4931e0e13babc53c04028f4798906e74ac988
-EBUILD glibc-9999.ebuild 8339 RMD160 b469ce2db3698b41700faa1550dbbbba3ba1102d SHA1 05e48dae282cf3403b8011ffdc5d871b0abe0ef8 SHA256 01a360e79dd302ea81312f0ade84efdd933a3c8ea6396d445460ad72aa8a45e7
-MISC ChangeLog 42479 RMD160 48851dce3fa9fc6f1d70ff5b2bb81d442252e586 SHA1 3ce3b90ceb66a3d20e34831b83af12e9f7d1e4cb SHA256 edce9bf7ae8daa6648c8738f40230c4c612f7fe8025f0c991098962ce9f36e43
+EBUILD glibc-9999.ebuild 8358 RMD160 317e86067a3688b8f06a40c7a7ebb0f70b473290 SHA1 5a160e2c0b7ff594dd0727751e289650d924e3f0 SHA256 726ccd559e26f740d0607677e7f1512ecf7ab6425ad3e4ea0a27ba3adc9ea752
+MISC ChangeLog 42658 RMD160 37180cad194ca11820d3e9f1655da0101ebb85cc SHA1 be1ad8a591df57b79565f6d5d20ba6f48e580ae6 SHA256 51c6d5ea54fecb1fdd92e5b6b83e7bd93577296ad58f7886fdcdae7348e7e015
MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPoeiwAAoJELEHsLL7fEFWcpEQAJuY0vVtO3P7YDPQ1dYRmnrz
-8hruYR+gL26vcEY8WuflR/p5A2qa46FHPLz1OozzXPQwOsoLL9MydjrLufifA49j
-5e4MQMLD8vD8X2WI03/SQhaMnw4mihaSKzUhioYLogGs4J/jkIwaPHTyuBUMHAxm
-UaA/AP+KvWlkgpueJQrls7DPNYUOGp3kcqRPiATccRsH8MFKMV2XytPnMqh4lYJ5
-INxjNn2HQAjdbP1RmL1H49E2/gKLQZPbsm00JsAIazkX7snNmf6dBKClWVgbP9Xh
-kwYL97bpA+DorqxtN+0EkVw51HSiZ5EZZp/YiU6OsZtRctNNwGaiSQMI2Hb353vo
-xYmdH6Uxh2tF11djgsc22mMAJx2g1hcX8q3z9jsAhtSB7MNx7uAWNbj0OhggDVMh
-6/OAhLfOsc5aRcvbymkIEn0RAj8xh34QDMSlC8UHE3ljIaz1KU4mLR1n6JXaUrB5
-19F0DhwPHJm0feq3ovrVUF/fzMP77w1d9fZ1r6v1FOkeCvhJ1YpTW595Jy43WhEC
-FsLEFWhvFsGlyLQ83C7HJt5ZxAHhHTvUtETiSRK4SbqU7h5ONu+XTQlc+vQ7omwy
-34Q36aoWRkYxuZoohAx2yBshtAoWXQaVcbjrovyPq2MGxZq7ZOrYnt/vEpfhdPC0
-TZ9ep1jvLsKaHjaI8K/m
-=UN4t
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index 01785a6a50ee..c057d70c8e3d 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.3 2012/05/02 04:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.4 2012/05/03 19:51:45 robbat2 Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
@@ -102,7 +102,8 @@ DEPEND=">=sys-devel/gcc-3.4.4
!<sys-devel/patch-2.6
selinux? ( sys-libs/libselinux )"
RDEPEND="!sys-kernel/ps3-sources
- selinux? ( sys-libs/libselinux )"
+ selinux? ( sys-libs/libselinux )
+ !sys-libs/nss-db"
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 1f9c02b76930..3ee3dad6bb5e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.6 2012/04/21 15:54:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.7 2012/05/03 19:51:45 robbat2 Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -101,7 +101,8 @@ DEPEND=">=sys-devel/gcc-3.4.4
!<sys-apps/portage-2.1.2
selinux? ( sys-libs/libselinux )"
RDEPEND="!sys-kernel/ps3-sources
- selinux? ( sys-libs/libselinux )"
+ selinux? ( sys-libs/libselinux )
+ !sys-libs/nss-db"
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
index d1f5927dadd9..74cb6864303e 100644
--- a/sys-libs/nss-db/Manifest
+++ b/sys-libs/nss-db/Manifest
@@ -7,8 +7,8 @@ DIST nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 RMD160 90ad8e330a7677f8ebd4a2fd210
DIST nss_db-2.2.3pre1-external.patch.bz2 1870 RMD160 d85fdb31935c5ab75ed80b1159155f5fa5b8a2e5 SHA1 b736463196d2b2438f03a801579e51e529c6a152 SHA256 dbc45a4dc7c977fae2193e0a14fdb862a5f42479ac40da0d4772d5d66e95ade0
DIST nss_db-2.2.3pre1.tar.gz 235360 RMD160 a511fcc1dc7937e13e84ccd125d688463ac52555 SHA1 e6e1b5dcfb2168c9fd765c4659900c7859a11c39 SHA256 0c5d677a49c7bf6b9318bf40adf335839a668d1c7509e9b1915bd22a9e0ac694
DIST nss_db-2.2.tar.gz 128636 RMD160 c67db191c7ae720b39a5b45866b110bd20d45585 SHA1 5a4796ae61e6e7b679f6559f0094f6a999311661 SHA256 aa8f54138b8797a6eeaf0e30364f45ff4d7d1d7e2846d8495de946509fda56f0
-EBUILD nss-db-2.2-r1.ebuild 1012 RMD160 d7f5ff010159a1a8d14bc42e802d1bf49d98d0b9 SHA1 3389daab85b1ab3363813b347f993eacdd4d74af SHA256 bf4474cc88cc7909602229c1cf6a026fc48ad352d889209d00289d5a7204c4f4
-EBUILD nss-db-2.2.3_pre1-r2.ebuild 3213 RMD160 e61bf19e54021e48983d72d59d0b0131e6ce6d1a SHA1 62742c22a93cd5e1a564214eecc2e810133c36c6 SHA256 70889006893c923e7fef5729bc24d2dec35d388fb42f2a6cb9e4abb1a6fbd8f6
-EBUILD nss-db-2.2.3_pre1-r3.ebuild 3296 RMD160 52cf3aff3253dc281d33f3cd31d30656fa9a4fb1 SHA1 e16d4f75c02660069317ea4cebc23dee14569083 SHA256 b4e52a3573f6a0cf0ada6ce333e84ef170d5fdd2c1588985e8404bb75f96198f
-MISC ChangeLog 3196 RMD160 6c17e3ab7cbf1f8798fd1b3e1b9ec0c153925983 SHA1 ed07dd4292ca3c5ccb112e84ff6cab2af831aea5 SHA256 7955d54762c492aab9bc03dc31ee9be3eaa065fbdd48bfe847ce9942a79e1b01
+EBUILD nss-db-2.2-r1.ebuild 1012 RMD160 7510b2abec107bfe76fee816e60f7e482548e5d6 SHA1 74ab5634ee3e0732ac6f631ebbc32ec0f6864106 SHA256 ef8c9f7fcce07d9232c44825eb3435eb4ed71d58e14263d6c461e80907ae0c6f
+EBUILD nss-db-2.2.3_pre1-r2.ebuild 3240 RMD160 c76dabcb0d43a46c720aa901f7347c22e89fed14 SHA1 61348d7c93875efd154106c34a0745bf83b029e8 SHA256 70617ea7d5b5cceeeb807de8f1be500bbc5c020c99253ba6a09a2432724c7721
+EBUILD nss-db-2.2.3_pre1-r3.ebuild 3320 RMD160 b3d443dcc202067d7ea32c475990058d29be99ee SHA1 be3d89289b534d5df1d0cec06a8cc331afd8d6d8 SHA256 0fcc33ed2efda9324390dce03a4648bd9e8483489fa639d47a068ffc010f4ddb
+MISC ChangeLog 3432 RMD160 125d8035b85ca376144413865427872a2577a694 SHA1 184d634152083a285aa623bccccbea89686fd542 SHA256 bd2412807733c01d8ef259dd4afab69544c67899c13300e1d3694d14b171e442
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92