kde-base/kdebase-startkde -> kde-plasma/kdebase-startkde

hanetzer · Dec 11, 2016 · c83cb2c · c83cb2c
1 parent 4c5cd6e
commit c83cb2c
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 4 deletions.
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
@@ -476,7 +476,7 @@ kde4-meta_change_cmakelists() {
  case ${KMNAME} in
  kde-workspace)
  # COLLISION PROTECT section
- # Install the startkde script just once, as a part of kde-base/kdebase-startkde,
+ # Install the startkde script just once, as a part of kde-plasma/kdebase-startkde,
  # not as a part of every package.
  if [[ ${PN} != kdebase-startkde && -f CMakeLists.txt ]]; then
  # The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.

diff --git a/kde-base/kdebase-startkde/Manifest → kde-plasma/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest → kde-plasma/kdebase-startkde/Manifest
diff --git a/kde-base/kdebase-startkde/files/KDE-4 → kde-plasma/kdebase-startkde/files/KDE-4 b/kde-base/kdebase-startkde/files/KDE-4 → kde-plasma/kdebase-startkde/files/KDE-4
diff --git a/.../kdebase-startkde/files/agent-shutdown.sh → .../kdebase-startkde/files/agent-shutdown.sh b/.../kdebase-startkde/files/agent-shutdown.sh → .../kdebase-startkde/files/agent-shutdown.sh
diff --git a/...e/kdebase-startkde/files/agent-startup.sh → ...a/kdebase-startkde/files/agent-startup.sh b/...e/kdebase-startkde/files/agent-startup.sh → ...a/kdebase-startkde/files/agent-startup.sh
diff --git a/...e-startkde/files/gentoo-startkde4-4.patch → ...e-startkde/files/gentoo-startkde4-4.patch b/...e-startkde/files/gentoo-startkde4-4.patch → ...e-startkde/files/gentoo-startkde4-4.patch
diff --git a/...tkde/files/kdebase-startkde-kscreen.patch → ...tkde/files/kdebase-startkde-kscreen.patch b/...tkde/files/kdebase-startkde-kscreen.patch → ...tkde/files/kdebase-startkde-kscreen.patch
diff --git a/...files/kdebase-startkde-kwalletd-pam.patch → ...files/kdebase-startkde-kwalletd-pam.patch b/...files/kdebase-startkde-kwalletd-pam.patch → ...files/kdebase-startkde-kwalletd-pam.patch
diff --git a/...artkde/kdebase-startkde-4.11.22-r2.ebuild → ...artkde/kdebase-startkde-4.11.22-r2.ebuild b/...artkde/kdebase-startkde-4.11.22-r2.ebuild → ...artkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 KMNOMODULE="true"
 inherit kde4-meta prefix
 
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+DESCRIPTION="Script which starts a complete Plasma session, and associated scripts"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="crash-reporter +handbook minimal +wallpapers"
 

diff --git a/kde-base/kdebase-startkde/metadata.xml → kde-plasma/kdebase-startkde/metadata.xml b/kde-base/kdebase-startkde/metadata.xml → kde-plasma/kdebase-startkde/metadata.xml
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
  !kde-plasma/freespacenotifier:4
  !kde-plasma/libtaskmanager:4
  !kde-plasma/kcminit:4
- !kde-base/kdebase-startkde:4
+ !kde-plasma/kdebase-startkde:4
  !kde-plasma/klipper:4
  !kde-plasma/krunner:4
  !kde-plasma/ksmserver:4

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
  !kde-plasma/freespacenotifier:4
  !kde-plasma/libtaskmanager:4
  !kde-plasma/kcminit:4
- !kde-base/kdebase-startkde:4
+ !kde-plasma/kdebase-startkde:4
  !kde-plasma/klipper:4
  !kde-plasma/krunner:4
  !kde-plasma/ksmserver:4

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
@@ -53,3 +53,4 @@ move kde-base/kactivities kde-frameworks/kactivities
 move kde-base/kdm kde-plasma/kdm
 move kde-base/plasma-workspace kde-plasma/plasma-workspace
 move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig
+move kde-base/kdebase-startkde kde-plasma/kdebase-startkde