summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kmenuedit/Manifest2
-rw-r--r--kde-base/kmenuedit/kmenuedit-4.1.68.ebuild8
-rw-r--r--kde-base/phonon-kde/Manifest2
-rw-r--r--kde-base/phonon-kde/phonon-kde-4.1.68.ebuild2
-rw-r--r--kde-base/phonon-xine/ChangeLog42
-rw-r--r--kde-base/phonon-xine/Manifest2
-rw-r--r--kde-base/phonon-xine/metadata.xml5
7 files changed, 11 insertions, 52 deletions
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index ec50b5c24c1..dfc8bceb0a4 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,4 +1,4 @@
DIST kdebase-workspace-4.1.68.tar.bz2 48312032 RMD160 25592a37c74baf5e6ddb150c993dc1a75b3d4788 SHA1 fa047c8be44e125d11449c43320ccd41bc633a4b SHA256 147544eb6c87b6cfb38ad4381563ce45bbb555905cf8aa17d3d6810a4cdfa87f
-EBUILD kmenuedit-4.1.68.ebuild 325 RMD160 add64bfdf6e4c109127b49c105707ca22f750fe3 SHA1 ffae169985f5f7b167540424ee705136dbccaaf1 SHA256 cc466d02a7ddc334ff31171f030a5e83b07eac6bde09447b629a165d15481342
+EBUILD kmenuedit-4.1.68.ebuild 563 RMD160 70be84fc6d02a8e63fb2013a1151f8aef8074e00 SHA1 e1248be5577ffb3d827511e4d75643cda7cdeb01 SHA256 e3f360c68f1648d80e6a0224f4c6a25d59384b6fc7bbd4b2707885a539318369
MISC ChangeLog 899 RMD160 887f0bea87676227a6031aaddf3e9e0c6258bc6b SHA1 9edff9d0545893d94a642161abcb1ee1bdfd1806 SHA256 e7231a99d8c5eaf8d20c519c96e0b63151d82db1cd95b253c200a2f8ac61a2e5
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kmenuedit/kmenuedit-4.1.68.ebuild b/kde-base/kmenuedit/kmenuedit-4.1.68.ebuild
index 66affdabd3b..b2c491b0c31 100644
--- a/kde-base/kmenuedit/kmenuedit-4.1.68.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.1.68.ebuild
@@ -15,3 +15,11 @@ DEPEND="kde-base/khotkeys:${SLOT}"
KMEXTRACTONLY="libs/kworkspace/"
+src_configure() {
+ sed -i -e \
+ "s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
+ kmenuedit/CMakeLists.txt \
+ || die "sed failed"
+
+ kde4-base_src_configure
+}
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 4398b82f931..34a38b8e97a 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,4 +1,4 @@
DIST kdebase-runtime-4.1.68.tar.bz2 59304078 RMD160 c277248271584123b94d387d53f8295e627f93f9 SHA1 ff097cd47eabfb7f02a96d41e9497db5b7d064b7 SHA256 143bea704600fcc41431aac996bcd0738ff9bb692042d6a99689cbb36a51891a
-EBUILD phonon-kde-4.1.68.ebuild 506 RMD160 62730798bd24fa570869bbfd3bda67b6a748082d SHA1 5db15ed58a3ecd659bc3ce2369a327bcfbac6a3e SHA256 407b40b9ab5ce644784a387636f43a34db25ecf4c825c1a2c35a2c11cb20a016
+EBUILD phonon-kde-4.1.68.ebuild 518 RMD160 d1370c7c64ee08627bd83c64c32e3c6f5382d4e8 SHA1 be18b1d20ca39ff168e9f5154fbe253a8014c3f4 SHA256 5941f7390b61ade19368aa98e0674be61978bc2a8e9a13dba7d26998d7dc25d5
MISC ChangeLog 696 RMD160 c5f4b6c18ba6d2f54bf4482f6ce8662772107fdd SHA1 5277968cdaba907daedf0aeffabceb5cebaf857d SHA256 0e641dd25152e084edbd30e2f01b358c1c035680bc35416b79e2e82d51ebfb39
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/phonon-kde/phonon-kde-4.1.68.ebuild b/kde-base/phonon-kde/phonon-kde-4.1.68.ebuild
index 410d11f45d6..ed831b9043d 100644
--- a/kde-base/phonon-kde/phonon-kde-4.1.68.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.1.68.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="xcb"
DEPEND="!kde-base/phonon:${SLOT}
- !kde-base/phonon-xine
+ !kde-base/phonon-xine[-kdeprefix]
>=media-sound/phonon-4.3"
RDEPEND="${DEPEND}"
diff --git a/kde-base/phonon-xine/ChangeLog b/kde-base/phonon-xine/ChangeLog
deleted file mode 100644
index 5301765f69d..00000000000
--- a/kde-base/phonon-xine/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-# ChangeLog for kde-base/phonon-xine
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 02 Oct 2008; <alexxy@gentoo.org> -phonon-xine-4.1.1.ebuild:
- Version removed.
-
- 27 Sep 2008; <alexxy@gentoo.org> phonon-xine-4.1.1.ebuild:
- Make ebuilds work with eapi2
-
-*phonon-xine-4.1.67 (26 Sep 2008)
-
- 26 Sep 2008; <alexxy@gentoo.org> +phonon-xine-4.1.67.ebuild:
- Version bump.
-
-*phonon-xine-4.1.1 (01 Sep 2008)
-
- 01 Sep 2008; Marcus D. Hanwell <cryos@gentoo.org>
- +phonon-xine-4.1.1.ebuild:
- Version bump.
-
- 25 Aug 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- -files/support-xine-lib-1.1.15.patch, phonon-xine-4.1.0.ebuild:
- With the new xine-lib-1.1.15-r1 we no longer need the
- support-xine-lib-1.1.15 patch. The required version was bumped to
- 1.1.15-r1 to avoid the ansi issues with 1.1.15.
-
- 18 Aug 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- files/support-xine-lib-1.1.15.patch, phonon-xine-4.1.0.ebuild:
- Added a note about the bugs and made the patch conditional on Linux.
-
- 18 Aug 2008; Tobias Heinlein <keytoaster@gentoo.org>
- +files/support-xine-lib-1.1.15.patch, phonon-xine-4.1.0.ebuild:
- Make phonon-xine compile with xine-lib-1.1.15, thanks to Manuel Nickschas
- <sputnick@quassel-irc.org> for the patch!
-
-*phonon-xine-4.1.0 (15 Aug 2008)
-
- 15 Aug 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- +metadata.xml, +phonon-xine-4.1.0.ebuild:
- Added phonon-xine-4.1.0.
-
diff --git a/kde-base/phonon-xine/Manifest b/kde-base/phonon-xine/Manifest
deleted file mode 100644
index 320ec8dace6..00000000000
--- a/kde-base/phonon-xine/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-MISC ChangeLog 1470 RMD160 62efd28825a1e777fb6eebb2274998b1a3992d6f SHA1 1adb484f6dc055840d537e756dc2951b433bcb56 SHA256 63acd2242a3caf8cddb1c2bec592e49d0c973d9f09d8d1b62cda563af87c0a09
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/phonon-xine/metadata.xml b/kde-base/phonon-xine/metadata.xml
deleted file mode 100644
index 8d1e86a9cef..00000000000
--- a/kde-base/phonon-xine/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>