Fix compat with current systemd versions (#479926 by Ulenrich and Bernd Feige), drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 43 insertions, 22 deletions

diff --git a/sys-auth/rtkit/ChangeLog b/sys-auth/rtkit/ChangeLog
index 3d0e0092eda7..ef866e95a8f6 100644
--- a/sys-auth/rtkit/ChangeLog
+++ b/sys-auth/rtkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/rtkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/rtkit/ChangeLog,v 1.30 2014/08/14 19:35:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/rtkit/ChangeLog,v 1.31 2014/12/19 10:48:19 pacho Exp $
+
+*rtkit-0.11-r1 (19 Dec 2014)
+
+  19 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/rtkit-0.11-controlgroup.patch, +rtkit-0.11-r1.ebuild,
+  -rtkit-0.11.ebuild:
+  Fix compat with current systemd versions (#479926 by Ulenrich and Bernd
+  Feige), drop old
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> rtkit-0.10.ebuild,
   rtkit-0.11.ebuild:
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 513de5afd092..52e3bd8f0738 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX rtkit-0.11-controlgroup.patch 528 SHA256 45049882dcfc7f6f0e29e1c720ff2cada6141f6df821721532f1570e06c21a65 SHA512 772504a9bd911189655bf7ec494ca954c5316357afd2599b1873e0525025fad77589edc965ff7a2b84365cf702ea9173a24ebe9e03f06d73f371bbe480e2b22e WHIRLPOOL 6887368704a6849d515c6e15f96fbe39c16f1427202b4d7fe98cd3c60f1a259ed967375cd294044b3bf159f1950f3a7cad51623445c967fc3db50a4bd2b5acbb
 AUX rtkit-0.11-gettime.patch 744 SHA256 8e7f796228f334544544bf0bbd5db6095682a3776c5dbfd4a9a7565e866c6cd6 SHA512 b9207e1be512689e3896587105d135ab686d4eb1dd8c2e0feb62ca73eed2a8e1e473826e82b06bf240f26c64975b9793cd407cf6493a8f7eb6946da17198059c WHIRLPOOL d236a0695b2b1288e861be5a60ebc26af99d48727b05fb409ea3a49459d1dc5be0220f8c2335f3d7ead64e278bda36925d44ae23108dc72c8d81d39f374dee7f
 AUX rtkit-0.11-polkit.patch 2074 SHA256 80f33894e4eb2130460d7160f1a309c3497a235a3ec6f9e5d088b00cb1667b11 SHA512 cc4cb9879235398f828c16951e380e0456c9e5bbd5acc2a0968153c5ce361fd1aceeeeac8ab873c21c0556c5d4677cdad8ed9e23dd3b9b5a8a73cf9264ee5a4b WHIRLPOOL 1a5170423876ccc178c99a959212a5a352d7fa92bae0c1e3e9f6bae6f5603cc6c6013bba681eb7d09fc1d825aea550417706cacef6499c9caac21c15e128caff
 DIST rtkit-0.10.tar.gz 160528 SHA256 74ea93ac09d9d5a7cb85bf57ec92090311c9fb105a41bdd633adcf3b94472120 SHA512 bf5456f168dc1241b133e417c50fc10adfb40e246cf3c186bb07cd090486798cfda190183ba6b74e6e4cb096cd99b98f76373ed7959694836c558d1d7202cf40 WHIRLPOOL bd4e33e945df570a206c11af35ffc951772e5bd37e86ffef68510d27fd7245093d46d4218e6dd71cb8d5d2873ad37a261d03d55338c352fe5e195a4a582cb646
 DIST rtkit-0.11.tar.xz 126748 SHA256 68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22 WHIRLPOOL 7036f2811aeef28dd7680f24fcf16e2cf8708937d86a0dfcd1411fcae469be3fe673b12dc640f9cda9be951ab2879f2b7ec2374577e7a0b532c59d8abde176b5
 EBUILD rtkit-0.10.ebuild 1141 SHA256 57887229a0b56094b61329a0e39d69729688598f09badacbf78551f34d9f1d75 SHA512 fd741914e0df28d45437ed521e9e98596cb4af69da6c363841c5fd8bb9308e2d57c0282eaba065afba85b430fd9f0465f5ae7405aff0b9685e926a65b1cb7389 WHIRLPOOL fd7b5c59f6b35f43c129bbf3047879e53a4bedcabcc270677a5c01ec1a32f5ec63f792cdf9c0d6f927d0e11fbc1b3c1f586f11d7ae37727a6274306f2d28c7f1
-EBUILD rtkit-0.11.ebuild 1266 SHA256 387b4488f4329f984d647ebffc3584883e704535cf46f5909792f75f1f661a15 SHA512 0ce18a4978594d004d4af0c369e3ce35b561b3b1541dd4ff962b74a69e6464636fb69e552978842356af3f96991149ae7a558c6aabc31ae6d7ea777aea5c3034 WHIRLPOOL 379a0d81d84518d0c3d99b181d8db0a8bdfbad9aefbecc519d97a1c374edc78d7c00c1e83c7c4b721942a8a797f99f5324e4bac87cfd93aaa6d1c73353c15b89
-MISC ChangeLog 4158 SHA256 121d74f4ca0f664efeb558ad5212b9fc9f8165fa81223d0fcbcc9b518262fff9 SHA512 ab5f7293fc7cd585adbfc168b6b89418b08d688cab8e169541fb98d354de11176de4e63b2ecd9b1c3a8681e2be5a6f8c3796106b713ab212d2ed10e97a7a6410 WHIRLPOOL ff96e2ac39f6a10078ed16da30d5e82bc39f4a29e8dcace6ad29c58bea31f3e89cc86865c08ff32746029ceeea29d3a7cbe5a01e80ef45b14795223f7b882bd2
+EBUILD rtkit-0.11-r1.ebuild 1087 SHA256 a902a89d21740162a6178df5158958091dd0c1843ea9809904ff4825844c49b4 SHA512 c3c901149dd6fa44a9d1d1c0f28295d157a2f404669ccbfb44caa0a4996d0556d4ac098df546b8237f6625a51da760512e7c53ff22667a65f67e510751b95edf WHIRLPOOL 76bdea53b97b15d43b7567f4a4eaa93b20fb38e0791f6f4fc4bcdfab76a77eefa8a5918fce2976a160de0a2181ba979ec12b41eb3bd93258b9cc22e4bc1eff57
+MISC ChangeLog 4415 SHA256 7e0cde8f359bafdca11a5476f6b235a91d572ea5410f65935247ad1a1d6dc07c SHA512 9bf7c331632510525416868c1a0d646f7080c0c3179bdbf4f7c9b87f8f259a9958965027cc4fa33b210a83c17119eca044c4a81ba9ae1be687853c208c244b50 WHIRLPOOL 59c2079a2b5c87f37d1a59ffe731cc7234f44a0cd3dbbecabf95504ecf014ce0a7db7eb5d780cb81ce9e793840457750dbd83caad9b134c980a3ac8acac68c40
 MISC metadata.xml 436 SHA256 e8431c18723d59b5ec2f4a10742ece084b391903fa6d6825d2e2db2bdbae0e94 SHA512 70b64fff7fd07781ea481bbb79171b43ec95637d072026dc3e62b4b9ac3165a7a2a6c4e8cf20b36e9312b41115a70c07e22a6d3dda506fe1f975ea43ca62e132 WHIRLPOOL 7158d6f4e106f0a93493ca0dd4d4b3694b490a48116cc7ea962a155488ddc58dfcd658ec69100b69f6925b949275ec6e841193b6b9e2ad03e05bb17aa46a9490
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPtD28ACgkQVWmRsqeSphMCNQCfSfEIUuO3xCxQs3JCxLRj3GeS
-HqMAn2mfOWD5LINShoZ2jAwFu14ITKOq
-=QK8D
+iEYEAREIAAYFAlSUAnQACgkQCaWpQKGI+9RH6wCePiWqosBz6w72hOX57KfSqVPI
+bsEAn1ZtqXdJceHQKWjyl+HenOrngAMT
+=HPng
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch b/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
new file mode 100644
index 000000000000..7a36deeeae7b
--- /dev/null
+++ b/sys-auth/rtkit/files/rtkit-0.11-controlgroup.patch
@@ -0,0 +1,14 @@
+diff --git rtkit-0.11/rtkit-daemon.service.in~ rtkit-0.11/rtkit-daemon.service.in
+index 3dfefa6..d0dc786 100644
+--- rtkit-0.11/rtkit-daemon.service.in~
++++ rtkit-0.11/rtkit-daemon.service.in
+@@ -27,9 +27,5 @@ CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CH
+ PrivateTmp=yes
+ PrivateNetwork=yes
+ 
+-# Work around the fact that the Linux currently doesn't assign any RT
+-# budget to CPU control groups that have none configured explicitly
+-ControlGroup=cpu:/
+-
+ [Install]
+ WantedBy=graphical.target
diff --git a/sys-auth/rtkit/rtkit-0.11.ebuild b/sys-auth/rtkit/rtkit-0.11-r1.ebuild
index b2ae530be481..6895c7bf828d 100644
--- a/sys-auth/rtkit/rtkit-0.11.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/rtkit/rtkit-0.11.ebuild,v 1.2 2014/08/14 19:35:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/rtkit/rtkit-0.11-r1.ebuild,v 1.1 2014/12/19 10:48:19 pacho Exp $
 
 EAPI=5
-
 inherit eutils systemd user autotools
 
 DESCRIPTION="Realtime Policy and Watchdog Daemon"
@@ -15,10 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="sys-apps/dbus
+RDEPEND="
+	sys-apps/dbus
 	sys-auth/polkit
-	sys-libs/libcap"
-RDEPEND="${DEPEND}"
+	sys-libs/libcap
+"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+"
 
 pkg_setup() {
 	enewgroup rtkit
@@ -26,26 +29,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-polkit.patch \
-		"${FILESDIR}"/${P}-gettime.patch
+	# Fedora patches
+	epatch "${FILESDIR}"/${P}-polkit.patch
+	epatch "${FILESDIR}"/${P}-gettime.patch
+	epatch "${FILESDIR}"/${P}-controlgroup.patch
 	eautoreconf
 }
+
 src_configure() {
 	econf $(systemd_with_unitdir)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
 	insinto /usr/share/dbus-1/interfaces
 	doins org.freedesktop.RealtimeKit1.xml
 }
-
-pkg_postinst () {
-	einfo "To start using RealtimeKit, you need to ensure that the 'dbus'"
-	einfo "service is running. If it is already running, you need to reload it"
-	einfo "with the following command:"
-	einfo ""
-	einfo "    /etc/init.d/dbus reload"
-}