Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 35468
Collapse All | Expand All

(-)xfree-4.3.0-r5.ebuild.orig (-3 / +14 lines)
Lines 6-12 Link Here
6
# that only we only strip stuff that are safe to strip ...
6
# that only we only strip stuff that are safe to strip ...
7
RESTRICT="nostrip"
7
RESTRICT="nostrip"
8
8
9
IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk"
9
IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static no-pam sdk"
10
10
11
filter-flags "-funroll-loops"
11
filter-flags "-funroll-loops"
12
12
Lines 116-122 Link Here
116
SLOT="0"
116
SLOT="0"
117
KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
117
KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
118
118
119
# Need portage-2.0.50_pre9 for `use !foo`
119
DEPEND=">=sys-apps/baselayout-1.8.3
120
DEPEND=">=sys-apps/baselayout-1.8.3
121
	>=sys-apps/portage-2.0.50_pre9
120
	>=sys-libs/ncurses-5.1
122
	>=sys-libs/ncurses-5.1
121
	>=sys-libs/zlib-1.1.3-r2
123
	>=sys-libs/zlib-1.1.3-r2
122
	>=sys-devel/flex-2.5.4a-r5
124
	>=sys-devel/flex-2.5.4a-r5
Lines 131-137 Link Here
131
	dev-lang/perl
133
	dev-lang/perl
132
	media-libs/libpng
134
	media-libs/libpng
133
	app-arch/unzip
135
	app-arch/unzip
134
	pam? ( >=sys-libs/pam-0.75 )
135
	truetype? ( app-arch/cabextract )
136
	truetype? ( app-arch/cabextract )
136
	!x11-libs/xft"
137
	!x11-libs/xft"
137
#RDEPEND="$DEPEND"
138
#RDEPEND="$DEPEND"
Lines 154-159 Link Here
154
PATCH_DIR=${WORKDIR}/patch
155
PATCH_DIR=${WORKDIR}/patch
155
156
156
pkg_setup() {
157
pkg_setup() {
158
	# See bug #35468, circular pam-xfree dep
159
	if [ "`use !no-pam`" -a "`has_version x11-base/xfree`" ]
160
	then
161
		einfo "Enabling PAM features in XFree86..."
162
	else
163
		einfo "Disabling PAM features in XFree86..."
164
	fi
165
157
	# A static build disallows building the SDK.
166
	# A static build disallows building the SDK.
158
	# See config/xf86.rules.
167
	# See config/xf86.rules.
159
	if use static
168
	if use static
Lines 380-386 Link Here
380
			>> config/cf/host.def
389
			>> config/cf/host.def
381
	fi
390
	fi
382
391
383
	if use pam
392
	# Remove circular dep between pam and xfree, bug #35468
393
	# If no-pam isn't in USE and we have xfree, then we can enable PAM
394
	if [ "`use !no-pam`" -a "`has_version x11-base/xfree`" ]
384
	then
395
	then
385
		# If you want to have optional pam support, do it properly ...
396
		# If you want to have optional pam support, do it properly ...
386
		echo "#define HasPam YES" >> config/cf/host.def
397
		echo "#define HasPam YES" >> config/cf/host.def

Return to bug 35468