diff options
author | Bart Verwilst <verwilst@gentoo.org> | 2002-05-15 13:15:35 +0000 |
---|---|---|
committer | Bart Verwilst <verwilst@gentoo.org> | 2002-05-15 13:15:35 +0000 |
commit | d2ec0cf056a1de33b72aec4975c8a29aae2ec813 (patch) | |
tree | 5ff497f8bcdf5b093eff23604c973d1552b311e4 /kde-base | |
parent | kde edits (diff) | |
download | gentoo-2-d2ec0cf056a1de33b72aec4975c8a29aae2ec813.tar.gz gentoo-2-d2ec0cf056a1de33b72aec4975c8a29aae2ec813.tar.bz2 gentoo-2-d2ec0cf056a1de33b72aec4975c8a29aae2ec813.zip |
added 3.0.1, + cleanups + startkde diff
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdebase/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-2.2.2-r2 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.0 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.0-r1 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.0-r2 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.0.1 | 2 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-2.2.2 | 125 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.0-gentoo.diff | 23 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.0-r1-gentoo.diff | 25 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.0-r2-gentoo.diff | 25 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.0.1-gentoo.diff | 42 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-2.2.2-r2.ebuild | 92 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.0-r1.ebuild | 93 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.0-r2.ebuild | 100 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.0.ebuild | 87 |
15 files changed, 50 insertions, 576 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index fd3965c5ed2b..0ef384e2e459 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.12 2002/05/05 12:01:52 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.13 2002/05/15 13:15:35 verwilst Exp $ + +*kdebase-3.0.1 (14 May 2002) + + 14 May 2002; Bart Verwilst <verwilst@gentoo.org> Changelog : + + Added kdebase 3.0.1, cleaned up the other versions/revisions, added 3.0.1 startkde diff. 5 May 2002; Dan Armak <danarmak@gentoo.org> changelog: diff --git a/kde-base/kdebase/files/digest-kdebase-2.2.2-r2 b/kde-base/kdebase/files/digest-kdebase-2.2.2-r2 deleted file mode 100644 index 641154c13377..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-2.2.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 39635e42056ab2afb8e6f2ff761eea38 kdebase-2.2.2.tar.bz2 12888455 diff --git a/kde-base/kdebase/files/digest-kdebase-3.0 b/kde-base/kdebase/files/digest-kdebase-3.0 deleted file mode 100644 index 04b04780a78d..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 fc8092f16a6e26eeb01c161e60eaf3f2 kdebase-3.0.tar.bz2 13135392 diff --git a/kde-base/kdebase/files/digest-kdebase-3.0-r1 b/kde-base/kdebase/files/digest-kdebase-3.0-r1 deleted file mode 100644 index 04b04780a78d..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 fc8092f16a6e26eeb01c161e60eaf3f2 kdebase-3.0.tar.bz2 13135392 diff --git a/kde-base/kdebase/files/digest-kdebase-3.0-r2 b/kde-base/kdebase/files/digest-kdebase-3.0-r2 deleted file mode 100644 index 04b04780a78d..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-3.0-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 fc8092f16a6e26eeb01c161e60eaf3f2 kdebase-3.0.tar.bz2 13135392 diff --git a/kde-base/kdebase/files/digest-kdebase-3.0.1 b/kde-base/kdebase/files/digest-kdebase-3.0.1 index 56c14ce7973a..fdce61f51388 100644 --- a/kde-base/kdebase/files/digest-kdebase-3.0.1 +++ b/kde-base/kdebase/files/digest-kdebase-3.0.1 @@ -1 +1 @@ -MD5 8d0313ca6180136871c23673b8542e02 kdebase-3.0.1.tar.bz2 13086726 +MD5 30399832405fa2286f8fb4fd57148b5c kdebase-3.0.1.tar.bz2 13087668 diff --git a/kde-base/kdebase/files/startkde-2.2.2 b/kde-base/kdebase/files/startkde-2.2.2 deleted file mode 100644 index a16950775c2c..000000000000 --- a/kde-base/kdebase/files/startkde-2.2.2 +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash --login -export KDEDIR="_KDEDIR_" -export PATH="_KDEDIR_/bin:${PATH}" -rm -rf ~/.kde -ln -fs ~/.kde2 ~/.kde -[ -e "~/.kde2" ] || mkdir ~/.kde2 -#################################################### -# DEFAULT GENTOO KDE STARTUP SCRIPT ( KDE-2.2.2 ) ## -#################################################### - -################################# -#Initial cleanup of old sessions# -################################# -real_display=`echo $DISPLAY | sed "s/://" | sed "s/\..*//"` -rm -f ~/.DCOPserver-`/bin/hostname`_$DISPLAY - -##################################### -#Check for space on /tmp and "$HOME"# -#If not, abort startup # -##################################### -space_tmp=`df /tmp | xargs | cut -d" " -f11` -space_home=`df "$HOME" | xargs | cut -d" " -f11` - -if [ $space_tmp -lt 50 ]; then - echo $"Not enough free disk space on /tmp" - exit 1 -fi - -if [ $space_home -lt 25 ]; then - echo $"Not enough free disk space on "$HOME"" - exit 1 -fi - -############################################ -#Check for write access on /tmp and "$HOME"# -#If not, abort startup # -############################################ -testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX` -testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX` - -if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then - echo $"You don't have write permissions for /tmp" - exit 1 -fi -rm -f $testfile_tmp - -if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then - echo $"You don't have write permissions for "$HOME"" - exit 1 -fi -rm -f $testfile_home - -########################## -#Set Background and stuff# -########################## -xsetroot -cursor_name left_ptr -solid '#5477A0' - -##################### -#Set the KDE Home...# -#################### -kdehome=$HOME/.kde -test -n "$KDEHOME" && kdehome=$KDEHOME - -########################### -#Activate Font Directories# -########################### -usr_odir=$kdehome/share/fonts/override -usr_fdir=$kdehome/share/fonts -if test -n "$KDEDIRS"; then - kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts -else - sys_odir=$KDEDIR/share/fonts/override - sys_fdir=$KDEDIR/share/fonts -fi - -######################################################## -#Check for newly installed fonts, if we have permission# -######################################################## - -test -d $usr_odir && (mkfontdir $usr_odir ; xset +fp $usr_odir) -test -d $sys_odir && xset +fp $sys_odir -test -d $usr_fdir && (mkfontdir $usr_fdir ; xset fp+ $usr_fdir) -test -d $sys_fdir && xset fp+ $sys_fdir - -#################################### -# Ask X11 to rebuild its font list.# -#################################### -xset fp rehash - -################################################################## -#Link "tmp" resource to directory in /tmp # -#Create a dir /tmp/kde-$USER, links $KDEHOME/tmp-$HOSTNAME to it.# -################################################################## -lnusertemp tmp >/dev/null - -######################################################################## -#Link "socket" resource to directory in /tmp # -#Create a dir /tmp/ksocket-$USER, links $KDEHOME/socket-$HOSTNAME to it# -######################################################################## -lnusertemp socket >/dev/null - -######################## -#Start the splashscreen# -######################## -ksplash - -########################################################### -#Set LD_BIND_NOW to increase the efficiency of kdeinit. # -#kdeinit unsets this variable before loading applications.# -########################################################### -# turn it off, it creates aa trouble -#LD_BIND_NOW=true kdeinit +kcminit +knotify -kdeinit +kcminit +knotify - -########################################################### -# finally, give the session control to the session manager# -########################################################### -ksmserver --restore - -########## -#Clean up# -########## -kdeinit_shutdown diff --git a/kde-base/kdebase/files/startkde-3.0-gentoo.diff b/kde-base/kdebase/files/startkde-3.0-gentoo.diff deleted file mode 100644 index 5a95e70e7396..000000000000 --- a/kde-base/kdebase/files/startkde-3.0-gentoo.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- startkde Sun Mar 17 13:07:07 2002 -+++ startkde Mon Mar 18 10:46:34 2002 -@@ -1,8 +1,18 @@ --#!/bin/sh -+#!/bin/sh --login - # --# DEFAULT KDE STARTUP SCRIPT ( KDE-3.0 ) -+# Gentoo KDE STARTUP SCRIPT ( KDE-3.0 ) - # - -+# Gentoo part: -+export PATH="_KDEDIR_/bin:${PATH}" -+export KDEDIR="_KDEDIR_" -+rm -rf ~/.kde -+ln -fs ~/.kde3 ~/.kde -+[ -e "~/.kde3" ] || mkdir ~/.kde3 -+ -+ -+# Original KDE part: -+ - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage diff --git a/kde-base/kdebase/files/startkde-3.0-r1-gentoo.diff b/kde-base/kdebase/files/startkde-3.0-r1-gentoo.diff deleted file mode 100644 index 1b3a5bc2277f..000000000000 --- a/kde-base/kdebase/files/startkde-3.0-r1-gentoo.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- startkde Sun Mar 17 13:07:07 2002 -+++ startkde Mon Mar 18 10:46:34 2002 -@@ -1,8 +1,20 @@ --#!/bin/sh -+#!/bin/sh --login - # --# DEFAULT KDE STARTUP SCRIPT ( KDE-3.0 ) -+# Gentoo KDE STARTUP SCRIPT ( KDE-3.0 ) - # - -+# Gentoo part: -+export PATH="_KDEDIR_/bin:${PATH}" -+export KDEDIR="_KDEDIR_" -+export KDEDIRS="_KDEDIR_:${KDEDIRS}" -+export KDEMAINDIR="_KDEDIR_" -+rm -rf ~/.kde -+ln -fs ~/.kde3 ~/.kde -+[ -e "~/.kde3" ] || mkdir ~/.kde3 -+ -+ -+# Original KDE part: -+ - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage diff --git a/kde-base/kdebase/files/startkde-3.0-r2-gentoo.diff b/kde-base/kdebase/files/startkde-3.0-r2-gentoo.diff deleted file mode 100644 index 1b3a5bc2277f..000000000000 --- a/kde-base/kdebase/files/startkde-3.0-r2-gentoo.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- startkde Sun Mar 17 13:07:07 2002 -+++ startkde Mon Mar 18 10:46:34 2002 -@@ -1,8 +1,20 @@ --#!/bin/sh -+#!/bin/sh --login - # --# DEFAULT KDE STARTUP SCRIPT ( KDE-3.0 ) -+# Gentoo KDE STARTUP SCRIPT ( KDE-3.0 ) - # - -+# Gentoo part: -+export PATH="_KDEDIR_/bin:${PATH}" -+export KDEDIR="_KDEDIR_" -+export KDEDIRS="_KDEDIR_:${KDEDIRS}" -+export KDEMAINDIR="_KDEDIR_" -+rm -rf ~/.kde -+ln -fs ~/.kde3 ~/.kde -+[ -e "~/.kde3" ] || mkdir ~/.kde3 -+ -+ -+# Original KDE part: -+ - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage diff --git a/kde-base/kdebase/files/startkde-3.0.1-gentoo.diff b/kde-base/kdebase/files/startkde-3.0.1-gentoo.diff new file mode 100644 index 000000000000..4f6fdd012fab --- /dev/null +++ b/kde-base/kdebase/files/startkde-3.0.1-gentoo.diff @@ -0,0 +1,42 @@ +--- startkde.orig Wed May 15 15:01:19 2002 ++++ startkde Wed May 15 15:07:02 2002 +@@ -1,8 +1,20 @@ +-#!/bin/sh ++#!/bin/sh --login + # +-# DEFAULT KDE STARTUP SCRIPT ( KDE-3.0.1 ) ++# Gentoo KDE Startup Script ( KDE-3.0.1 ) + # + ++# Gentoo part: ++export PATH="/usr/kde/3/bin:${PATH}" ++export KDEDIR="/usr/kde/3" ++export KDEDIRS="/usr/kde/3:${KDEDIRS}" ++export KDEMAINDIR="/usr/kde/3" ++rm -rf ~/.kde ++ln -fs ~/.kde3 ~/.kde ++[ -e "~/.kde3" ] || mkdir ~/.kde3 ++ ++ ++# Original KDE part: ++ + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -30,14 +42,14 @@ + # people's heads. We use colours from the standard KDE palette for those with + # palettised displays. + +-test "$XDM_MANAGED" || bkg="-solid #C0C0C0" ++test "$XDM_MANAGED" || bkg="-solid #5477A0" + xsetroot -cursor_name left_ptr $bkg + + # The user's personal KDE directory is usually ~/.kde, but this setting + # may be overridden by setting KDEHOME. + + kdehome=$HOME/.kde +-test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^\~/,$HOME/,"` ++test -n "$KDEHOME" && eval kdehome=$KDEHOME + + # Activate the kde font directories. + # diff --git a/kde-base/kdebase/kdebase-2.2.2-r2.ebuild b/kde-base/kdebase/kdebase-2.2.2-r2.ebuild deleted file mode 100644 index 60fce4915539..000000000000 --- a/kde-base/kdebase/kdebase-2.2.2-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.2-r2.ebuild,v 1.5 2002/04/12 13:31:28 seemant Exp $ -. /usr/portage/eclass/inherit.eclass || die -inherit kde-dist - -DESCRIPTION="${DESCRIPTION}Base" - -newdepend ">=media-sound/cdparanoia-3.9.8 - ldap? ( >=net-nds/openldap-1.2 ) - pam? ( >=sys-libs/pam-0.73 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - lame? ( >=media-sound/lame-3.89b ) - oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 ) - cups? ( net-print/cups ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - media-libs/lcms" -# opengl? ( virtual/opengl )" #this last for opengl screensavers -# samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult -# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet - -src_unpack() { - - base_src_unpack - - kde_sandbox_patch ${S}/konsole/src - -} - -src_compile() { - - kde_src_compile myconf - - use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap" - use pam && myconf="$myconf --with-pam" || myconf="$myconf --with-shadow" - use motif || myconf="$myconf --without-motif" - use lame || myconf="$myconf --without-lame" - use cups || myconf="$myconf --disable-cups" - use oggvorbis || myconf="$myconf --without-vorbis" - #use opengl || - myconf="$myconf --without-gl" - use ssl || myconf="$myconf --without-ssl" - - kde_src_compile configure make - -} - - -src_install() { - - kde_src_install - - insinto /etc/pam.d - newins ${FILESDIR}/kscreensaver.pam kscreensaver - newins kde.pamd kde - - cd ${D}/${KDEDIR}/bin - rm -f ./startkde - sed -e "s:_KDEDIR_:${KDEDIR}:" ${FILESDIR}/startkde-${PV} > startkde - chmod a+x startkde - - # x11 session script - cd ${T} - echo "#!/bin/sh -${KDEDIR}/bin/startkde" > kde-${PV} - chmod a+x kde-${PV} - # old scheme - compatibility - exeinto /usr/X11R6/bin/wm - doexe kde-${PV} - # new scheme - for now >=xfree-4.2-r3 only - exeinto /etc/X11/Sessions - doexe kde-${PV} - - cd ${D}/${KDEDIR}/share/config/kdm - mv kdmrc kdmrc.orig - sed -e 's/SessionTypes=/SessionTypes=kde-2.2.2,kde-3.0,xsession,/' kdmrc.orig | cat > kdmrc - rm kdmrc.orig - - rm -rf ${D}/${KDEDIR}/share/templates/.source/emptydir - -} - -pkg_postinst() { - - # an empty dir that would otherwise be unmerged with the previous instance - # dodir ${KDEDIR}/share/templates/.source/emptydir - # temorary fix (bug #846) until portage tracks merged dirs' mtimes - addwrite ${KDEDIR}/share/templates/.source - mkdir -p ${KDEDIR}/share/templates/.source/emptydir - -} diff --git a/kde-base/kdebase/kdebase-3.0-r1.ebuild b/kde-base/kdebase/kdebase-3.0-r1.ebuild deleted file mode 100644 index a0d51ea3e30b..000000000000 --- a/kde-base/kdebase/kdebase-3.0-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0-r1.ebuild,v 1.5 2002/04/15 23:31:57 seemant Exp $ -. /usr/portage/eclass/inherit.eclass || die -inherit kde-dist - -DESCRIPTION="${DESCRIPTION}Base" - -newdepend ">=media-sound/cdparanoia-3.9.8 - ldap? ( >=net-nds/openldap-1.2 ) - pam? ( >=sys-libs/pam-0.73 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - encode? ( >=media-sound/lame-3.89b ) - oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 ) - cups? ( net-print/cups ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - media-sound/cdparanoia - opengl? ( virtual/opengl )" #this last for opengl screensavers -# samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult -# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet - -src_unpack() { - - base_src_unpack - kde_sandbox_patch ${S}/konsole ${S}/konsole/konsole - -} - -src_compile() { - - kde_src_compile myconf - - use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap" - use pam && myconf="$myconf --with-pam" || myconf="$myconf --with-shadow" - use motif && myconf="$myconf --with-motif" || myconf="$myconf --without-motif" - use encode && myconf="$myconf --with-lame" || myconf="$myconf --without-lame" - use cups && myconf="$myconf --with-cups" || myconf="$myconf --disable-cups" - use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis" - use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl" - use ssl && myconf="$myconf --with-ssl" || myconf="$myconf --without-ssl" - use pam && myconf="$myconf --with-pam=yes" || myconf="$myconf --with-pam=no --with-shadow" - - myconf="$myconf --with-dpms --with-cdparanoia" - - kde_src_compile configure make - -} - - -src_install() { - - kde_src_install - - insinto /etc/pam.d - newins ${FILESDIR}/kscreensaver.pam kscreensaver - newins kde.pamd kde - - # startkde script - cd ${D}/${KDEDIR}/bin - patch -p0 < ${FILESDIR}/startkde-${PVR}-gentoo.diff || die - mv startkde startkde.orig - sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde - rm startkde.orig - chmod a+x startkde - - # x11 session script - cd ${T} - echo "#!/bin/sh -${KDEDIR}/bin/startkde" > kde-${PV} - chmod a+x kde-${PV} - # old scheme - compatibility - exeinto /usr/X11R6/bin/wm - doexe kde-${PV} - # new scheme - for now >=xfree-4.2-r3 only - exeinto /etc/X11/Sessions - doexe kde-${PV} - - dodir ${KDEDIR}/share/templates/.source/emptydir - - cd ${D}/${KDEDIR}/share/config/kdm || die - mv kdmrc kdmrc.orig - sed -e 's:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:' kdmrc.orig > kdmrc - rm kdmrc.orig - - mkdir -p ${D}/usr/share/pixmaps - mv ${D}/usr/kde/3/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/ - rm -rf ${D}/usr/kde/3/share/apps/kdesktop/pics/ - cd ${D}/usr/kde/3/share/apps/kdesktop/ - ln -sf /usr/share/pixmaps/ pics - -} - diff --git a/kde-base/kdebase/kdebase-3.0-r2.ebuild b/kde-base/kdebase/kdebase-3.0-r2.ebuild deleted file mode 100644 index 3c312e8c0666..000000000000 --- a/kde-base/kdebase/kdebase-3.0-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0-r2.ebuild,v 1.1 2002/04/30 11:46:59 danarmak Exp $ -. /usr/portage/eclass/inherit.eclass || die -inherit kde-dist - -DESCRIPTION="${DESCRIPTION}Base" - -newdepend ">=media-sound/cdparanoia-3.9.8 - ldap? ( >=net-nds/openldap-1.2 ) - pam? ( >=sys-libs/pam-0.73 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - encode? ( >=media-sound/lame-3.89b ) - oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 ) - cups? ( net-print/cups ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - media-sound/cdparanoia - opengl? ( virtual/opengl )" #this last for opengl screensavers -# samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult -# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet - -src_unpack() { - - base_src_unpack - kde_sandbox_patch ${S}/konsole ${S}/konsole/konsole - - cd ${S}/konsole - for x in Makefile.am Makefile.in; do - mv $x $x.orig - sed -e 's:tipdir = $(DESTDIR)/$(kde_datadir):tipdir = $(kde_datadir):g' \ - -e 's:updatedir = $(DESTDIR)/$(kde_datadir):updatedir = $(kde_datadir):g' $x.orig > $x - done - -} - -src_compile() { - - kde_src_compile myconf - - use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap" - use pam && myconf="$myconf --with-pam" || myconf="$myconf --with-shadow" - use motif && myconf="$myconf --with-motif" || myconf="$myconf --without-motif" - use encode && myconf="$myconf --with-lame" || myconf="$myconf --without-lame" - use cups && myconf="$myconf --with-cups" || myconf="$myconf --disable-cups" - use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis" - use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl" - use ssl && myconf="$myconf --with-ssl" || myconf="$myconf --without-ssl" - use pam && myconf="$myconf --with-pam=yes" || myconf="$myconf --with-pam=no --with-shadow" - - myconf="$myconf --with-dpms --with-cdparanoia" - - kde_src_compile configure make - -} - - -src_install() { - - kde_src_install - - insinto /etc/pam.d - newins ${FILESDIR}/kscreensaver.pam kscreensaver - newins kde.pamd kde - - # startkde script - cd ${D}/${KDEDIR}/bin - patch -p0 < ${FILESDIR}/startkde-${PVR}-gentoo.diff || die - mv startkde startkde.orig - sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde - rm startkde.orig - chmod a+x startkde - - # x11 session script - cd ${T} - echo "#!/bin/sh -${KDEDIR}/bin/startkde" > kde-${PV} - chmod a+x kde-${PV} - # old scheme - compatibility - exeinto /usr/X11R6/bin/wm - doexe kde-${PV} - # new scheme - for now >=xfree-4.2-r3 only - exeinto /etc/X11/Sessions - doexe kde-${PV} - - dodir ${KDEDIR}/share/templates/.source/emptydir - - cd ${D}/${KDEDIR}/share/config/kdm || die - mv kdmrc kdmrc.orig - sed -e 's:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:' kdmrc.orig > kdmrc - rm kdmrc.orig - - mkdir -p ${D}/usr/share/pixmaps - mv ${D}/usr/kde/3/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/ - rm -rf ${D}/usr/kde/3/share/apps/kdesktop/pics/ - cd ${D}/usr/kde/3/share/apps/kdesktop/ - ln -sf /usr/share/pixmaps/ pics - -} - diff --git a/kde-base/kdebase/kdebase-3.0.ebuild b/kde-base/kdebase/kdebase-3.0.ebuild deleted file mode 100644 index 6d2f7d0c4cae..000000000000 --- a/kde-base/kdebase/kdebase-3.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Authors Dan Armak <danarmak@gentoo.org>, Bart Verwilst <verwilst@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.ebuild,v 1.4 2002/04/12 13:31:28 seemant Exp $ -. /usr/portage/eclass/inherit.eclass || die -inherit kde-dist - -DESCRIPTION="${DESCRIPTION}Base" - -newdepend ">=media-sound/cdparanoia-3.9.8 - ldap? ( >=net-nds/openldap-1.2 ) - pam? ( >=sys-libs/pam-0.73 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - lame? ( >=media-sound/lame-3.89b ) - oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 ) - cups? ( net-print/cups ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - media-sound/cdparanoia - opengl? ( virtual/opengl )" #this last for opengl screensavers -# samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult -# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet - -src_unpack() { - - base_src_unpack - kde_sandbox_patch ${S}/konsole ${S}/konsole/konsole - -} - -src_compile() { - - kde_src_compile myconf - - use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap" - use pam && myconf="$myconf --with-pam" || myconf="$myconf --with-shadow" - use motif && myconf="$myconf --with-motif" || myconf="$myconf --without-motif" - use lame && myconf="$myconf --with-lame" || myconf="$myconf --without-lame" - use cups && myconf="$myconf --with-cups" || myconf="$myconf --disable-cups" - use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis" - use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl" - use ssl && myconf="$myconf --with-ssl" || myconf="$myconf --without-ssl" - use pam && myconf="$myconf --with-pam=yes" || myconf="$myconf --with-pam=no --with-shadow" - - myconf="$myconf --with-dpms --with-cdparanoia" - - kde_src_compile configure make - -} - - -src_install() { - - kde_src_install - - insinto /etc/pam.d - newins ${FILESDIR}/kscreensaver.pam kscreensaver - newins kde.pamd kde - - # startkde script - cd ${D}/${KDEDIR}/bin - patch -p0 < ${FILESDIR}/startkde-3.0-gentoo.diff - mv startkde startkde.orig - sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde - rm startkde.orig - chmod a+x startkde - - # x11 session script - cd ${T} - echo "#!/bin/sh -${KDEDIR}/bin/startkde" > kde-${PV} - chmod a+x kde-${PV} - # old scheme - compatibility - exeinto /usr/X11R6/bin/wm - doexe kde-${PV} - # new scheme - for now >=xfree-4.2-r3 only - exeinto /etc/X11/Sessions - doexe kde-${PV} - - dodir ${KDEDIR}/share/templates/.source/emptydir - - cd ${D}/${KDEDIR}/share/config/kdm || die - mv kdmrc kdmrc.orig - sed -e 's:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:' kdmrc.orig > kdmrc - rm kdmrc.orig - -} - |