Sync with portage [Wed Dec 9 15:54:44 MSK 2015].

9 years ago · b06a0d506d
parent defb5639a3
commit b06a0d506d
16 changed files with 78 additions and 13 deletions
--- a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
+++ b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/FooBarWidget/daemon_controller"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 all_ruby_prepare() {
--- a/kde-plasma/kscreenlocker/files/kde-np.pam
+++ b/kde-plasma/kscreenlocker/files/kde-np.pam
@ -0,0 +1,10 @@
+#%PAM-1.0
+
+auth       required     pam_nologin.so
+auth	   required     pam_permit.so
+
+account    include      system-local-login
+
+password   include      system-local-login
+
+session    include      system-local-login
--- a/kde-plasma/kscreenlocker/files/kde.pam
+++ b/kde-plasma/kscreenlocker/files/kde.pam
@ -0,0 +1,11 @@
+#%PAM-1.0
+
+auth       required     pam_nologin.so
+
+auth       include      system-local-login
+
+account    include      system-local-login
+
+password   include      system-local-login
+
+session    include      system-local-login
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch
+++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch
@ -0,0 +1,16 @@
+diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
+index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644
+--- a/kcheckpass/CMakeLists.txt
+++ b/kcheckpass/CMakeLists.txt
+@@ -22,10 +22,6 @@ endif ()
+ 
+ set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT")
+ target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
+-install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR})
+-install(CODE "
+-    set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\")
+-    execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
+-")
+install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 
+ #EXTRA_DIST = README
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
@ -0,0 +1,26 @@
+From 97ced66da372737ae5d36d86c9bc0c6fe684d842 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Tue, 8 Dec 2015 20:26:26 +0100
+Subject: [PATCH] Fix migration of multiple favorites.
+
+BUG:356398
+---
+ desktoppackage/contents/updates/obsolete_kickoffrc.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
+index aae077f..d92cae9 100644
+--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
+@@ -1,7 +1,7 @@
+ var kickoffConfig = ConfigFile("kickoffrc");
+ 
+ kickoffConfig.group = "Favorites";
+-var favorites = kickoffConfig.readEntry("FavoriteURLs");
+var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
+ 
+ kickoffConfig.group = "SystemApplications";
+ var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
+-- 
+2.4.10
+
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0-r1.ebuild
@ -118,6 +118,8 @@ DEPEND="${COMMON_DEPEND}

 REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"

+PATCHES=( "${FILESDIR}/${P}-favourites-migration.patch" )
+
 pkg_setup() {
 	if has_version net-im/skype && use legacy-systray && use amd64; then
 		einfo
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 09 Dec 2015 11:43:51 +0000
+Wed, 09 Dec 2015 12:14:02 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 09 Dec 2015 11:43:51 +0000
+Wed, 09 Dec 2015 12:14:02 +0000
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@ -4,11 +4,11 @@ DESCRIPTION=A library for starting and stopping specific daemons programmaticall
 EAPI=5
 HOMEPAGE=https://github.com/FooBarWidget/daemon_controller
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.0.gem
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fa96becf1cb15a54d534f9149863a780
+_md5_=4b9b8b5b2119b48c14621d9c5eb3a4f7
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1
@ -11,4 +11,4 @@ REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) g
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	kde5	066dbfc7215801a2195f3044f8f46136	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	e0b4d88543a7001a6b55bc2c81dcfd48	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=31a787766cea8c6036d535df87a36d25
+_md5_=8a597c7c38dcd2a9725d0eecac4a15e7
--- a/metadata/md5-cache/www-apache/passenger-4.0.60
+++ b/metadata/md5-cache/www-apache/passenger-4.0.60
@ -4,11 +4,11 @@ DESCRIPTION=Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails appli
 EAPI=5
 HOMEPAGE=http://modrails.com/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) >=dev-libs/libev-4.15 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.60.tar.gz
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ffe805dc77324cffb1016aaa6484f072
+_md5_=f3134945a3a0ed0f848972b01fde5883
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 09 Dec 2015 11:43:51 +0000
+Wed, 09 Dec 2015 12:14:03 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Dec  9 11:42:57 UTC 2015
+Wed Dec  9 12:13:08 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 09 Dec 2015 12:00:01 +0000
+Wed, 09 Dec 2015 12:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1449661201 Wed 09 Dec 2015 11:40:01 AM UTC
+1449663001 Wed 09 Dec 2015 12:10:01 PM UTC
--- a/www-apache/passenger/passenger-4.0.60.ebuild
+++ b/www-apache/passenger/passenger-4.0.60.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"

 ruby_add_bdepend "dev-ruby/rake"