diff options
author | Jonathan Callen <abcd@gentoo.org> | 2009-10-23 18:20:24 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2009-10-23 18:20:24 +0000 |
commit | 65f8aebaac654db0d467d8474ab6e1de8afb6e7c (patch) | |
tree | 3f4fbb4ecf966e0321d52e45a95a5e81890f6799 /kde-base | |
parent | USE-default on doc was unpopular, and got even more so with USE=doc now bring... (diff) | |
download | gentoo-2-65f8aebaac654db0d467d8474ab6e1de8afb6e7c.tar.gz gentoo-2-65f8aebaac654db0d467d8474ab6e1de8afb6e7c.tar.bz2 gentoo-2-65f8aebaac654db0d467d8474ab6e1de8afb6e7c.zip |
Drop old revisions, make "make install" die on failure
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdebase/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.9-r1.ebuild | 256 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.9-r2.ebuild | 258 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.9-r3.ebuild | 259 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.9-r4.ebuild | 5 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5.9.ebuild | 260 |
6 files changed, 9 insertions, 1036 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 127550d7e7b6..eeb8067d53f4 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.457 2009/10/13 00:10:09 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.458 2009/10/23 18:20:24 abcd Exp $ + + 23 Oct 2009; Jonathan Callen <abcd@gentoo.org> -kdebase-3.5.9.ebuild, + -kdebase-3.5.9-r1.ebuild, -kdebase-3.5.9-r2.ebuild, + -kdebase-3.5.9-r3.ebuild, kdebase-3.5.9-r4.ebuild: + Drop old revisions, make "make install" die on failure 13 Oct 2009; Jonathan Callen <abcd@gentoo.org> -files/Gentoo_Bugzilla.desktop, -files/Gentoo_Forums.desktop, diff --git a/kde-base/kdebase/kdebase-3.5.9-r1.ebuild b/kde-base/kdebase/kdebase-3.5.9-r1.ebuild deleted file mode 100644 index e71a1edcf0f7..000000000000 --- a/kde-base/kdebase/kdebase-3.5.9-r1.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r1.ebuild,v 1.5 2009/10/12 05:35:20 abcd Exp $ - -EAPI="1" -inherit multilib kde-dist eutils flag-o-matic - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-11.tar.bz2" - -DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl -pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" - -# hal: enables hal backend for 'media:' ioslave - -DEPEND=">=media-libs/freetype-2.3 - media-libs/fontconfig - dev-libs/openssl - pam? ( kde-base/kdebase-pam ) - >=dev-libs/cyrus-sasl-2 - ldap? ( >=net-nds/openldap-2 ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 ) - samba? ( >=net-fs/samba-3.0.4 ) - lm_sensors? ( sys-apps/lm_sensors ) - logitech-mouse? ( =virtual/libusb-0* ) - ieee1394? ( sys-libs/libraw1394 ) - hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) - xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXext - xscreensaver? ( x11-libs/libXScrnSaver ) - xinerama? ( x11-libs/libXinerama )" - -RDEPEND="${DEPEND} - sys-apps/usbutils - sys-devel/gdb - java? ( >=virtual/jre-1.4 ) - kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) - virtual/ssh - www-misc/htdig - x11-apps/mkfontdir - x11-apps/setxkbmap - x11-apps/xinit - x11-misc/xkeyboard-config - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrandr - x11-apps/xsetroot - x11-apps/xset" - -DEPEND="${DEPEND} - xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - xinerama? ( x11-proto/xineramaproto ) - x11-apps/bdftopcf - x11-apps/xhost" - -need-kde 3.5.8 - -EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff - ksmserver-3.5.8-suspend_configure.diff" - -PATCHES=( "${FILESDIR}/kdm-${PV}-respect-cflags.patch" ) - -pkg_setup() { - kde_pkg_setup - if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then - eerror "To enable HAL support in this package is required to have" - eerror "sys-apps/dbus compiled with Qt 3 support." - eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." - die "Please reemerge sys-apps/dbus with USE=\"qt3\"." - fi -} - -src_unpack() { - kde_src_unpack - - # Avoid using imake (kde bug 114466). - #epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" - # ...included in patch set - rm -f "${S}/configure" - - # FIXME - disable broken tests - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed" - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed" - sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed" - - if ! use joystick ; then - sed -e 's:$(JOYSTICK_SUBDIR)::' \ - -e 's:kthememanager \\:kthememanager:' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - if ! use arts ; then - sed -e 's:arts::' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - - if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then - einfo "User ${USER} has no X access, disabling some tests." - for ioslave in media remote home system ; do - sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ - -i kioslave/${ioslave}/Makefile.am || die "sed failed" - done - fi -} - -src_compile() { - # Patch the startkde script to setup the environment for KDE 4.0 - # Add our KDEDIR - sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ - "${S}/startkde" || die "Sed for PREFIX failed." - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # Complete LDPATH - sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ - "${S}/startkde" || die "Sed for LDPATH failed." - - local myconf="--with-dpms --enable-dnssd --with-sssl - --with-usbids=/usr/share/misc/usb.ids - $(use_with ieee1394 libraw1394) - $(use_with hal) - $(use_with ldap) - $(use_with lm_sensors sensors) - $(use_with logitech-mouse libusb) - $(use_with openexr) - $(use_with opengl gl) - $(use_with pam) - $(use_with samba) - $(use_with xcomposite composite) - $(use_with xinerama) - $(use_with xscreensaver)" - - if ! use pam && use elibc_glibc; then - myconf="${myconf} --with-shadow" - fi - - # the java test is problematic (see kde bug 100729) and - # useless. All that's needed for java applets to work is - # to have the 'java' executable in PATH. - myconf="${myconf} --without-java" - - kde_src_compile -} - -src_install() { - kde_src_install - cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install - - # Fix an obscure desktop file that only gets generated during the install phase. - sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - sed -i -e 's:Name=panel_appearance::' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - - # startup and shutdown scripts - insinto "${KDEDIR}/env" - doins "${WORKDIR}/patches/agent-startup.sh" - - exeinto ${KDEDIR}/shutdown - doexe "${WORKDIR}/patches/agent-shutdown.sh" - - # freedesktop environment variables - cat <<EOF > "${T}/xdg.sh" -export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" -EOF - insinto "${KDEDIR}/env" - doins "${T}/xdg.sh" - - # x11 session script - cat <<EOF > "${T}/kde-${SLOT}" -#!/bin/sh -exec ${KDEDIR}/bin/startkde -EOF - exeinto /etc/X11/Sessions - doexe "${T}/kde-${SLOT}" - - # freedesktop compliant session script - sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" - insinto /usr/share/xsessions - doins "${T}/kde-${SLOT}.desktop" - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}/${KDEDIR}/share/config/kdm/kdmrc" || die - - rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" - - if use branding ; then - dodir "${PREFIX}"/share/services/searchproviders - insinto "${PREFIX}"/share/services/searchproviders - doins "${WORKDIR}"/patches/Gentoo_{Bugzilla,Forums}.desktop - fi -} - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir "${PREFIX}/share/applications/kde" - dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop" -} - -pkg_postinst() { - kde_pkg_postinst - - # set the default kdm face icon if it's not already set by the system admin - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" - - echo - elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - elog "edit ${KDEDIR}/env/agent-startup.sh and" - elog "${KDEDIR}/shutdown/agent-shutdown.sh" - echo - if use branding ; then - elog "We've added Gentoo-related web shortcuts to Konqueror:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" -# elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new konqueror windows and get something like" - elog "'WARNING: Outdated database found' when starting konqueror in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo - fi -} diff --git a/kde-base/kdebase/kdebase-3.5.9-r2.ebuild b/kde-base/kdebase/kdebase-3.5.9-r2.ebuild deleted file mode 100644 index 2aee562d334c..000000000000 --- a/kde-base/kdebase/kdebase-3.5.9-r2.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r2.ebuild,v 1.3 2009/05/16 09:02:35 robbat2 Exp $ - -EAPI="1" -inherit multilib kde-dist eutils flag-o-matic - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-11.tar.bz2 - mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2" - -DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl -pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" - -# hal: enables hal backend for 'media:' ioslave - -DEPEND=">=media-libs/freetype-2.3 - media-libs/fontconfig - dev-libs/openssl - pam? ( kde-base/kdebase-pam ) - >=dev-libs/cyrus-sasl-2 - ldap? ( >=net-nds/openldap-2 ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 ) - samba? ( >=net-fs/samba-3.0.4 ) - lm_sensors? ( sys-apps/lm_sensors ) - logitech-mouse? ( =virtual/libusb-0* ) - ieee1394? ( sys-libs/libraw1394 ) - hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) - xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXext - xscreensaver? ( x11-libs/libXScrnSaver ) - xinerama? ( x11-libs/libXinerama )" - -RDEPEND="${DEPEND} - sys-apps/usbutils - sys-devel/gdb - java? ( >=virtual/jre-1.4 ) - kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) - virtual/ssh - www-misc/htdig - x11-apps/mkfontdir - x11-apps/setxkbmap - x11-apps/xinit - x11-misc/xkeyboard-config - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrandr - x11-apps/xsetroot - x11-apps/xset" - -DEPEND="${DEPEND} - xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - xinerama? ( x11-proto/xineramaproto ) - x11-apps/bdftopcf - x11-apps/xhost" - -need-kde 3.5.9 - -EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff - ksmserver-3.5.8-suspend_configure.diff" - -PATCHES=( "${FILESDIR}/kdm-${PV}-respect-cflags.patch" - "${WORKDIR}/${PN}-seli-xinerama.patch" ) - -pkg_setup() { - kde_pkg_setup - if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then - eerror "To enable HAL support in this package is required to have" - eerror "sys-apps/dbus compiled with Qt 3 support." - eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." - die "Please reemerge sys-apps/dbus with USE=\"qt3\"." - fi -} - -src_unpack() { - kde_src_unpack - - # Avoid using imake (kde bug 114466). - #epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" - # ...included in patch set - rm -f "${S}/configure" - - # FIXME - disable broken tests - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed" - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed" - sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed" - - if ! use joystick ; then - sed -e 's:$(JOYSTICK_SUBDIR)::' \ - -e 's:kthememanager \\:kthememanager:' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - if ! use arts ; then - sed -e 's:arts::' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - - if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then - einfo "User ${USER} has no X access, disabling some tests." - for ioslave in media remote home system ; do - sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ - -i kioslave/${ioslave}/Makefile.am || die "sed failed" - done - fi -} - -src_compile() { - # Patch the startkde script to setup the environment for KDE 4.0 - # Add our KDEDIR - sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ - "${S}/startkde" || die "Sed for PREFIX failed." - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # Complete LDPATH - sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ - "${S}/startkde" || die "Sed for LDPATH failed." - - local myconf="--with-dpms --enable-dnssd --with-sssl - --with-usbids=/usr/share/misc/usb.ids - $(use_with ieee1394 libraw1394) - $(use_with hal) - $(use_with ldap) - $(use_with lm_sensors sensors) - $(use_with logitech-mouse libusb) - $(use_with openexr) - $(use_with opengl gl) - $(use_with pam) - $(use_with samba) - $(use_with xcomposite composite) - $(use_with xinerama) - $(use_with xscreensaver)" - - if ! use pam && use elibc_glibc; then - myconf="${myconf} --with-shadow" - fi - - # the java test is problematic (see kde bug 100729) and - # useless. All that's needed for java applets to work is - # to have the 'java' executable in PATH. - myconf="${myconf} --without-java" - - kde_src_compile -} - -src_install() { - kde_src_install - cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install - - # Fix an obscure desktop file that only gets generated during the install phase. - sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - sed -i -e 's:Name=panel_appearance::' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - - # startup and shutdown scripts - insinto "${KDEDIR}/env" - doins "${WORKDIR}/patches/agent-startup.sh" - - exeinto ${KDEDIR}/shutdown - doexe "${WORKDIR}/patches/agent-shutdown.sh" - - # freedesktop environment variables - cat <<EOF > "${T}/xdg.sh" -export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" -EOF - insinto "${KDEDIR}/env" - doins "${T}/xdg.sh" - - # x11 session script - cat <<EOF > "${T}/kde-${SLOT}" -#!/bin/sh -exec ${KDEDIR}/bin/startkde -EOF - exeinto /etc/X11/Sessions - doexe "${T}/kde-${SLOT}" - - # freedesktop compliant session script - sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" - insinto /usr/share/xsessions - doins "${T}/kde-${SLOT}.desktop" - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}/${KDEDIR}/share/config/kdm/kdmrc" || die - - rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" - - if use branding ; then - dodir "${PREFIX}"/share/services/searchproviders - insinto "${PREFIX}"/share/services/searchproviders - doins "${WORKDIR}"/patches/Gentoo_{Bugzilla,Forums}.desktop - fi -} - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir "${PREFIX}/share/applications/kde" - dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop" -} - -pkg_postinst() { - kde_pkg_postinst - - # set the default kdm face icon if it's not already set by the system admin - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" - - echo - elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - elog "edit ${KDEDIR}/env/agent-startup.sh and" - elog "${KDEDIR}/shutdown/agent-shutdown.sh" - echo - if use branding ; then - elog "We've added Gentoo-related web shortcuts to Konqueror:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" -# elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new konqueror windows and get something like" - elog "'WARNING: Outdated database found' when starting konqueror in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo - fi -} diff --git a/kde-base/kdebase/kdebase-3.5.9-r3.ebuild b/kde-base/kdebase/kdebase-3.5.9-r3.ebuild deleted file mode 100644 index 245544005916..000000000000 --- a/kde-base/kdebase/kdebase-3.5.9-r3.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r3.ebuild,v 1.9 2009/05/16 09:02:35 robbat2 Exp $ - -EAPI="1" -inherit multilib kde-dist eutils flag-o-matic - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-11.tar.bz2 - mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2" - -DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." - -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl -pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" - -# hal: enables hal backend for 'media:' ioslave - -DEPEND=">=media-libs/freetype-2.3 - media-libs/fontconfig - dev-libs/openssl - pam? ( kde-base/kdebase-pam ) - >=dev-libs/cyrus-sasl-2 - ldap? ( >=net-nds/openldap-2 ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 ) - samba? ( >=net-fs/samba-3.0.4 ) - lm_sensors? ( sys-apps/lm_sensors ) - logitech-mouse? ( =virtual/libusb-0* ) - ieee1394? ( sys-libs/libraw1394 ) - hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) - xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXext - xscreensaver? ( x11-libs/libXScrnSaver ) - xinerama? ( x11-libs/libXinerama )" - -RDEPEND="${DEPEND} - sys-apps/usbutils - sys-devel/gdb - java? ( >=virtual/jre-1.4 ) - kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) - virtual/ssh - www-misc/htdig - x11-apps/mkfontdir - x11-apps/setxkbmap - x11-apps/xinit - x11-misc/xkeyboard-config - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrandr - x11-apps/xsetroot - x11-apps/xset" - -DEPEND="${DEPEND} - xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - xinerama? ( x11-proto/xineramaproto ) - x11-apps/bdftopcf - x11-apps/xhost" - -need-kde 3.5.9 - -EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff - ksmserver-3.5.8-suspend_configure.diff" - -PATCHES=( "${FILESDIR}/kdm-${PV}-respect-cflags.patch" - "${WORKDIR}/${PN}-seli-xinerama.patch" - "${FILESDIR}/kdialog-${PV}-kdeeject-186028.patch" ) - -pkg_setup() { - kde_pkg_setup - if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then - eerror "To enable HAL support in this package is required to have" - eerror "sys-apps/dbus compiled with Qt 3 support." - eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." - die "Please reemerge sys-apps/dbus with USE=\"qt3\"." - fi -} - -src_unpack() { - kde_src_unpack - - # Avoid using imake (kde bug 114466). - #epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" - # ...included in patch set - rm -f "${S}/configure" - - # FIXME - disable broken tests - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed" - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed" - sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed" - - if ! use joystick ; then - sed -e 's:$(JOYSTICK_SUBDIR)::' \ - -e 's:kthememanager \\:kthememanager:' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - if ! use arts ; then - sed -e 's:arts::' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - - if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then - einfo "User ${USER} has no X access, disabling some tests." - for ioslave in media remote home system ; do - sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ - -i kioslave/${ioslave}/Makefile.am || die "sed failed" - done - fi -} - -src_compile() { - # Patch the startkde script to setup the environment for KDE 4.0 - # Add our KDEDIR - sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ - "${S}/startkde" || die "Sed for PREFIX failed." - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # Complete LDPATH - sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ - "${S}/startkde" || die "Sed for LDPATH failed." - - local myconf="--with-dpms --enable-dnssd --with-sssl - --with-usbids=/usr/share/misc/usb.ids - $(use_with ieee1394 libraw1394) - $(use_with hal) - $(use_with ldap) - $(use_with lm_sensors sensors) - $(use_with logitech-mouse libusb) - $(use_with openexr) - $(use_with opengl gl) - $(use_with pam) - $(use_with samba) - $(use_with xcomposite composite) - $(use_with xinerama) - $(use_with xscreensaver)" - - if ! use pam && use elibc_glibc; then - myconf="${myconf} --with-shadow" - fi - - # the java test is problematic (see kde bug 100729) and - # useless. All that's needed for java applets to work is - # to have the 'java' executable in PATH. - myconf="${myconf} --without-java" - - kde_src_compile -} - -src_install() { - kde_src_install - cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install - - # Fix an obscure desktop file that only gets generated during the install phase. - sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - sed -i -e 's:Name=panel_appearance::' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - - # startup and shutdown scripts - insinto "${KDEDIR}/env" - doins "${WORKDIR}/patches/agent-startup.sh" - - exeinto ${KDEDIR}/shutdown - doexe "${WORKDIR}/patches/agent-shutdown.sh" - - # freedesktop environment variables - cat <<EOF > "${T}/xdg.sh" -export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" -EOF - insinto "${KDEDIR}/env" - doins "${T}/xdg.sh" - - # x11 session script - cat <<EOF > "${T}/kde-${SLOT}" -#!/bin/sh -exec ${KDEDIR}/bin/startkde -EOF - exeinto /etc/X11/Sessions - doexe "${T}/kde-${SLOT}" - - # freedesktop compliant session script - sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" - insinto /usr/share/xsessions - doins "${T}/kde-${SLOT}.desktop" - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}/${KDEDIR}/share/config/kdm/kdmrc" || die - - rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" - - if use branding ; then - dodir "${PREFIX}"/share/services/searchproviders - insinto "${PREFIX}"/share/services/searchproviders - doins "${WORKDIR}"/patches/Gentoo_{Bugzilla,Forums}.desktop - fi -} - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir "${PREFIX}/share/applications/kde" - dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop" -} - -pkg_postinst() { - kde_pkg_postinst - - # set the default kdm face icon if it's not already set by the system admin - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" - - echo - elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - elog "edit ${KDEDIR}/env/agent-startup.sh and" - elog "${KDEDIR}/shutdown/agent-shutdown.sh" - echo - if use branding ; then - elog "We've added Gentoo-related web shortcuts to Konqueror:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" -# elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new konqueror windows and get something like" - elog "'WARNING: Outdated database found' when starting konqueror in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo - fi -} diff --git a/kde-base/kdebase/kdebase-3.5.9-r4.ebuild b/kde-base/kdebase/kdebase-3.5.9-r4.ebuild index 9a88b35e8629..4ebccb3bd300 100644 --- a/kde-base/kdebase/kdebase-3.5.9-r4.ebuild +++ b/kde-base/kdebase/kdebase-3.5.9-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r4.ebuild,v 1.8 2009/05/16 09:02:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r4.ebuild,v 1.9 2009/10/23 18:20:24 abcd Exp $ EAPI="1" inherit multilib kde-dist eutils flag-o-matic @@ -164,7 +164,8 @@ src_compile() { src_install() { kde_src_install - cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install + cd "${S}/kdm" + make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install || die "make install failed" # Fix an obscure desktop file that only gets generated during the install phase. sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" diff --git a/kde-base/kdebase/kdebase-3.5.9.ebuild b/kde-base/kdebase/kdebase-3.5.9.ebuild deleted file mode 100644 index c2992f55af32..000000000000 --- a/kde-base/kdebase/kdebase-3.5.9.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9.ebuild,v 1.6 2009/10/12 05:35:20 abcd Exp $ - -EAPI="1" -inherit multilib kde-dist eutils flag-o-matic - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-10.tar.bz2" - -DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl -pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" - -# hal: enables hal backend for 'media:' ioslave - -DEPEND=">=media-libs/freetype-2.3 - media-libs/fontconfig - dev-libs/openssl - pam? ( kde-base/kdebase-pam ) - >=dev-libs/cyrus-sasl-2 - ldap? ( >=net-nds/openldap-2 ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 ) - samba? ( >=net-fs/samba-3.0.4 ) - lm_sensors? ( sys-apps/lm_sensors ) - logitech-mouse? ( =virtual/libusb-0* ) - ieee1394? ( sys-libs/libraw1394 ) - hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) - xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXext - xscreensaver? ( x11-libs/libXScrnSaver ) - xinerama? ( x11-libs/libXinerama )" - -RDEPEND="${DEPEND} - sys-apps/usbutils - sys-devel/gdb - java? ( >=virtual/jre-1.4 ) - kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) - virtual/ssh - www-misc/htdig - x11-apps/mkfontdir - x11-apps/setxkbmap - x11-apps/xinit - x11-misc/xkeyboard-config - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrandr - x11-apps/xsetroot - x11-apps/xset" - -DEPEND="${DEPEND} - xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - xinerama? ( x11-proto/xineramaproto ) - x11-apps/bdftopcf - x11-apps/xhost" - -need-kde 3.5.8 - -EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff - ksmserver-3.5.8-suspend_configure.diff" - -PATCHES=( "${FILESDIR}/kdm-${PV}-respect-cflags.patch" ) - -pkg_setup() { - kde_pkg_setup - if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then - eerror "To enable HAL support in this package is required to have" - eerror "sys-apps/dbus compiled with Qt 3 support." - eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." - die "Please reemerge sys-apps/dbus with USE=\"qt3\"." - fi -} - -src_unpack() { - kde_src_unpack - - # Avoid using imake (kde bug 114466). - #epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" - # ...included in patch set - rm -f "${S}/configure" - - # FIXME - disable broken tests - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed" - sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed" - sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed" - - if ! use joystick ; then - sed -e 's:$(JOYSTICK_SUBDIR)::' \ - -e 's:kthememanager \\:kthememanager:' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - if ! use arts ; then - sed -e 's:arts::' \ - -i "${S}/kcontrol/Makefile.am" \ - || die "sed failed" - fi - - if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then - einfo "User ${USER} has no X access, disabling some tests." - for ioslave in media remote home system ; do - sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ - -i kioslave/${ioslave}/Makefile.am || die "sed failed" - done - fi -} - -src_compile() { - # Patch the startkde script to setup the environment for KDE 4.0 - # Add our KDEDIR - sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ - "${S}/startkde" || die "Sed for PREFIX failed." - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - # Complete LDPATH - sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ - "${S}/startkde" || die "Sed for LDPATH failed." - - local myconf="--with-dpms --enable-dnssd --with-sssl - --with-usbids=/usr/share/misc/usb.ids - $(use_with ieee1394 libraw1394) - $(use_with hal) - $(use_with ldap) - $(use_with lm_sensors sensors) - $(use_with logitech-mouse libusb) - $(use_with openexr) - $(use_with opengl gl) - $(use_with pam) - $(use_with samba) - $(use_with xcomposite composite) - $(use_with xinerama) - $(use_with xscreensaver)" - - if ! use pam && use elibc_glibc; then - myconf="${myconf} --with-shadow" - fi - - # the java test is problematic (see kde bug 100729) and - # useless. All that's needed for java applets to work is - # to have the 'java' executable in PATH. - myconf="${myconf} --without-java" - - kde_src_compile -} - -src_install() { - kde_src_install - cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install - - # startup and shutdown scripts - insinto "${KDEDIR}/env" - doins "${WORKDIR}/patches/agent-startup.sh" - - exeinto ${KDEDIR}/shutdown - doexe "${WORKDIR}/patches/agent-shutdown.sh" - - # freedesktop environment variables - cat <<EOF > "${T}/xdg.sh" -export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" -EOF - insinto "${KDEDIR}/env" - doins "${T}/xdg.sh" - - # x11 session script - cat <<EOF > "${T}/kde-${SLOT}" -#!/bin/sh -exec ${KDEDIR}/bin/startkde -EOF - exeinto /etc/X11/Sessions - doexe "${T}/kde-${SLOT}" - - # freedesktop compliant session script - sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" - insinto /usr/share/xsessions - doins "${T}/kde-${SLOT}.desktop" - - # Customize the kdmrc configuration - sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ - "${D}/${KDEDIR}/share/config/kdm/kdmrc" || die - - rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" - - if use branding ; then - dodir "${PREFIX}"/share/services/searchproviders - insinto "${PREFIX}"/share/services/searchproviders - doins "${WORKDIR}"/patches/Gentoo_{Bugzilla,Forums}.desktop - fi -} - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir "${PREFIX}/share/applications/kde" - dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop" -} - -src_install() { - kde_src_install - - # Fix an obscure desktop file that only gets generated during the install phase. - sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" - sed -i -e 's:Name=panel_appearance::' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop" -} - -pkg_postinst() { - kde_pkg_postinst - - # set the default kdm face icon if it's not already set by the system admin - if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" - fi - if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then - mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" - cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ - "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" - fi - - mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" - - echo - elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - elog "edit ${KDEDIR}/env/agent-startup.sh and" - elog "${KDEDIR}/shutdown/agent-shutdown.sh" - echo - if use branding ; then - elog "We've added Gentoo-related web shortcuts to Konqueror:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" -# elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new konqueror windows and get something like" - elog "'WARNING: Outdated database found' when starting konqueror in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo - fi -} |