| 1 |
commit: 8da5b06dcb3649226730ea82d0de62cfe25cc330 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 1 17:59:40 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 1 17:59:40 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8da5b06d |
| 7 |
|
| 8 |
Revert "[kde-apps/kdebase-meta] Update for KDE Applications." |
| 9 |
|
| 10 |
This reverts commit 25da2233af7acd6e2a743d4d04dd0acbcec88413. |
| 11 |
|
| 12 |
.../kdebase-meta/kdebase-meta-15.08.49.9999.ebuild | 43 ++++++++++++++++++++-- |
| 13 |
kde-apps/kdebase-meta/kdebase-meta-9999.ebuild | 43 ++++++++++++++++++++-- |
| 14 |
kde-apps/kdebase-meta/metadata.xml | 2 + |
| 15 |
3 files changed, 80 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild |
| 18 |
index 2f71bd1..3dcd10a 100644 |
| 19 |
--- a/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild |
| 20 |
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.49.9999.ebuild |
| 21 |
@@ -3,26 +3,61 @@ |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
EAPI=5 |
| 25 |
- |
| 26 |
-inherit kde5-meta-pkg |
| 27 |
+inherit kde4-meta-pkg |
| 28 |
|
| 29 |
DESCRIPTION="Merge this to pull in all kdebase-derived packages" |
| 30 |
KEYWORDS="" |
| 31 |
-IUSE="+wallpapers" |
| 32 |
+IUSE="+display-manager minimal +wallpapers" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
$(add_kdeapps_dep dolphin) |
| 36 |
+ $(add_kdeapps_dep kcheckpass '' 4.11) |
| 37 |
+ wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) ) |
| 38 |
+ $(add_kdeapps_dep kde-base-artwork) |
| 39 |
$(add_kdeapps_dep kdebase-runtime-meta) |
| 40 |
$(add_kdeapps_dep kdialog) |
| 41 |
$(add_kdeapps_dep keditbookmarks) |
| 42 |
+ $(add_kdeapps_dep kephal '' 4.11) |
| 43 |
$(add_kdeapps_dep kfind) |
| 44 |
$(add_kdeapps_dep kfmclient) |
| 45 |
$(add_kdeapps_dep konq-plugins) |
| 46 |
$(add_kdeapps_dep konqueror) |
| 47 |
$(add_kdeapps_dep konsole) |
| 48 |
+ $(add_kdeapps_dep kscreensaver '' 4.11) |
| 49 |
+ $(add_kdeapps_dep kstartupconfig '' 4.11) |
| 50 |
+ $(add_kdeapps_dep kstyles '' 4.11) |
| 51 |
+ $(add_kdeapps_dep ksystraycmd '' 4.11) |
| 52 |
$(add_kdeapps_dep kwrite) |
| 53 |
$(add_kdeapps_dep libkonq) |
| 54 |
+ $(add_kdeapps_dep liboxygenstyle '' 4.11) |
| 55 |
+ $(add_kdeapps_dep libplasmaclock '' 4.11) |
| 56 |
$(add_kdeapps_dep nsplugins) |
| 57 |
+ $(add_kdeapps_dep phonon-kde) |
| 58 |
$(add_kdeapps_dep plasma-apps) |
| 59 |
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) |
| 60 |
+ $(add_kdeapps_dep qguiplatformplugin_kde '' 4.11) |
| 61 |
+ !minimal? ( |
| 62 |
+ $(add_kdeapps_dep freespacenotifier '' 4.11) |
| 63 |
+ $(add_kdeapps_dep kcminit '' 4.11) |
| 64 |
+ $(add_kdeapps_dep kdebase-cursors '' 4.11) |
| 65 |
+ $(add_kdeapps_dep kdebase-startkde '' 4.11) |
| 66 |
+ $(add_kdeapps_dep kdepasswd) |
| 67 |
+ $(add_kdeapps_dep khotkeys '' 4.11) |
| 68 |
+ $(add_kdeapps_dep kinfocenter '' 4.11) |
| 69 |
+ $(add_kdeapps_dep klipper '' 4.11) |
| 70 |
+ $(add_kdeapps_dep kmenuedit '' 4.11) |
| 71 |
+ $(add_kdeapps_dep krunner '' 4.11) |
| 72 |
+ $(add_kdeapps_dep ksmserver '' 4.11) |
| 73 |
+ $(add_kdeapps_dep ksplash '' 4.11) |
| 74 |
+ $(add_kdeapps_dep ksysguard '' 4.11) |
| 75 |
+ $(add_kdeapps_dep kwin '' 4.11) |
| 76 |
+ $(add_kdeapps_dep kwrited '' 4.11) |
| 77 |
+ $(add_kdebase_dep libkworkspace '' 4.11) |
| 78 |
+ $(add_kdeapps_dep libplasmagenericshell '' 4.11) |
| 79 |
+ $(add_kdeapps_dep libtaskmanager '' 4.11) |
| 80 |
+ $(add_kdeapps_dep plasma-workspace '' 4.11) |
| 81 |
+ $(add_kdeapps_dep powerdevil '' 4.11) |
| 82 |
+ $(add_kdeapps_dep solid-actions-kcm '' 4.11) |
| 83 |
+ $(add_kdeapps_dep systemsettings '' 4.11) |
| 84 |
+ !prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) ) |
| 85 |
+ ) |
| 86 |
" |
| 87 |
|
| 88 |
diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild |
| 89 |
index 2f71bd1..3dcd10a 100644 |
| 90 |
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild |
| 91 |
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild |
| 92 |
@@ -3,26 +3,61 @@ |
| 93 |
# $Id$ |
| 94 |
|
| 95 |
EAPI=5 |
| 96 |
- |
| 97 |
-inherit kde5-meta-pkg |
| 98 |
+inherit kde4-meta-pkg |
| 99 |
|
| 100 |
DESCRIPTION="Merge this to pull in all kdebase-derived packages" |
| 101 |
KEYWORDS="" |
| 102 |
-IUSE="+wallpapers" |
| 103 |
+IUSE="+display-manager minimal +wallpapers" |
| 104 |
|
| 105 |
RDEPEND=" |
| 106 |
$(add_kdeapps_dep dolphin) |
| 107 |
+ $(add_kdeapps_dep kcheckpass '' 4.11) |
| 108 |
+ wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) ) |
| 109 |
+ $(add_kdeapps_dep kde-base-artwork) |
| 110 |
$(add_kdeapps_dep kdebase-runtime-meta) |
| 111 |
$(add_kdeapps_dep kdialog) |
| 112 |
$(add_kdeapps_dep keditbookmarks) |
| 113 |
+ $(add_kdeapps_dep kephal '' 4.11) |
| 114 |
$(add_kdeapps_dep kfind) |
| 115 |
$(add_kdeapps_dep kfmclient) |
| 116 |
$(add_kdeapps_dep konq-plugins) |
| 117 |
$(add_kdeapps_dep konqueror) |
| 118 |
$(add_kdeapps_dep konsole) |
| 119 |
+ $(add_kdeapps_dep kscreensaver '' 4.11) |
| 120 |
+ $(add_kdeapps_dep kstartupconfig '' 4.11) |
| 121 |
+ $(add_kdeapps_dep kstyles '' 4.11) |
| 122 |
+ $(add_kdeapps_dep ksystraycmd '' 4.11) |
| 123 |
$(add_kdeapps_dep kwrite) |
| 124 |
$(add_kdeapps_dep libkonq) |
| 125 |
+ $(add_kdeapps_dep liboxygenstyle '' 4.11) |
| 126 |
+ $(add_kdeapps_dep libplasmaclock '' 4.11) |
| 127 |
$(add_kdeapps_dep nsplugins) |
| 128 |
+ $(add_kdeapps_dep phonon-kde) |
| 129 |
$(add_kdeapps_dep plasma-apps) |
| 130 |
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) |
| 131 |
+ $(add_kdeapps_dep qguiplatformplugin_kde '' 4.11) |
| 132 |
+ !minimal? ( |
| 133 |
+ $(add_kdeapps_dep freespacenotifier '' 4.11) |
| 134 |
+ $(add_kdeapps_dep kcminit '' 4.11) |
| 135 |
+ $(add_kdeapps_dep kdebase-cursors '' 4.11) |
| 136 |
+ $(add_kdeapps_dep kdebase-startkde '' 4.11) |
| 137 |
+ $(add_kdeapps_dep kdepasswd) |
| 138 |
+ $(add_kdeapps_dep khotkeys '' 4.11) |
| 139 |
+ $(add_kdeapps_dep kinfocenter '' 4.11) |
| 140 |
+ $(add_kdeapps_dep klipper '' 4.11) |
| 141 |
+ $(add_kdeapps_dep kmenuedit '' 4.11) |
| 142 |
+ $(add_kdeapps_dep krunner '' 4.11) |
| 143 |
+ $(add_kdeapps_dep ksmserver '' 4.11) |
| 144 |
+ $(add_kdeapps_dep ksplash '' 4.11) |
| 145 |
+ $(add_kdeapps_dep ksysguard '' 4.11) |
| 146 |
+ $(add_kdeapps_dep kwin '' 4.11) |
| 147 |
+ $(add_kdeapps_dep kwrited '' 4.11) |
| 148 |
+ $(add_kdebase_dep libkworkspace '' 4.11) |
| 149 |
+ $(add_kdeapps_dep libplasmagenericshell '' 4.11) |
| 150 |
+ $(add_kdeapps_dep libtaskmanager '' 4.11) |
| 151 |
+ $(add_kdeapps_dep plasma-workspace '' 4.11) |
| 152 |
+ $(add_kdeapps_dep powerdevil '' 4.11) |
| 153 |
+ $(add_kdeapps_dep solid-actions-kcm '' 4.11) |
| 154 |
+ $(add_kdeapps_dep systemsettings '' 4.11) |
| 155 |
+ !prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) ) |
| 156 |
+ ) |
| 157 |
" |
| 158 |
|
| 159 |
diff --git a/kde-apps/kdebase-meta/metadata.xml b/kde-apps/kdebase-meta/metadata.xml |
| 160 |
index 783e379..a88b9cb 100644 |
| 161 |
--- a/kde-apps/kdebase-meta/metadata.xml |
| 162 |
+++ b/kde-apps/kdebase-meta/metadata.xml |
| 163 |
@@ -3,6 +3,8 @@ |
| 164 |
<pkgmetadata> |
| 165 |
<herd>kde</herd> |
| 166 |
<use> |
| 167 |
+ <flag name="display-manager">Pull in a graphical display manager</flag> |
| 168 |
+ <flag name="minimal">Install a Plasma 5 compatible subset of the package</flag> |
| 169 |
<flag name="wallpapers">Install the KDE wallpapers</flag> |
| 170 |
</use> |
| 171 |
</pkgmetadata> |
Archives