diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:23:11 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:23:11 +0000 |
| commit | 8f92c00fb1987bbcee222126b0b3def8c5663077 (patch) | |
| tree | 7e932b8e6fb02534df96b9cfddafc8428fd7f416 /kde-base/kdebase-startkde | |
| parent | Remove unneeded patches. (diff) | |
| download | gentoo-2-8f92c00fb1987bbcee222126b0b3def8c5663077.tar.gz gentoo-2-8f92c00fb1987bbcee222126b0b3def8c5663077.tar.bz2 gentoo-2-8f92c00fb1987bbcee222126b0b3def8c5663077.zip | |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/kdebase-startkde')
4 files changed, 7 insertions, 107 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 7d93907aeb0e..c84dde869a13 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.83 2007/02/04 02:01:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.84 2007/02/05 12:23:11 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/kdebase-startkde-3.4.1-gentoo.patch, + -files/kdebase-startkde-3.4.2-gentoo.patch, + -files/kdebase-startkde-3.5.3-xinitrcd.patch: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdebase-startkde-3.5.2.ebuild, -kdebase-startkde-3.5.6.ebuild: diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch deleted file mode 100644 index 08f781212465..000000000000 --- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde ---- kdebase-3.4.0.orig/startkde 2005-03-04 12:20:04.000000000 +0100 -+++ kdebase-3.4.0/startkde 2005-05-26 02:04:35.000000000 +0200 -@@ -14,6 +14,40 @@ - exit 1 - fi - -+# Gentoo part: -+export PATH="/usr/kde/3.4/bin:${PATH}" -+ -+cd ${HOME} -+if [ -L .kde -o ! -d .kde ]; then -+ # handle ~/.kde* dirs - separate ones for separate KDEs -+ rm -f .kde -+ if [ ! -e .kde3.4 ]; then -+ # migrate old config files -+ if [ -e .kde3.3 ]; then -+ cp -r .kde3.3 .kde3.4 -+ elif [ -e .kde3.2 ]; then -+ cp -r .kde3.2 .kde3.4 -+ else -+ mkdir .kde3.4 -+ fi -+ cd .kde3.4 -+ for file in share/apps/kdevdocumentation/search/htdig.conf \ -+ share/apps/kalarmd/clients \ -+ share/config/kresources/calendar/stdrc \ -+ share/config/*rc; do -+ if [ -e "${file}" ]; then -+ sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \ -+ -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \ -+ -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \ -+ "${file}" -+ fi -+ done -+ cd ${HOME} -+ fi -+ ln -sf .kde3.4 .kde -+fi -+# Gentoo part ends -+ - # Set the background to plain grey. - # The standard X background is nasty, causing moire effects and exploding - # people's heads. We use colours from the standard KDE palette for those with diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch deleted file mode 100644 index 08f781212465..000000000000 --- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.2-gentoo.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde ---- kdebase-3.4.0.orig/startkde 2005-03-04 12:20:04.000000000 +0100 -+++ kdebase-3.4.0/startkde 2005-05-26 02:04:35.000000000 +0200 -@@ -14,6 +14,40 @@ - exit 1 - fi - -+# Gentoo part: -+export PATH="/usr/kde/3.4/bin:${PATH}" -+ -+cd ${HOME} -+if [ -L .kde -o ! -d .kde ]; then -+ # handle ~/.kde* dirs - separate ones for separate KDEs -+ rm -f .kde -+ if [ ! -e .kde3.4 ]; then -+ # migrate old config files -+ if [ -e .kde3.3 ]; then -+ cp -r .kde3.3 .kde3.4 -+ elif [ -e .kde3.2 ]; then -+ cp -r .kde3.2 .kde3.4 -+ else -+ mkdir .kde3.4 -+ fi -+ cd .kde3.4 -+ for file in share/apps/kdevdocumentation/search/htdig.conf \ -+ share/apps/kalarmd/clients \ -+ share/config/kresources/calendar/stdrc \ -+ share/config/*rc; do -+ if [ -e "${file}" ]; then -+ sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \ -+ -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \ -+ -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \ -+ "${file}" -+ fi -+ done -+ cd ${HOME} -+ fi -+ ln -sf .kde3.4 .kde -+fi -+# Gentoo part ends -+ - # Set the background to plain grey. - # The standard X background is nasty, causing moire effects and exploding - # people's heads. We use colours from the standard KDE palette for those with diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch deleted file mode 100644 index 88a7e1baf467..000000000000 --- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5.3-xinitrcd.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: kdebase-startkde-3.5.3/startkde -=================================================================== ---- kdebase-startkde-3.5.3.orig/startkde -+++ kdebase-startkde-3.5.3/startkde -@@ -188,6 +188,13 @@ for prefix in `echo "$exepath" | sed -n - done - done - -+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff -+if test -d "/etc/X11/xinit/xinitrc.d/"; then -+ for file in "/etc/X11/xinit/xinitrc.d/"*; do -+ test -x "$file" && . "$file" -+ done -+fi -+ - # Activate the kde font directories. - # - # There are 4 directories that may be used for supplying fonts for KDE. |