* [gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, media-sound/kaudiocreator/, kde-misc/krusader/, ...
@ 2011-05-23 1:57 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; only message in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-23 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 3838dfbcda623bdaf2b042ca5d7e66bdb583218f
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 01:50:22 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon May 23 01:50:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3838dfbc
[eclass] Update kde4-meta eclass as upstream changed the name of the tarballs / kmname
for kde-baseapps, kde-runtime and kde-workspace in the 4.6.80 release.
[profiles/package.mask] Add more apps to the 4.6.80 mask.
[ebuilds] Whitespace fixing.
---
eclass/kde4-meta.eclass | 14 +++++++-------
kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild | 1 -
kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild | 1 -
kde-misc/kannasaver/kannasaver-1.2.ebuild | 1 -
kde-misc/krusader/krusader-9999.ebuild | 1 -
.../kaudiocreator/kaudiocreator-9999.ebuild | 1 -
profiles/package.mask | 4 ++++
profiles/package.mask.d/kde-4.6.80 | 4 ++++
x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild | 1 -
9 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index a5a0f0c..7aafcbc 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -21,7 +21,7 @@ EXPORT_FUNCTIONS ${KDEMETA_EXPF}
# Add dependencies that all packages in a certain module share.
case ${KMNAME} in
- kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
+ kdebase|kdebase-apps|kde-baseapps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics)
COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
;;
kdepim|kdepim-runtime)
@@ -321,16 +321,16 @@ kde4-meta_create_extractlists() {
ConfigureChecks.cmake"
fi
;;
- kdebase-apps)
+ kdebase-apps | kde-baseapps)
KMEXTRACTONLY+="
config-apps.h.cmake
ConfigureChecks.cmake"
;;
- kdebase-runtime)
+ kdebase-runtime | kde-runtime)
KMEXTRACTONLY+="
config-runtime.h.cmake"
;;
- kdebase-workspace)
+ kdebase-workspace | kde-workspace)
KMEXTRACTONLY+="
config-unix.h.cmake
ConfigureChecks.cmake
@@ -391,7 +391,7 @@ kde4-meta_create_extractlists() {
# should not try in that case
if [[ ${KMNAME} != kdegraphics ]] || { [[ ${SLOT} != 4.6 || ${PV} < 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; then
case ${KMNAME} in
- kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
+ kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
case ${PN} in
libkdegames|libkdeedu|libkworkspace)
KMEXTRA+="
@@ -559,7 +559,7 @@ kde4-meta_change_cmakelists() {
done
case ${KMNAME} in
- kdebase-workspace)
+ kdebase-workspace | kde-workspace)
# COLLISION PROTECT section
# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
# not as a part of every package.
@@ -574,7 +574,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/kdepim-icons/kdepim-icons-4.5.96.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
index fbc3fd8..1cf8c64 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
@@ -12,4 +12,3 @@ inherit kde4-meta
DESCRIPTION="KDE PIM icons"
IUSE=""
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
index df19493..dfcee4a 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
@@ -12,4 +12,3 @@ inherit kde4-meta
DESCRIPTION="KDE PIM icons"
IUSE=""
KEYWORDS=""
-
diff --git a/kde-misc/kannasaver/kannasaver-1.2.ebuild b/kde-misc/kannasaver/kannasaver-1.2.ebuild
index bda4f20..3acb52c 100644
--- a/kde-misc/kannasaver/kannasaver-1.2.ebuild
+++ b/kde-misc/kannasaver/kannasaver-1.2.ebuild
@@ -23,4 +23,3 @@ IUSE="debug"
RDEPEND="
$(add_kdebase_dep kscreensaver)
"
-
diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild
index fb8330d..a57ff1f 100644
--- a/kde-misc/krusader/krusader-9999.ebuild
+++ b/kde-misc/krusader/krusader-9999.ebuild
@@ -15,7 +15,6 @@ KEYWORDS=""
SLOT="4"
IUSE="debug"
-
RDEPEND="
$(add_kdebase_dep libkonq)
"
diff --git a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
index c8aea37..a6d44dc 100644
--- a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
@@ -23,4 +23,3 @@ RDEPEND="
media-libs/taglib
"
DOCS=( Changelog TODO )
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 6112779..8afc9a0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -15,6 +15,10 @@ kde-misc/daisy
~dev-libs/shared-desktop-ontologies-0.7.0
~kde-base/kde-env-4.6.80
~kde-base/kdelibs-4.6.80
+~kde-base/kdesu-4.6.80
+~kde-base/kdontchangethehostname-4.6.80
+~kde-base/khelpcenter-4.6.80
+~kde-base/nepomuk-4.6.80
~kde-base/oxygen-icons-4.6.80
kde-base/akonadiconsole:4.6
diff --git a/profiles/package.mask.d/kde-4.6.80 b/profiles/package.mask.d/kde-4.6.80
index 0132581..613b3e8 100644
--- a/profiles/package.mask.d/kde-4.6.80
+++ b/profiles/package.mask.d/kde-4.6.80
@@ -3,4 +3,8 @@
~dev-libs/shared-desktop-ontologies-0.7.0
~kde-base/kde-env-4.6.80
~kde-base/kdelibs-4.6.80
+~kde-base/kdesu-4.6.80
+~kde-base/kdontchangethehostname-4.6.80
+~kde-base/khelpcenter-4.6.80
+~kde-base/nepomuk-4.6.80
~kde-base/oxygen-icons-4.6.80
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
index 23fd418..afd5488 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
@@ -42,4 +42,3 @@ CONFIG_PROTECT="/usr/share/themes/oxygen-gtk/gtk-2.0"
EOF
doenvd 99oxygen-gtk
}
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-23 1:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-23 1:57 [gentoo-commits] proj/kde:master commit in: profiles/package.mask.d/, media-sound/kaudiocreator/, kde-misc/krusader/, Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox