summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-06-24 00:05:37 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-06-24 00:05:37 +0000
commit505df84d914028788d875197e29fc48b96d71272 (patch)
tree155d399f0f6c250d068a6ba50e0f9317919a9340 /sys-auth
parentVersion bump (bug #323863). Set SUPPORT_PYTHON_ABIS. (diff)
downloadgentoo-2-505df84d914028788d875197e29fc48b96d71272.tar.gz
gentoo-2-505df84d914028788d875197e29fc48b96d71272.tar.bz2
gentoo-2-505df84d914028788d875197e29fc48b96d71272.zip
Fix autostart location, see bug 310999
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/polkit-kde/ChangeLog9
-rw-r--r--sys-auth/polkit-kde/files/polkit-kde-0.95.1-autostart-dir.patch17
-rw-r--r--sys-auth/polkit-kde/polkit-kde-0.95.1-r1.ebuild (renamed from sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild)7
3 files changed, 30 insertions, 3 deletions
diff --git a/sys-auth/polkit-kde/ChangeLog b/sys-auth/polkit-kde/ChangeLog
index a05484e303e4..5556f5f7e57b 100644
--- a/sys-auth/polkit-kde/ChangeLog
+++ b/sys-auth/polkit-kde/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-auth/polkit-kde
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/ChangeLog,v 1.5 2010/05/19 13:33:21 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/ChangeLog,v 1.6 2010/06/24 00:05:36 reavertm Exp $
+
+*polkit-kde-0.95.1-r1 (23 Jun 2010)
+
+ 23 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ -polkit-kde-0.95.1.ebuild, +polkit-kde-0.95.1-r1.ebuild,
+ +files/polkit-kde-0.95.1-autostart-dir.patch:
+ Fix autostart location, see bug 310999
19 May 2010; Robert Piasek <dagger@gentoo.org> polkit-kde-0.95.1.ebuild:
added ~arm keyword
diff --git a/sys-auth/polkit-kde/files/polkit-kde-0.95.1-autostart-dir.patch b/sys-auth/polkit-kde/files/polkit-kde-0.95.1-autostart-dir.patch
new file mode 100644
index 000000000000..7d15ec81d59b
--- /dev/null
+++ b/sys-auth/polkit-kde/files/polkit-kde-0.95.1-autostart-dir.patch
@@ -0,0 +1,17 @@
+Index: agent/CMakeLists.txt
+===================================================================
+--- agent/CMakeLists.txt (revision 1093193)
++++ agent/CMakeLists.txt (revision 1093194)
+@@ -18,11 +18,4 @@
+
+ install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR})
+
+-# Install .desktop file to the XDG_CONFIG_DIRS if exists, to the /etc/xdg/autostart otherwise
+-set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS})
+-if (DESKTOP_INSTALL_DIR)
+-else (DESKTOP_INSTALL_DIR)
+- set (DESKTOP_INSTALL_DIR /etc/xdg/autostart)
+-endif (DESKTOP_INSTALL_DIR)
+-
+-install(FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop DESTINATION ${DESKTOP_INSTALL_DIR})
++install(FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR})
diff --git a/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild b/sys-auth/polkit-kde/polkit-kde-0.95.1-r1.ebuild
index c1d99326c5b8..ebacd6f97ed6 100644
--- a/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild
+++ b/sys-auth/polkit-kde/polkit-kde-0.95.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild,v 1.5 2010/05/19 13:33:21 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/polkit-kde-0.95.1-r1.ebuild,v 1.1 2010/06/24 00:05:36 reavertm Exp $
EAPI="2"
@@ -29,4 +29,7 @@ RDEPEND="${DEPEND}"
[[ ${PV} = *9999* ]] || S="${WORKDIR}/${MY_P}"
-PATCHES+=( "${FILESDIR}/${P}-gcc45.patch" ) # 314471 - fixed upstream for next version
+PATCHES+=(
+ "${FILESDIR}/${P}-gcc45.patch" # 314471 - fixed upstream for next version
+ "${FILESDIR}/${P}-autostart-dir.patch" # 310999 - fixed upstream
+)