summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-02-06 14:28:37 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-02-06 14:28:37 +0000
commit4becdedef0defb1a8422f43f7011361f3ae5bb04 (patch)
treea3061cc1b964374cbb52d87c5c50726fbba0cb36
parentVersion bump for the latest, should fix few regressions of 50.1.1 where i tes... (diff)
downloadgentoo-2-4becdedef0defb1a8422f43f7011361f3ae5bb04.tar.gz
gentoo-2-4becdedef0defb1a8422f43f7011361f3ae5bb04.tar.bz2
gentoo-2-4becdedef0defb1a8422f43f7011361f3ae5bb04.zip
fix install path of slim.service file, bug 455116
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
-rw-r--r--x11-misc/slim/ChangeLog8
-rw-r--r--x11-misc/slim/files/slim-1.3.5-systemd-service.patch10
-rw-r--r--x11-misc/slim/slim-1.3.5.ebuild5
3 files changed, 19 insertions, 4 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 4eb61b7b33d6..a58c58fc07e3 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/slim
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.93 2012/12/31 18:09:51 axs Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.94 2013/02/06 14:28:37 axs Exp $
+
+ 06 Feb 2013; Ian Stakenvicius <axs@gentoo.org> slim-1.3.5.ebuild,
+ +files/slim-1.3.5-systemd-service.patch:
+ fix install path of slim.service file, bug 455116
*slim-1.3.5 (31 Dec 2012)
diff --git a/x11-misc/slim/files/slim-1.3.5-systemd-service.patch b/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
new file mode 100644
index 000000000000..35e023834025
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
@@ -0,0 +1,10 @@
+--- slim-1.3.5-old/CMakeLists.txt 2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5/CMakeLists.txt 2013-02-06 09:05:06.000000000 -0500
+@@ -171,6 +171,6 @@
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+ # systemd service file
+-install(FILES slim.service DESTINATION usr/lib/systemd/system)
++install(FILES slim.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
+ # themes directory
+ subdirs(themes)
diff --git a/x11-misc/slim/slim-1.3.5.ebuild b/x11-misc/slim/slim-1.3.5.ebuild
index 23cefcf678eb..94a6a6dd90f1 100644
--- a/x11-misc/slim/slim-1.3.5.ebuild
+++ b/x11-misc/slim/slim-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5.ebuild,v 1.1 2012/12/31 18:09:51 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5.ebuild,v 1.2 2013/02/06 14:28:37 axs Exp $
EAPI=4
@@ -36,6 +36,7 @@ src_prepare() {
# Our Gentoo-specific config changes
epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
epatch "${FILESDIR}"/${P}-arm.patch
+ epatch "${FILESDIR}"/${P}-systemd-service.patch
if use elibc_FreeBSD; then
sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \