--- xfree-4.3.0-r5.ebuild.orig	2004-02-15 21:31:48.000000000 -0500
+++ xfree-4.3.0-r5.ebuild	2004-02-15 22:01:35.000000000 -0500
@@ -6,7 +6,7 @@
 # that only we only strip stuff that are safe to strip ...
 RESTRICT="nostrip"
 
-IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk"
+IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static no-pam sdk"
 
 filter-flags "-funroll-loops"
 
@@ -116,7 +116,9 @@
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
 
+# Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-apps/baselayout-1.8.3
+	>=sys-apps/portage-2.0.50_pre9
 	>=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
 	>=sys-devel/flex-2.5.4a-r5
@@ -131,7 +133,6 @@
 	dev-lang/perl
 	media-libs/libpng
 	app-arch/unzip
-	pam? ( >=sys-libs/pam-0.75 )
 	truetype? ( app-arch/cabextract )
 	!x11-libs/xft"
 #RDEPEND="$DEPEND"
@@ -154,6 +155,14 @@
 PATCH_DIR=${WORKDIR}/patch
 
 pkg_setup() {
+	# See bug #35468, circular pam-xfree dep
+	if [ "`use !no-pam`" -a "`has_version x11-base/xfree`" ]
+	then
+		einfo "Enabling PAM features in XFree86..."
+	else
+		einfo "Disabling PAM features in XFree86..."
+	fi
+
 	# A static build disallows building the SDK.
 	# See config/xf86.rules.
 	if use static
@@ -380,7 +389,9 @@
 			>> config/cf/host.def
 	fi
 
-	if use pam
+	# Remove circular dep between pam and xfree, bug #35468
+	# If no-pam isn't in USE and we have xfree, then we can enable PAM
+	if [ "`use !no-pam`" -a "`has_version x11-base/xfree`" ]
 	then
 		# If you want to have optional pam support, do it properly ...
 		echo "#define HasPam YES" >> config/cf/host.def