made the ebuild die if nptlonly is in USE without nptl also being in USE

4 files changed, 20 insertions, 6 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 08ad1437f858..038087f27620 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.286 2004/11/05 02:56:41 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.287 2004/11/05 14:04:45 lv Exp $
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041021.ebuild,
+  glibc-2.3.4.20041102.ebuild:
+  made the ebuild die if nptlonly is in USE without nptl also being in USE
 
 *glibc-2.3.4.20041102 (04 Nov 2004)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 54e340e59619..1d6322830fbc 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -4,9 +4,9 @@ MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765
 MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 ac8cbd194b0e622f368f12f876f732a7 glibc-2.3.4.20040808-r1.ebuild 23089
-MD5 3419b759a4f1870619e56c44ce1b3509 ChangeLog 59754
-MD5 a5f6f51d7ac26314a1b29e3231b88abe glibc-2.3.4.20041021.ebuild 26793
-MD5 a960e55a7f79cfc7a14d7aafecab7388 glibc-2.3.4.20041102.ebuild 26533
+MD5 276d1be5449d0ad347e69b52c1b7bf2a ChangeLog 59935
+MD5 f26ea409f2ca671be2ae3f527c0a1bcb glibc-2.3.4.20041102.ebuild 26666
+MD5 31676fe04143bd4fb9919db2d97debcb glibc-2.3.4.20041021.ebuild 26923
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
diff --git a/sys-libs/glibc/glibc-2.3.4.20041021.ebuild b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild
index 24050d134740..97ec45cfc3d8 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041021.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041021.ebuild,v 1.6 2004/10/31 15:51:47 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041021.ebuild,v 1.7 2004/11/05 14:04:45 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -288,6 +288,11 @@ pkg_setup() {
 		die "Can't migrate from nptl to nptlonly at this time"
 	fi
 
+	if use nptlonly && use !nptl ; then
+		eerror "If you want nptlonly, add nptl to your USE too ;p"
+		die "nptlonly without nptl"
+	fi
+
 	# give some sort of warning about the nptl logic changes...
 	if want_nptl && use !nptlonly ; then
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 20b3fe8f7a22..986d16213214 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.1 2004/11/05 02:56:41 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.2 2004/11/05 14:04:45 lv Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -263,6 +263,11 @@ setup_locales() {
 
 
 pkg_setup() {
+	if use nptlonly && use !nptl ; then
+		eerror "If you want nptlonly, add nptl to your USE too ;p"
+		die "nptlonly without nptl"
+	fi
+
 	# give some sort of warning about the nptl logic changes...
 	if want_nptl && use !nptlonly ; then
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"