summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdebase-startkde')
-rw-r--r--kde-base/kdebase-startkde/ChangeLog7
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild142
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild4
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild4
4 files changed, 10 insertions, 147 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 5680fa2e5444..f39041e45900 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdebase-startkde
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.204 2010/06/06 14:42:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.205 2010/06/21 15:53:10 scarabeus Exp $
+
+ 21 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -kdebase-startkde-4.3.3-r1.ebuild, kdebase-startkde-4.3.5.ebuild,
+ kdebase-startkde-4.4.4.ebuild:
+ Drop 4.3.3. Drop hppa keywords per bug #304363
*kdebase-startkde-4.4.4 (06 Jun 2010)
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild
deleted file mode 100644
index 3c400de65aee..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild,v 1.6 2010/01/19 01:22:46 jer Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-KMNOMODULE="true"
-inherit kde4-meta multilib
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
- $(add_kdebase_dep kcminit)
- $(add_kdebase_dep kdebase-desktoptheme)
- $(add_kdebase_dep kdebase-kioslaves)
- $(add_kdebase_dep kdebase-wallpapers)
- $(add_kdebase_dep keditfiletype)
- $(add_kdebase_dep kfmclient)
- $(add_kdebase_dep kglobalaccel)
- $(add_kdebase_dep kmimetypefinder)
- $(add_kdebase_dep knotify)
- $(add_kdebase_dep kreadconfig)
- $(add_kdebase_dep krunner)
- $(add_kdebase_dep ksmserver)
- $(add_kdebase_dep ksplash)
- $(add_kdebase_dep kstartupconfig)
- $(add_kdebase_dep kstyles)
- $(add_kdebase_dep ktimezoned)
- $(add_kdebase_dep kurifilter-plugins)
- $(add_kdebase_dep kwin)
- $(add_kdebase_dep phonon-kde)
- $(add_kdebase_dep plasma-apps)
- $(add_kdebase_dep plasma-workspace)
- $(add_kdebase_dep systemsettings)
- x11-apps/mkfontdir
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrandr
- x11-apps/xrdb
- x11-apps/xsetroot
- x11-apps/xset
-"
-
-KMEXTRACTONLY="
- ConfigureChecks.cmake
- kdm/
- safestartkde.cmake
- startkde.cmake
-"
-
-PATCHES=("${FILESDIR}/gentoo-startkde4-1.patch")
-
-src_prepare() {
- kde4-meta_src_prepare
-
- # Patch the startkde script to setup the environment for KDE
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs="${_libdirs}:${KDEDIR}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-
- # Sort the LDFLAGS out if necessary
- if use kdeprefix; then
- sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
- -i startkde.cmake || die "Sed for LDPATH failed."
- else
- sed -e "s#@REPLACE_LDFLAGS@##" \
- -i startkde.cmake || die "sed for LDPATH failed"
- fi
-
- # Complete LDPATH
- sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
- -i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
- # Now fix the prefix
- sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
- -i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
-}
-
-src_install() {
- kde4-meta_src_install
-
- # startup and shutdown scripts
- if use kdeprefix; then
- insinto "${KDEDIR}/env"
- else
- insinto "/etc/kde/startup"
- fi
- doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
-
- if use kdeprefix; then
- exeinto "${KDEDIR}/shutdown"
- else
- exeinto "/etc/kde/shutdown"
- fi
- doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
-
- if use kdeprefix; then
- KDE_X="KDE-${SLOT}"
- else
- KDE_X="KDE-4"
- fi
-
- # x11 session script
- cat <<-EOF > "${T}/${KDE_X}"
- #!/bin/sh
- exec ${KDEDIR}/bin/startkde
- EOF
- exeinto /etc/X11/Sessions
- doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
-
- # freedesktop compliant session script
- sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
- "${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
- insinto /usr/share/xsessions
- doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
-}
-
-pkg_postinst () {
- kde4-meta_pkg_postinst
-
- echo
- elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
- if use kdeprefix; then
- elog "edit ${KDEDIR}/env/agent-startup.sh and"
- elog "${KDEDIR}/shutdown/agent-shutdown.sh"
- else
- elog "edit /etc/kde/startup/agent-startup.sh and"
- elog "/etc/kde/shutdown/agent-shutdown.sh"
- fi
- echo
- elog "The name of the session script has changed."
- elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
- elog "configuration files, you will need to change it to"
- elog "XSESSION=\"${KDE_X}\""
-}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild
index 3a8be1843a55..af38860f9518 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild,v 1.3 2010/03/11 18:34:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.3.5.ebuild,v 1.4 2010/06/21 15:53:10 scarabeus Exp $
EAPI="2"
@@ -9,7 +9,7 @@ KMNOMODULE="true"
inherit kde4-meta multilib prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
# The KDE apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild
index 9dc34d1d364d..5081e36fc22e 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild,v 1.1 2010/06/06 14:42:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.4.ebuild,v 1.2 2010/06/21 15:53:10 scarabeus Exp $
EAPI="3"
@@ -9,7 +9,7 @@ KMNOMODULE="true"
inherit kde4-meta multilib prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
# The KDE apps called from the startkde script.