diff options
Diffstat (limited to 'kde-base')
21 files changed, 104 insertions, 237 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog index 3ccb775619e8..b2f51c9d7e5c 100644 --- a/kde-base/kde-env/ChangeLog +++ b/kde-base/kde-env/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-env # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.102 2011/06/02 21:57:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.103 2011/06/06 20:30:06 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kde-env-4.6.2.ebuild, + kde-env-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kde-env-4.4.5.ebuild, -kde-env-4.4.5-r1.ebuild: diff --git a/kde-base/kde-env/kde-env-4.6.2.ebuild b/kde-base/kde-env/kde-env-4.6.2.ebuild index 20c84bdb7919..fa15c3547285 100644 --- a/kde-base/kde-env/kde-env-4.6.2.ebuild +++ b/kde-base/kde-env/kde-env-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v 1.4 2011/06/01 17:53:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v 1.5 2011/06/06 20:30:06 abcd Exp $ EAPI=3 @@ -29,58 +29,18 @@ src_prepare() { } src_install() { - if use kdeprefix; then - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs+=":${EKDEDIR}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # number goes down with version - cat <<-EOF > 43kdepaths-${SLOT} -PATH="${EKDEDIR}/bin" -ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin" -LDPATH="${_libdirs}" -MANPATH="${EKDEDIR}/share/man" -CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config" -#KDE_IS_PRELINKED=1 -PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig" -XDG_DATA_DIRS="${EKDEDIR}/share" -EOF - doenvd 43kdepaths-${SLOT} - cat <<-EOF > 50-kde-${SLOT} -SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*" -EOF - insinto /etc/revdep-rebuild - doins 50-kde-${SLOT} - - # kdeglobals needed to make third party apps installed in /usr work - cat <<-EOF > kdeglobals -[Directories][\$i] -prefixes=${EPREFIX}/usr -EOF - insinto ${KDEDIR}/share/config - doins kdeglobals - - KDE_X="KDE-${SLOT}" - else - # Much simpler for the FHS compliant -kdeprefix install - # number goes down with version - cat <<-EOF > 43kdepaths + # number goes down with version + cat <<-EOF > 43kdepaths CONFIG_PROTECT="/usr/share/config" #KDE_IS_PRELINKED=1 EOF - doenvd 43kdepaths - - KDE_X="KDE-4" - fi + doenvd 43kdepaths # Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env cat <<EOF > 11-xdg-menu-kde-${SLOT} #!/bin/sh -if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then +if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then export XDG_MENU_PREFIX="kde-${SLOT}-" fi EOF diff --git a/kde-base/kde-env/kde-env-4.6.3.ebuild b/kde-base/kde-env/kde-env-4.6.3.ebuild index 56b48045a101..4a118713969f 100644 --- a/kde-base/kde-env/kde-env-4.6.3.ebuild +++ b/kde-base/kde-env/kde-env-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v 1.1 2011/05/07 10:47:57 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v 1.2 2011/06/06 20:30:06 abcd Exp $ EAPI=4 @@ -29,58 +29,19 @@ src_prepare() { } src_install() { - if use kdeprefix; then - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs+=":${EKDEDIR}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # number goes down with version - cat <<-EOF > 43kdepaths-${SLOT} -PATH="${EKDEDIR}/bin" -ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin" -LDPATH="${_libdirs}" -MANPATH="${EKDEDIR}/share/man" -CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config" -#KDE_IS_PRELINKED=1 -PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig" -XDG_DATA_DIRS="${EKDEDIR}/share" -EOF - doenvd 43kdepaths-${SLOT} - cat <<-EOF > 50-kde-${SLOT} -SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*" -EOF - insinto /etc/revdep-rebuild - doins 50-kde-${SLOT} - - # kdeglobals needed to make third party apps installed in /usr work - cat <<-EOF > kdeglobals -[Directories][\$i] -prefixes=${EPREFIX}/usr -EOF - insinto ${KDEDIR}/share/config - doins kdeglobals - - KDE_X="KDE-${SLOT}" - else - # Much simpler for the FHS compliant -kdeprefix install - # number goes down with version - cat <<-EOF > 43kdepaths + # Much simpler for the FHS compliant -kdeprefix install + # number goes down with version + cat <<-EOF > 43kdepaths CONFIG_PROTECT="/usr/share/config" #KDE_IS_PRELINKED=1 EOF - doenvd 43kdepaths - - KDE_X="KDE-4" - fi + doenvd 43kdepaths # Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env cat <<EOF > 11-xdg-menu-kde-${SLOT} #!/bin/sh -if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then +if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then export XDG_MENU_PREFIX="kde-${SLOT}-" fi EOF diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 364fd9934d97..73137fc4cf8b 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.230 2011/06/02 21:57:50 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.231 2011/06/06 20:28:22 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdebase-startkde-4.6.2.ebuild, + kdebase-startkde-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdebase-startkde-4.4.5.ebuild: diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild index 650ac35d2fca..f8f4339d67d5 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.6.2.ebuild,v 1.4 2011/06/01 18:05:13 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild,v 1.5 2011/06/06 20:28:22 abcd Exp $ EAPI=3 @@ -50,28 +50,15 @@ PATCHES=("${FILESDIR}/gentoo-startkde4-3.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+=":${EKDEDIR}/${_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 + sed -e "s#@REPLACE_LDFLAGS@##" \ + -i startkde.cmake || die "sed for LDPATH failed" # 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}#" \ + sed -e "s#@REPLACE_PREFIX@#/usr#" \ -i startkde.cmake || die "Sed for REPLACE_PREFIX failed." # ... and fix ${EPREFIX} eprefixify startkde.cmake @@ -81,39 +68,25 @@ src_install() { kde4-meta_src_install # startup and shutdown scripts - if use kdeprefix; then - insinto "${KDEDIR}/env" - else - insinto "/etc/kde/startup" - fi + insinto "/etc/kde/startup" 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 + insinto "/etc/kde/shutdown" + doins "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed" # x11 session script - cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die - cat <<-EOF >> "${T}/${KDE_X}" - exec "${EKDEDIR}/bin/startkde" + cp "${FILESDIR}/sessionfile" "${T}/KDE-4" || die + cat <<-EOF >> "${T}/KDE-4" + exec "${EPREFIX}/usr/bin/startkde" EOF exeinto /etc/X11/Sessions - doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed" + doexe "${T}/KDE-4" || die "doexe KDE-4 failed" # freedesktop compliant session script - sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/${KDE_X}.desktop" + sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop" insinto /usr/share/xsessions - doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed" + doins "${T}/KDE-4.desktop" || die "doins KDE-4.desktop failed" } pkg_postinst () { @@ -121,16 +94,11 @@ pkg_postinst () { echo elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - if use kdeprefix; then - elog "edit ${EKDEDIR}/env/agent-startup.sh and" - elog "${EKDEDIR}/shutdown/agent-shutdown.sh" - else - elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and" - elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" - fi + elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and" + elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" 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}\"" + elog "XSESSION=\"KDE-4\"" } diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild index 9d8d39bfea1b..321597d2f639 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.6.3.ebuild,v 1.1 2011/05/07 10:47:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild,v 1.2 2011/06/06 20:28:22 abcd Exp $ EAPI=4 @@ -50,28 +50,15 @@ PATCHES=("${FILESDIR}/gentoo-startkde4-3.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+=":${EKDEDIR}/${_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 + sed -e "s#@REPLACE_LDFLAGS@##" \ + -i startkde.cmake || die "sed for LDPATH failed" # 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}#" \ + sed -e "s#@REPLACE_PREFIX@#/usr#" \ -i startkde.cmake || die "Sed for REPLACE_PREFIX failed." # ... and fix ${EPREFIX} eprefixify startkde.cmake @@ -81,39 +68,25 @@ src_install() { kde4-meta_src_install # startup and shutdown scripts - if use kdeprefix; then - insinto "${KDEDIR}/env" - else - insinto "/etc/kde/startup" - fi + insinto "/etc/kde/startup" doins "${FILESDIR}/agent-startup.sh" - if use kdeprefix; then - exeinto "${KDEDIR}/shutdown" - else - exeinto "/etc/kde/shutdown" - fi - doexe "${FILESDIR}/agent-shutdown.sh" - - if use kdeprefix; then - KDE_X="KDE-${SLOT}" - else - KDE_X="KDE-4" - fi + insinto "/etc/kde/shutdown" + doins "${FILESDIR}/agent-shutdown.sh" # x11 session script - cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die - cat <<-EOF >> "${T}/${KDE_X}" - exec "${EKDEDIR}/bin/startkde" + cp "${FILESDIR}/sessionfile" "${T}/KDE-4" || die + cat <<-EOF >> "${T}/KDE-4" + exec "${EPREFIX}/usr/bin/startkde" EOF exeinto /etc/X11/Sessions - doexe "${T}/${KDE_X}" + doexe "${T}/KDE-4" # freedesktop compliant session script - sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/${KDE_X}.desktop" + sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop" insinto /usr/share/xsessions - doins "${T}/${KDE_X}.desktop" + doins "${T}/KDE-4.desktop" } pkg_postinst () { @@ -121,16 +94,11 @@ pkg_postinst () { echo elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - if use kdeprefix; then - elog "edit ${EKDEDIR}/env/agent-startup.sh and" - elog "${EKDEDIR}/shutdown/agent-shutdown.sh" - else - elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and" - elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" - fi + elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and" + elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" 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}\"" + elog "XSESSION=\"KDE-4\"" } diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 83f0594de2f7..4e780b97a4d6 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.761 2011/06/04 18:01:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.762 2011/06/06 20:32:13 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdelibs-4.6.2-r3.ebuild, + kdelibs-4.6.3-r2.ebuild: + Remove mentions of kdeprefix *kdelibs-4.6.3-r2 (04 Jun 2011) diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild index 7bf1f009cfc7..0de39a3288cf 100644 --- a/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild,v 1.8 2011/06/01 18:10:20 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild,v 1.9 2011/06/06 20:32:11 abcd Exp $ EAPI=4 @@ -209,15 +209,10 @@ src_configure() { else mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) fi - if use kdeprefix; then - HME=".kde${SLOT}" - else - HME=".kde4" - fi mycmakeargs+=( -DWITH_HSPELL=OFF -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=${HME} + -DKDE_DEFAULT_HOME=.kde4 -DKAUTH_BACKEND=POLKITQT-1 $(cmake-utils_use_build handbook doc) $(cmake-utils_use_has 3dnow X86_3DNOW) @@ -321,7 +316,7 @@ pkg_postinst() { ewarn "https://bugs.gentoo.org/show_bug.cgi?id=365479" fi - elog "Your homedir is set to \${HOME}/${HME}" + elog "Your homedir is set to \${HOME}/.kde4" echo ewarn "In case you just upgraded from KDE 4.4.5 to KDE 4.6.2 (e.g. as stable tree user)," diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild index fd3f0527d6f1..c7dc08f985b8 100644 --- a/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.1 2011/06/04 18:01:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.2 2011/06/06 20:32:11 abcd Exp $ EAPI=4 @@ -206,15 +206,10 @@ src_configure() { else mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) fi - if use kdeprefix; then - HME=".kde${SLOT}" - else - HME=".kde4" - fi mycmakeargs+=( -DWITH_HSPELL=OFF -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=${HME} + -DKDE_DEFAULT_HOME=.kde4 -DKAUTH_BACKEND=POLKITQT-1 $(cmake-utils_use_build handbook doc) $(cmake-utils_use_has 3dnow X86_3DNOW) @@ -318,7 +313,7 @@ pkg_postinst() { ewarn "https://bugs.gentoo.org/show_bug.cgi?id=365479" fi - elog "Your homedir is set to \${HOME}/${HME}" + elog "Your homedir is set to \${HOME}/.kde4" echo kde4-base_pkg_postinst diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index daccec830619..485a4eefd6ec 100644 --- a/kde-base/kdeplasma-addons/ChangeLog +++ b/kde-base/kdeplasma-addons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeplasma-addons # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.89 2011/06/02 21:57:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.90 2011/06/06 20:35:39 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdeplasma-addons-4.6.2.ebuild, + kdeplasma-addons-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdeplasma-addons-4.4.5.ebuild: diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild index 91d9ff443976..d3e2f5b20df9 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.7 2011/06/01 18:13:34 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.8 2011/06/06 20:35:39 abcd Exp $ EAPI=3 @@ -40,10 +40,8 @@ DEPEND="${COMMON_DEPEND} # kde-misc/plasmaboard: moved here in 4.3.65 # kde-misc/qalculate-applet: since 4.4.0 RDEPEND="${COMMON_DEPEND} - !kdeprefix? ( - !kde-misc/plasmaboard - !kde-misc/qalculate-applet - ) + !kde-misc/plasmaboard + !kde-misc/qalculate-applet " # kdebase-data: some svg icons moved from data directly here. diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild index 4ce75ee9d933..d75643f0caef 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.2 2011/05/07 15:12:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.3 2011/06/06 20:35:39 abcd Exp $ EAPI=4 @@ -40,10 +40,8 @@ DEPEND="${COMMON_DEPEND} # kde-misc/plasmaboard: moved here in 4.3.65 # kde-misc/qalculate-applet: since 4.4.0 RDEPEND="${COMMON_DEPEND} - !kdeprefix? ( - !kde-misc/plasmaboard - !kde-misc/qalculate-applet - ) + !kde-misc/plasmaboard + !kde-misc/qalculate-applet " # kdebase-data: some svg icons moved from data directly here. diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog index 28314a2fbb8b..5f71a49789b7 100644 --- a/kde-base/kdesdk-kioslaves/ChangeLog +++ b/kde-base/kdesdk-kioslaves/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdesdk-kioslaves # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.170 2011/06/02 21:57:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.171 2011/06/06 20:36:48 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdesdk-kioslaves-4.6.2.ebuild, + kdesdk-kioslaves-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdesdk-kioslaves-4.4.5.ebuild: diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild index 84a1fcf543a2..b2302886bc50 100644 --- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild +++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild,v 1.4 2011/06/01 18:14:01 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.2.ebuild,v 1.5 2011/06/06 20:36:48 abcd Exp $ EAPI=3 @@ -19,9 +19,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kdeprefix? ( - subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) - ) + subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) " src_configure() { diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild index 5e4eeb1cc927..621120add03d 100644 --- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild +++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild,v 1.1 2011/05/07 10:47:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.6.3.ebuild,v 1.2 2011/06/06 20:36:48 abcd Exp $ EAPI=4 @@ -19,9 +19,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kdeprefix? ( - subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) - ) + subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) " src_configure() { diff --git a/kde-base/ksudoku/ChangeLog b/kde-base/ksudoku/ChangeLog index 145ee6775d09..fafe770d8afd 100644 --- a/kde-base/ksudoku/ChangeLog +++ b/kde-base/ksudoku/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/ksudoku # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.83 2011/06/02 21:57:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.84 2011/06/06 20:37:26 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> ksudoku-4.6.2.ebuild, + ksudoku-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -ksudoku-4.4.5.ebuild: Drop KDE-4.4 diff --git a/kde-base/ksudoku/ksudoku-4.6.2.ebuild b/kde-base/ksudoku/ksudoku-4.6.2.ebuild index b06a9abcfb78..61dfc58c5bd7 100644 --- a/kde-base/ksudoku/ksudoku-4.6.2.ebuild +++ b/kde-base/ksudoku/ksudoku-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.6.2.ebuild,v 1.4 2011/06/01 18:57:55 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.6.2.ebuild,v 1.5 2011/06/06 20:37:27 abcd Exp $ EAPI=3 @@ -14,5 +14,5 @@ KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug" RDEPEND=" - !kdeprefix? ( !games-puzzle/ksudoku ) + !games-puzzle/ksudoku " diff --git a/kde-base/ksudoku/ksudoku-4.6.3.ebuild b/kde-base/ksudoku/ksudoku-4.6.3.ebuild index 1b81f8c75f3d..075ed27ea245 100644 --- a/kde-base/ksudoku/ksudoku-4.6.3.ebuild +++ b/kde-base/ksudoku/ksudoku-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.6.3.ebuild,v 1.1 2011/05/07 10:47:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.6.3.ebuild,v 1.2 2011/06/06 20:37:26 abcd Exp $ EAPI=4 @@ -14,5 +14,5 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" RDEPEND=" - !kdeprefix? ( !games-puzzle/ksudoku ) + !games-puzzle/ksudoku " diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index 80bdfb537204..e884653c418f 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/marble # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.93 2011/06/02 21:57:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.94 2011/06/06 20:38:02 abcd Exp $ + + 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> marble-4.6.2-r1.ebuild, + marble-4.6.3.ebuild: + Remove mentions of kdeprefix 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -marble-4.4.5.ebuild: Drop KDE-4.4 diff --git a/kde-base/marble/marble-4.6.2-r1.ebuild b/kde-base/marble/marble-4.6.2-r1.ebuild index d89fb1c754f0..c7880982527b 100644 --- a/kde-base/marble/marble-4.6.2-r1.ebuild +++ b/kde-base/marble/marble-4.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.6.2-r1.ebuild,v 1.4 2011/06/01 19:16:49 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.6.2-r1.ebuild,v 1.5 2011/06/06 20:38:02 abcd Exp $ EAPI=3 @@ -25,7 +25,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kdeprefix? ( !sci-geosciences/marble ) + !sci-geosciences/marble " PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) diff --git a/kde-base/marble/marble-4.6.3.ebuild b/kde-base/marble/marble-4.6.3.ebuild index 87a82c9b2419..ffb409493052 100644 --- a/kde-base/marble/marble-4.6.3.ebuild +++ b/kde-base/marble/marble-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.6.3.ebuild,v 1.1 2011/05/07 10:47:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.6.3.ebuild,v 1.2 2011/06/06 20:38:02 abcd Exp $ EAPI=3 @@ -31,7 +31,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kdeprefix? ( !sci-geosciences/marble ) + !sci-geosciences/marble " PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) |