Browse Source

Added temporary workaround for (#448228)

Maxim Kammerer 12 years ago
parent
commit
ac16cddf93

+ 1 - 1
src/etc/portage/package.accept_keywords

@@ -35,7 +35,7 @@
 =sci-libs/libqalculate-0.9.7*
 
 # Library-only Javascript for PolKit (#437520)
-=dev-lang/spidermonkey-1.8.7*
+=dev-lang/spidermonkey-1.8.7*:0/mozjs187
 
 # Hardened compilation issues (#444246)
 =sys-boot/gnu-efi-3.0s*

+ 0 - 3
src/etc/portage/package.mask/common

@@ -10,6 +10,3 @@ media-video/ffmpeg
 
 # Prefer media-plugins/gst-plugins-cdio
 media-plugins/gst-plugins-cdparanoia
-
-# (#448228)
->=sys-auth/polkit-0.110

+ 11 - 0
src/root/patches/portage/polkit.patch

@@ -0,0 +1,11 @@
+--- /usr/portage/sys-auth/polkit/polkit-0.110.ebuild	2013-03-12 11:31:30.000000000 +0000
++++ /usr/portage/sys-auth/polkit/polkit-0.110.ebuild	2013-03-19 15:30:04.961719707 +0000
+@@ -61,6 +61,8 @@
+ 
+ 	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+ 
++	sed -i 's/\$(EXPAT_LIBS).*/&\n$(LIBJS_LIBS)\\/' src/polkitbackend/Makefile.in
++
+ 	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
+ 		sed -i \
+ 			-e '/mozjs/s:185:187:g' \

+ 2 - 0
src/root/setup

@@ -89,6 +89,8 @@ patch_ebuild ${HOME}/patches/portage/xf86-video-virtualbox.patch
 patch_ebuild ${HOME}/patches/portage/nip2.patch
 # (#446514)
 patch_ebuild ${HOME}/patches/portage/amd-ucode.patch
+# (#448228)
+patch_ebuild ${HOME}/patches/portage/polkit.patch
 
 
 if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then