diff options
75 files changed, 119 insertions, 83 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 349aa4d5ece..2a86ae80d9c 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -20,7 +20,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_ # Add dependencies that all packages in a certain module share. case ${KMNAME} in - kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) + kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kde-runtime|kdegraphics) COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) @@ -206,11 +206,6 @@ kde4-meta_src_extract() { done ;; esac - - if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then - sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \ - "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed" - fi else local abort tarball tarfile f extractlist moduleprefix postfix @@ -225,6 +220,10 @@ kde4-meta_src_extract() { moduleprefix=apps/ KMTARPARAMS+=" --transform=s|apps/||" ;; + kde-runtime) + # Old tarball naming scheme + tarball="kdebase-runtime-${PV}.tar.${postfix}" + ;; *) # Create tarball name from module name (this is the default) tarball="${KMNAME}-${PV}.tar.${postfix}" @@ -324,7 +323,7 @@ kde4-meta_create_extractlists() { config-apps.h.cmake ConfigureChecks.cmake" ;; - kdebase-runtime) + kdebase-runtime|kde-runtime) KMEXTRACTONLY+=" config-runtime.h.cmake" ;; @@ -386,7 +385,7 @@ kde4-meta_create_extractlists() { esac # Don't install cmake modules for split ebuilds, to avoid collisions. case ${KMNAME} in - kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) + kdebase-runtime|kde-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) case ${PN} in libkdegames|libkdeedu|libkworkspace) KMEXTRA+=" @@ -565,7 +564,7 @@ kde4-meta_change_cmakelists() { -i CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" fi ;; - kdebase-runtime) + kdebase-runtime|kde-runtime) # COLLISION PROTECT section # Only install the kde4 script as part of kde-base/kdebase-data if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then diff --git a/kde-base/activitymanager/Manifest b/kde-base/activitymanager/Manifest index a185d6eddac..0523751d69a 100644 --- a/kde-base/activitymanager/Manifest +++ b/kde-base/activitymanager/Manifest @@ -1,3 +1,3 @@ -EBUILD activitymanager-4.6.9999.ebuild 229 RMD160 ce93d6a3a380286ffce4c49af3c25a7b194d50ad SHA1 5b8430602b89504cd0058698fa0106b6ad9245e6 SHA256 58abaa6a9346a42e1ed40fef03f28ec1df9eada483e2f72f54823d402e27d825 +EBUILD activitymanager-4.6.9999.ebuild 239 RMD160 915a9033df319043e83f34c39490f01215f32bef SHA1 6331bdec648a46a5b925e21401f571c53c80fce0 SHA256 faf1f3bb995c317e3ff85def519fb4d9ab5fee64123ccb301de764fec22691cd EBUILD activitymanager-9999.ebuild 229 RMD160 ce93d6a3a380286ffce4c49af3c25a7b194d50ad SHA1 5b8430602b89504cd0058698fa0106b6ad9245e6 SHA256 58abaa6a9346a42e1ed40fef03f28ec1df9eada483e2f72f54823d402e27d825 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild index 49d52c49ccc..f9c5d8657ad 100644 --- a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild +++ b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="Activity manager" diff --git a/kde-base/attica/Manifest b/kde-base/attica/Manifest index 2feadbbd6b6..4a1229adf09 100644 --- a/kde-base/attica/Manifest +++ b/kde-base/attica/Manifest @@ -1,3 +1,3 @@ -EBUILD attica-4.6.9999.ebuild 320 RMD160 3241900043320c9463a515b07b7b587e4b1bf70f SHA1 c2698d345b79b9ec1841e443a085aae6fbc3afcf SHA256 5d6e3f22dcc3197a15bfb70dcfe55141313ce7d4a0ece7738652d6ebeb805b98 +EBUILD attica-4.6.9999.ebuild 330 RMD160 d751df5ae0826e9ba88e6cc119c46c64fdb44818 SHA1 d157cc211c54bd252424ca3fac761a6fadad93d4 SHA256 64ff6406bf6f3a586c280182c0027f8cc4ca2c182f59bfb2cc0bd3f0c12bc2c7 EBUILD attica-9999.ebuild 320 RMD160 3241900043320c9463a515b07b7b587e4b1bf70f SHA1 c2698d345b79b9ec1841e443a085aae6fbc3afcf SHA256 5d6e3f22dcc3197a15bfb70dcfe55141313ce7d4a0ece7738652d6ebeb805b98 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/attica/attica-4.6.9999.ebuild b/kde-base/attica/attica-4.6.9999.ebuild index 66386c78cc6..d12b67540f5 100644 --- a/kde-base/attica/attica-4.6.9999.ebuild +++ b/kde-base/attica/attica-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="Open Collaboration Services provider management" diff --git a/kde-base/drkonqi/Manifest b/kde-base/drkonqi/Manifest index f657d14ee2e..c637096d513 100644 --- a/kde-base/drkonqi/Manifest +++ b/kde-base/drkonqi/Manifest @@ -1,3 +1,3 @@ -EBUILD drkonqi-4.6.9999.ebuild 485 RMD160 48a5764d6ad4e943a1354f41ba4ba75f690f00cd SHA1 e74c1b7ae513b5ff5579c6b039da092eb4e0fe89 SHA256 a92429f4a71cc08b2c79f100418a22c23f2223bf590b5749fc9467d2e9a4e6eb +EBUILD drkonqi-4.6.9999.ebuild 495 RMD160 f4ba5d924ccb0c885814832c611ac2d9d1f9e4e9 SHA1 1023ed98e7fda62c64d825e69d0aa4b7a241b5c0 SHA256 91118f56e5abd68cbd2ca85796681e3154240eafee77b5080d7d82315a6d6fc1 EBUILD drkonqi-9999.ebuild 485 RMD160 48a5764d6ad4e943a1354f41ba4ba75f690f00cd SHA1 e74c1b7ae513b5ff5579c6b039da092eb4e0fe89 SHA256 a92429f4a71cc08b2c79f100418a22c23f2223bf590b5749fc9467d2e9a4e6eb MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/drkonqi/drkonqi-4.6.9999.ebuild b/kde-base/drkonqi/drkonqi-4.6.9999.ebuild index 28f2bda1204..4725db41580 100644 --- a/kde-base/drkonqi/drkonqi-4.6.9999.ebuild +++ b/kde-base/drkonqi/drkonqi-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed" diff --git a/kde-base/kcmshell/Manifest b/kde-base/kcmshell/Manifest index 23d3c03abbc..89e22c69a3c 100644 --- a/kde-base/kcmshell/Manifest +++ b/kde-base/kcmshell/Manifest @@ -1,3 +1,3 @@ -EBUILD kcmshell-4.6.9999.ebuild 295 RMD160 ea036beffb41c3c9894f50bc7edf7daba7f33526 SHA1 cd671de4114468a931b138b187b0c32a898506cd SHA256 6ce8a19d6ce37958d1c9d7e1276c09aa25e669ca3945be67c8c29d6a7aeea0f4 +EBUILD kcmshell-4.6.9999.ebuild 305 RMD160 d2b0a9b50f54f4944440c7b7970376a9d7b088ab SHA1 0a826535225ab081e13b7e9f36be8d8a64a0cb39 SHA256 8aa816b8741f7e3d627a7f7ddaaac8fb7b139385bc5748431dd31e5992028b3b EBUILD kcmshell-9999.ebuild 295 RMD160 ea036beffb41c3c9894f50bc7edf7daba7f33526 SHA1 cd671de4114468a931b138b187b0c32a898506cd SHA256 6ce8a19d6ce37958d1c9d7e1276c09aa25e669ca3945be67c8c29d6a7aeea0f4 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kcmshell/kcmshell-4.6.9999.ebuild b/kde-base/kcmshell/kcmshell-4.6.9999.ebuild index b5142d651e5..bc5caea3dcc 100644 --- a/kde-base/kcmshell/kcmshell-4.6.9999.ebuild +++ b/kde-base/kcmshell/kcmshell-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings." diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest index 65fde785aa7..9d0c1b16ad8 100644 --- a/kde-base/kcontrol/Manifest +++ b/kde-base/kcontrol/Manifest @@ -1,3 +1,3 @@ -EBUILD kcontrol-4.6.9999.ebuild 366 RMD160 83a56aef1887b8cc7954fee7efea3c909406116f SHA1 baf60391f568aaf9837f827c578d20bdb29556cf SHA256 b205094f0d64c253faa488e4582458731d7b8c0fe5bc76a101e8e6a078b208c4 +EBUILD kcontrol-4.6.9999.ebuild 376 RMD160 af3aab39d8715bb93b01954497c73abc852b20bd SHA1 ab0e4f7ccab2b5466f475c6ec504d7e8c0a47bc1 SHA256 bce503f1d2a8aeb3f27cb988d92d4c92e2d83b6c65156235c94936337b3c576c EBUILD kcontrol-9999.ebuild 366 RMD160 83a56aef1887b8cc7954fee7efea3c909406116f SHA1 baf60391f568aaf9837f827c578d20bdb29556cf SHA256 b205094f0d64c253faa488e4582458731d7b8c0fe5bc76a101e8e6a078b208c4 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kcontrol/kcontrol-4.6.9999.ebuild b/kde-base/kcontrol/kcontrol-4.6.9999.ebuild index d8ce00eed17..956bfc01463 100644 --- a/kde-base/kcontrol/kcontrol-4.6.9999.ebuild +++ b/kde-base/kcontrol/kcontrol-4.6.9999.ebuild @@ -5,7 +5,8 @@ EAPI=3 KDE_HANDBOOK="optional" -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" inherit kde4-meta DESCRIPTION="The KDE Control Center" diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest index e0be825a737..ebd7cad057f 100644 --- a/kde-base/kdebase-data/Manifest +++ b/kde-base/kdebase-data/Manifest @@ -1,3 +1,3 @@ -EBUILD kdebase-data-4.6.9999.ebuild 798 RMD160 4cb58f15d231d63352166dec33d0520754fab5d1 SHA1 06674976b6955436478afcddc8ba39069a7d6b29 SHA256 f107eb149f92aa46a5eec74f0d22db93c563990c2da2296b0315ffc06010f8ad +EBUILD kdebase-data-4.6.9999.ebuild 808 RMD160 dbe7e94812c911afc7f8f3e63e3872aa89891287 SHA1 8867cb9883e33c3bc3071ba265a3a5c15b24b584 SHA256 83916e78ee68ed28343ed87faac240ebcb9482d79b1dbacddf2c2886d6be05ea EBUILD kdebase-data-9999.ebuild 798 RMD160 4cb58f15d231d63352166dec33d0520754fab5d1 SHA1 06674976b6955436478afcddc8ba39069a7d6b29 SHA256 f107eb149f92aa46a5eec74f0d22db93c563990c2da2296b0315ffc06010f8ad MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild b/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild index bd45488dc12..3d61cf363c7 100644 --- a/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild +++ b/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" KMNOMODULE="true" inherit kde4-meta diff --git a/kde-base/kdebase-desktoptheme/Manifest b/kde-base/kdebase-desktoptheme/Manifest index 026b28daf89..7fe39498ad9 100644 --- a/kde-base/kdebase-desktoptheme/Manifest +++ b/kde-base/kdebase-desktoptheme/Manifest @@ -1,3 +1,3 @@ -EBUILD kdebase-desktoptheme-4.6.9999.ebuild 258 RMD160 415fca2864b6a689a3e0131c902122d91bbf6d1c SHA1 fb6279023cff83e9a3114b30fc392728acaa705d SHA256 2249d4f49f979057e817f10c4dd3414399eb47b4c8b7b0c51a38ca5d6a43b8cf +EBUILD kdebase-desktoptheme-4.6.9999.ebuild 268 RMD160 647bd24c30fad1b2404d64d9756157d0df64848a SHA1 90a1910c03725e8863f1d0c4f15d4a79f8a9d665 SHA256 7bb53bcd53fb04b7d6dda87065b4eba449a8b6b6a6227a8b37983a33ebe134a1 EBUILD kdebase-desktoptheme-9999.ebuild 258 RMD160 415fca2864b6a689a3e0131c902122d91bbf6d1c SHA1 fb6279023cff83e9a3114b30fc392728acaa705d SHA256 2249d4f49f979057e817f10c4dd3414399eb47b4c8b7b0c51a38ca5d6a43b8cf MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild index 3349299521e..a1ed6dcac8e 100644 --- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild +++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild @@ -4,7 +4,8 @@ EAPI=3 -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" KMMODULE="desktoptheme" inherit kde4-meta diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest index 9ccc72d4803..cb0187d348d 100644 --- a/kde-base/kdebase-kioslaves/Manifest +++ b/kde-base/kdebase-kioslaves/Manifest @@ -1,3 +1,3 @@ -EBUILD kdebase-kioslaves-4.6.9999.ebuild 1219 RMD160 ee16db37a9f03f32f51b6ea30c3a0e5cb288bf86 SHA1 ace1ad8aa597cba8be341bea2328c3c3dc2ae941 SHA256 5b5dca0140925ada7e398016fc5018f417a54bdbbc93c97332b079777f55e1a0 +EBUILD kdebase-kioslaves-4.6.9999.ebuild 1229 RMD160 873109a563d03880bf5105ca343572720cf40963 SHA1 04a8b4c20d3af53365e7dbfbc55ab76474c895f0 SHA256 8047350d6ffaeeb20e92cf0a6dbfccf0cbbd2638794c4fc3f77e159e4884c701 EBUILD kdebase-kioslaves-9999.ebuild 1219 RMD160 ee16db37a9f03f32f51b6ea30c3a0e5cb288bf86 SHA1 ace1ad8aa597cba8be341bea2328c3c3dc2ae941 SHA256 5b5dca0140925ada7e398016fc5018f417a54bdbbc93c97332b079777f55e1a0 MISC metadata.xml 257 RMD160 c3d8e831fca8121181dfd47f4bf10b91c4b41658 SHA1 153ca48c830db30d6c39e9cd5dd39d23d7e87331 SHA256 1d6b1fefc7cad1cf2b72338e3bb02748bedcd90518c489af24d61f7c97be6304 diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild index ece3ac71e20..a324e1a6a71 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild @@ -5,7 +5,8 @@ EAPI=3 KDE_HANDBOOK="optional" -KMNAME="kdebase-runtime" +KDE_SCM="git" +KMNAME="kde-runtime" KMMODULE="kioslave" inherit kde4-meta diff --git a/kde-base/kdebase-menu-icons/Manifest b/kde-base/kdebase-menu-icons/Manifest index 7addd6f13d1..b02e6b827ee 100644 --- a/kde-base/kdebase-menu-icons/Manifest +++ b/kde-base/kdebase-menu-icons/Manifest @@ -1,3 +1,3 @@ -EBUILD kdebase-menu-icons-4.6.9999.ebuild 266 RMD160 5b91f9c58499ded888066d7a3217483a3f3ad8be SHA1 c7ec55cc13636cd3d92dbcb785f2586071f35353 SHA256 2aa338c9c12ef7133c29f8c42ab06dd4e12653f63a3233286886e7261a7d081f +EBUILD kdebase-menu-icons-4.6.9999.ebuild 276 RMD160 ac3bb6691c87e23b2ff94fe67db1c6e7065bbd97 SHA1 b2f2033c714ecd9f4b3b6be77060f75c0e38df78 SHA256 22b4a6969e77ba7bab942f3627b88f1300254663c6f635d00e8ef0f185df1a36 EBUILD kdebase-menu-icons-9999.ebuild 266 RMD160 5b91f9c58499ded888066d7a3217483a3f3ad8be SHA1 c7ec55cc13636cd3d92dbcb785f2586071f35353 SHA256 2aa338c9c12ef7133c29f8c42ab06dd4e12653f63a3233286886e7261a7d081f MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild index 6613d0f762d..b43058db67e 100644 - |