summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2009-05-15 14:38:02 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2009-05-15 14:38:02 +0000
commit6e583cf24f0d5cfe5a4f55de462468c60abb677f (patch)
treee1e2d1b3195a437cda64374e889c2d518e816240
parent23b898f795dd6ba9838b7efc4427e1d808596672 (diff)
parentb0883312fd840a39d3c20142375122c258c633de (diff)
downloadkde-6e583cf24f0d5cfe5a4f55de462468c60abb677f.tar.gz
kde-6e583cf24f0d5cfe5a4f55de462468c60abb677f.tar.bz2
kde-6e583cf24f0d5cfe5a4f55de462468c60abb677f.zip
Merge branch 'master' of git+ssh://git@git.overlays.gentoo.org/proj/kde
Diffstat
-rw-r--r--kde-base/kdelibs/ChangeLog5
-rw-r--r--kde-base/kdelibs/Manifest9
-rw-r--r--kde-base/kdelibs/files/dist/create_exe_symlink.cmake-sandbox-violation.patch12
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.85.ebuild2
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.9999-r1.ebuild2
-rw-r--r--kde-base/kdelibs/kdelibs-9999-r1.ebuild2
-rw-r--r--media-sound/amarok/ChangeLog10
-rw-r--r--media-sound/amarok/Manifest8
-rw-r--r--media-sound/amarok/amarok-2.0.90-r2.ebuild (renamed from media-sound/amarok/amarok-2.0.90-r1.ebuild)5
-rw-r--r--media-sound/amarok/amarok-2.0.96-r1.ebuild (renamed from media-sound/amarok/amarok-2.0.96.ebuild)5
-rw-r--r--media-sound/amarok/amarok-9999.ebuild3
11 files changed, 44 insertions, 19 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index ebc666eb5b2..d7d8d2d8380 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
14 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ kdelibs-4.2.85.ebuild, kdelibs-4.2.9999-r1.ebuild, kdelibs-9999-r1.ebuild,
+ +files/dist/create_exe_symlink.cmake-sandbox-violation.patch:
+ Restored sandbox violation patch
+
+ 14 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
kdelibs-4.2.85.ebuild, kdelibs-9999-r1.ebuild:
Add FIXME note about temporary sed
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e81b30ad364..1278680a541 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,9 +1,10 @@
AUX dist/09_disable_debug_messages_if_not_explicitly_enabled.patch 1840 RMD160 097372c9264497b1aabb8b21e8b9959c24cca2f1 SHA1 f19dd9bbf3ed0868442a970a4c588640922c6cbc SHA256 92b8a8c8f46f06a0bfd93babb52f6d87c7b3f5dc6478b4f5d8e8c56c9e4e5bce
AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c69b5f6d41fa6ce010 SHA1 09eeafca53dd1c4b9347fd9d295949d37022e2f5 SHA256 9a6b141d5eb5fd73700086fef591074674563a2e5b374d3af4c6cea52726fc03
AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX dist/create_exe_symlink.cmake-sandbox-violation.patch 594 RMD160 fe8d9557e82bbf9d5df16d8f69f7addae1012bf8 SHA1 e99f1e647a8546d86fac79125ee80c549aa44ab9 SHA256 7997f74901718bea0dca35b0d0936004e47365db5aaf7efe87db80f69761e314
DIST kdelibs-4.2.85.tar.bz2 10049577 RMD160 667d32709eb9abb0a1046d01a328cf6eaecc2e8f SHA1 228fea238efb857bcbd95c7f0ec758c48d6c7628 SHA256 e1ec43b97a55d3d75a19e62ddc025a4024f78f19aabc69e40031490c26eaffb9
-EBUILD kdelibs-4.2.85.ebuild 5646 RMD160 275567d57af14f1fb55e233364ecbe1c1e654cf7 SHA1 27da126818dc41281cd2dddff5fdf13d36815847 SHA256 c6e8dd5c5080cfba08589e616c8dda6d8a42afb8a7206e4b075669348210f8e5
-EBUILD kdelibs-4.2.9999-r1.ebuild 5862 RMD160 98cda23a62723f395bad19997cd0d3dd87ec5a6e SHA1 214a0e79b309ec3b5356f997af92372aad5d60a4 SHA256 e5411b8b13c9c8f2309765835a99fba3b56e8205cd493e1b1920e28c5de1ffa4
-EBUILD kdelibs-9999-r1.ebuild 5635 RMD160 e2ab4300cb5257fab58d313a219b4f2ff59468ac SHA1 8819490a6306458a3a0c965a749b044c5d41d226 SHA256 5e73b3f9be32bd022cc5173eaeca3c7412ab55db3f97bd1732a42c8f745d1a0c
-MISC ChangeLog 19599 RMD160 9934b1b69fc9437c5fa5cd0c20af6df1f2701d3d SHA1 be261d7b7b21dd617da8767f8ec8c89a89cffc0d SHA256 b6cf60c03791b95a44b9ba417e1449878c9be3c263aa607b15b2c843047cbb66
+EBUILD kdelibs-4.2.85.ebuild 5690 RMD160 805287b03fef7f707d528ed55ae00f60a8937001 SHA1 9864e5d9079248a3a8a952ed41dbfc2988c60ea8 SHA256 d5decc02d9d0aefd4d2917e05d49f22998daa0de877e4ccc5fa51a82d8c9d6f5
+EBUILD kdelibs-4.2.9999-r1.ebuild 5870 RMD160 550e9d1045fc703d95a6f3884d140f105aaabb7e SHA1 f4ebec371cddbefddd09bf4ba697e0d620b74536 SHA256 28015f5d494c28c86a9d992e7a7b01e1b654210c93e74e792c784c86b7f4fc33
+EBUILD kdelibs-9999-r1.ebuild 5679 RMD160 f967133404c0efd1172a48b3ad808a4400c0fd63 SHA1 be84c55f46e226a6a0f795d24fd537e912cfc25a SHA256 783d31c7df7cd8c63d5fc827fdb35efec8354cb05ff4e38420ab5b423fe49f08
+MISC ChangeLog 19840 RMD160 6a259c4a2c3d7224d5b4a76b80b83faafca26e31 SHA1 543cc675340c6123f8883570a33b746406504e99 SHA256 38a04a20f16ad7fe1e872dcca5c7e3cdf9a8896fc79444ae5a8b2bdd6826a8d9
MISC metadata.xml 241 RMD160 e23ea97bfdc981201294af826fc0f315ebc0c663 SHA1 65e562c9b76e5c338c984bdd9dd5f1026013c0d3 SHA256 3f6cec1e375ad99ac2929f89e8fbe74237333497106dfc52c36af0aa5629b139
diff --git a/kde-base/kdelibs/files/dist/create_exe_symlink.cmake-sandbox-violation.patch b/kde-base/kdelibs/files/dist/create_exe_symlink.cmake-sandbox-violation.patch
new file mode 100644
index 00000000000..4a3f6858e43
--- /dev/null
+++ b/kde-base/kdelibs/files/dist/create_exe_symlink.cmake-sandbox-violation.patch
@@ -0,0 +1,12 @@
+Index: kdelibs/cmake/modules/create_exe_symlink.cmake
+===================================================================
+--- kdelibs/cmake/modules/create_exe_symlink.cmake (revision 964573)
++++ kdelibs/cmake/modules/create_exe_symlink.cmake (working copy)
+@@ -11,6 +11,6 @@
+ GET_FILENAME_COMPONENT(abs_target ${TARGET} ABSOLUTE)
+ IF(UNIX)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} ${abs_link_name})
+- EXECUTE_PROCESS(COMMAND chmod a+x ${abs_target})
++ EXECUTE_PROCESS(COMMAND chmod a+x $ENV{DESTDIR}/${abs_target})
+ ENDIF(UNIX)
+ # FIXME: WIN32 support \ No newline at end of file
diff --git a/kde-base/kdelibs/kdelibs-4.2.85.ebuild b/kde-base/kdelibs/kdelibs-4.2.85.ebuild
index 3eb6101554e..ba60414b75a 100644
--- a/kde-base/kdelibs/kdelibs-4.2.85.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.85.ebuild
@@ -20,7 +20,6 @@ mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
COMMONDEPEND="
- !=kde-base/kdelibs-9999
>=app-misc/strigi-0.6.3[dbus,qt4]
dev-libs/libpcre
dev-libs/libxml2
@@ -113,6 +112,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
+ "${FILESDIR}/dist/create_exe_symlink.cmake-sandbox-violation.patch"
)
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.2.9999-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.9999-r1.ebuild
index 71185478258..925c2d0a00e 100644
--- a/kde-base/kdelibs/kdelibs-4.2.9999-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.9999-r1.ebuild
@@ -111,11 +111,11 @@ PDEPEND="
# upstream patches / dist patches
# systemsettings title issue
-# ${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch - see bug 263823
PATCHES=(
"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
+ "${FILESDIR}/dist/create_exe_symlink.cmake-sandbox-violation.patch"
)
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-9999-r1.ebuild b/kde-base/kdelibs/kdelibs-9999-r1.ebuild
index be77f581c29..8a30f3ae276 100644
--- a/kde-base/kdelibs/kdelibs-9999-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999-r1.ebuild
@@ -20,7 +20,6 @@ mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
COMMONDEPEND="
- !=kde-base/kdelibs-9999
>=app-misc/strigi-0.6.3[dbus,qt4]
dev-libs/libpcre
dev-libs/libxml2
@@ -113,6 +112,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
+ "${FILESDIR}/dist/create_exe_symlink.cmake-sandbox-violation.patch"
)
src_prepare() {
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 36d8eb1ef69..786cab17bfb 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*amarok-2.0.96-r1 (14 May 2009)
+*amarok-2.0.90-r2 (14 May 2009)
+
+ 14 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ -amarok-2.0.90-r1.ebuild, +amarok-2.0.90-r2.ebuild, -amarok-2.0.96.ebuild,
+ +amarok-2.0.96-r1.ebuild, amarok-9999.ebuild:
+ Fixed deps - removed plasma-workspace deps - moved phonon-kde deps to
+ RDEPEND, removed redundant inherit (cmake-utils already requires and uses
+ flag-o-matic - this will not change)
+
*amarok-2.0.96 (13 May 2009)
13 May 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a691b02e67b..e95b1f3188e 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -2,8 +2,8 @@ AUX amarok-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1
AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6
DIST amarok-2.0.90.tar.bz2 5201787 RMD160 a0bb847cd254197e17e1cfcf7b565c395629e7c4 SHA1 a7926b514d52e4a445fbf307fb16d4b5b058c017 SHA256 ef38f9bb0b34f12e1aac7884431038ae62d1bb9a2a1a6ffe36c2fcd6f3d7e51b
DIST amarok-2.0.96.tar.bz2 5189289 RMD160 ed7eccf0657d32ebe43f50b6aa53f2a1bf3246ca SHA1 392d915c07c648c2935f6d2499cecc08ac808292 SHA256 32cceb325e3c7d2bebc8ba852f916cc406ff42bc3a52bf4d457e5391c24a1de4
-EBUILD amarok-2.0.90-r1.ebuild 2116 RMD160 79a796277980e6a07ebf9213af831fd03c1a3a85 SHA1 372a4bb9591e10cee256f529f528796d0e76373d SHA256 d24710a5f6e7a2a7a6dd49ad56ad192986d43c9b9c871f0d8c2e5a1a76b32c8b
-EBUILD amarok-2.0.96.ebuild 2116 RMD160 79a796277980e6a07ebf9213af831fd03c1a3a85 SHA1 372a4bb9591e10cee256f529f528796d0e76373d SHA256 d24710a5f6e7a2a7a6dd49ad56ad192986d43c9b9c871f0d8c2e5a1a76b32c8b
-EBUILD amarok-9999.ebuild 2031 RMD160 26ab36283d79cdca4447dc35e9c0076736fd2972 SHA1 eb897c522388d7d64db61340fd5ebc7195c978d3 SHA256 da28f9c0f949353d94e516dcf63aebb323e3c4d87014cbffd2aaf276d1634252
-MISC ChangeLog 6472 RMD160 9eb16ce2901180ab184ac887cc6a90101fecc861 SHA1 0fb9ab064e037095e87c713d34cad5ae002b68a2 SHA256 31290b4f39d3d9ff58c05b6b492c1f515daf5a03c306467de00858d5bb179591
+EBUILD amarok-2.0.90-r2.ebuild 2059 RMD160 a561c2b4e5dfee8060ce280be6ac7fd70027b04d SHA1 536f88607d91d0726b820c381ee6cbe29ac44f3c SHA256 b3258995dcb0da6fcdfd94c52f7e10281d3408b7d4312fb1226b5f59224dbf6e
+EBUILD amarok-2.0.96-r1.ebuild 2059 RMD160 a561c2b4e5dfee8060ce280be6ac7fd70027b04d SHA1 536f88607d91d0726b820c381ee6cbe29ac44f3c SHA256 b3258995dcb0da6fcdfd94c52f7e10281d3408b7d4312fb1226b5f59224dbf6e
+EBUILD amarok-9999.ebuild 1987 RMD160 4885914d2aa776780961dce38a023e975c93daf4 SHA1 127abad6f877e00eedede0b2c5a0cbb7748cf673 SHA256 3555f6f64bfe9927a93beb957aaabfa5cff93c6426dec66b25c58cb1593e0f23
+MISC ChangeLog 6914 RMD160 a5ed249d12f783662ebf5746898abbaec112ea0c SHA1 4f7ed1c424aa9c979692883f8f3b27480f243921 SHA256 8133a3c67859de080bc71f14d92f386aafb574b5c8e24acc0939af887562e9bc
MISC metadata.xml 1999 RMD160 63f7987491620b67603d2c53e673c49c55937d62 SHA1 9c8ca66b5d1f1804ec8087cf2a05d07a2aacee25 SHA256 1b1484b185d63cd03c8bbc85c797447b5249d12b7e04db0fa64efecf89cd28f8
diff --git a/media-sound/amarok/amarok-2.0.90-r1.ebuild b/media-sound/amarok/amarok-2.0.90-r2.ebuild
index 871247a305d..b976ba495fe 100644
--- a/media-sound/amarok/amarok-2.0.90-r1.ebuild
+++ b/media-sound/amarok/amarok-2.0.90-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
OPENGL_REQUIRED="optional"
KMNAME="extragear/multimedia"
-inherit flag-o-matic kde4-base
+inherit kde4-base
DESCRIPTION="Advanced audio player based on KDE framework."
HOMEPAGE="http://amarok.kde.org/"
@@ -26,8 +26,6 @@ DEPEND="
>=media-libs/taglib-1.5
>=media-libs/taglib-extras-0.1[kde]
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
- >=kde-base/phonon-kde-${KDE_MINIMAL}
- >=kde-base/plasma-workspace-${KDE_MINIMAL}
sys-libs/zlib
>=x11-libs/qtscriptgenerator-0.1.0
cdaudio? (
@@ -49,6 +47,7 @@ DEPEND="
mtp? ( >=media-libs/libmtp-0.3.0 )
"
RDEPEND="${DEPEND}
+ >=kde-base/phonon-kde-${KDE_MINIMAL}
media-sound/amarok-utils
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
diff --git a/media-sound/amarok/amarok-2.0.96.ebuild b/media-sound/amarok/amarok-2.0.96-r1.ebuild
index 871247a305d..b976ba495fe 100644
--- a/media-sound/amarok/amarok-2.0.96.ebuild
+++ b/media-sound/amarok/amarok-2.0.96-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
OPENGL_REQUIRED="optional"
KMNAME="extragear/multimedia"
-inherit flag-o-matic kde4-base
+inherit kde4-base
DESCRIPTION="Advanced audio player based on KDE framework."
HOMEPAGE="http://amarok.kde.org/"
@@ -26,8 +26,6 @@ DEPEND="
>=media-libs/taglib-1.5
>=media-libs/taglib-extras-0.1[kde]
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
- >=kde-base/phonon-kde-${KDE_MINIMAL}
- >=kde-base/plasma-workspace-${KDE_MINIMAL}
sys-libs/zlib
>=x11-libs/qtscriptgenerator-0.1.0
cdaudio? (
@@ -49,6 +47,7 @@ DEPEND="
mtp? ( >=media-libs/libmtp-0.3.0 )
"
RDEPEND="${DEPEND}
+ >=kde-base/phonon-kde-${KDE_MINIMAL}
media-sound/amarok-utils
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 017c60a7759..2360c32c675 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="
>=media-libs/taglib-1.5
>=media-libs/taglib-extras-0.1[kde]
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
- >=kde-base/phonon-kde-${KDE_MINIMAL}
- >=kde-base/plasma-workspace-${KDE_MINIMAL}
sys-libs/zlib
>=x11-libs/qtscriptgenerator-0.1.0
cdaudio? (
@@ -48,6 +46,7 @@ DEPEND="
mtp? ( >=media-libs/libmtp-0.3.0 )
"
RDEPEND="${DEPEND}
+ >=kde-base/phonon-kde-${KDE_MINIMAL}
media-sound/amarok-utils
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 22:07:05 +0000