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

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 37 insertions, 17 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/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"
-}