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
commit87884be34231aacd55928fdd7c85d11c12ed1b3b (patch)
treef6c64a81dde060a671584094cd2ae09a67584aff /sys-auth
parentVersion bump (bug #323863). Set SUPPORT_PYTHON_ABIS. (diff)
downloadhistorical-87884be34231aacd55928fdd7c85d11c12ed1b3b.tar.gz
historical-87884be34231aacd55928fdd7c85d11c12ed1b3b.tar.bz2
historical-87884be34231aacd55928fdd7c85d11c12ed1b3b.zip
Fix autostart location, see bug 310999
Package-Manager: portage-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/Manifest5
-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
4 files changed, 33 insertions, 5 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/Manifest b/sys-auth/polkit-kde/Manifest
index 5b7c3ed27a82..8dd3b4ebe1f7 100644
--- a/sys-auth/polkit-kde/Manifest
+++ b/sys-auth/polkit-kde/Manifest
@@ -1,5 +1,6 @@
+AUX polkit-kde-0.95.1-autostart-dir.patch 804 RMD160 4e09eb2fc86da2bcc15a5e6838a2134a06e9709d SHA1 37d88141ccd8018a8be8a12cd94671f7d4afe2d5 SHA256 3938096950bc54de68ab2b44ab4adde3054bd724084b2e9783d9351ead2451c0
AUX polkit-kde-0.95.1-gcc45.patch 716 RMD160 73111981118fdac5c90b2232501848c3fff2dac0 SHA1 4abb79e00357df61fd7e4efb08194225e6a09620 SHA256 5b54121a53c6a740c35199fba789cd3eb0fbecd54117c6e1b26d48fd4fd07244
DIST polkit-kde-1-0.95.1.tar.bz2 21345 RMD160 805f7bd4bcb9dddaeeaf214fc77d2f0f3470336e SHA1 f6cca0173beeffa244e75c6e30ac83a2f67bf504 SHA256 3a16fdc80a57efd4713c12b04762f1dca5e6b58bd61b9ef0cdc89619d7e8d98a
-EBUILD polkit-kde-0.95.1.ebuild 846 RMD160 2d1b299983c8b9a4a6317ca00a1be07b16715b29 SHA1 1b06e0a40e13decb587804336d72ab63f65f45c2 SHA256 5ca6da9f49f4c574018e31508919cadc8f48a732d14a7dc393b19cdcedf5b021
-MISC ChangeLog 839 RMD160 57ad38c733a23931ce576e5cd10a16abcfb308f3 SHA1 07bb71715f854d598c1b8199612ed11806aad5b0 SHA256 2947d3b34f3e60acd6274415498e9e258114e3d0e79e59ac6de2279d0ec5256f
+EBUILD polkit-kde-0.95.1-r1.ebuild 918 RMD160 6856a4af2cca27de7f4d77c1bcb8a897668e51d5 SHA1 46e770c1319decd01b3196de1bb358e773451480 SHA256 d713b0f0c5544c9bc6811ac6d1a3363ed365cfa08c511eb81497e839f9fa5d9d
+MISC ChangeLog 1081 RMD160 85952f1d05fa942681db924a66cc0fb9b55510d2 SHA1 b465c68264889773ec1fa91e948b9ec3dd23eb81 SHA256 a65d9f14820476f24a4ad020e9b6b971562ef77193c1d6ea5a8851fd102b989e
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
+)