From c05fb9b5ef2579cb5750febff75009f07f7951a1 Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Mon, 30 Apr 2007 20:00:28 +0000 Subject: [PATCH] Remove virtual/x11 dependency, use new patch set. Package-Manager: portage-2.1.2.5 --- kde-base/kdebase-startkde/ChangeLog | 8 +- .../files/digest-kdebase-startkde-3.5.6-r2 | 6 ++ .../kdebase-startkde-3.5.6-r2.ebuild | 79 +++++++++++++++++++ kde-base/kdesktop/ChangeLog | 7 +- .../kdesktop/files/digest-kdesktop-3.5.6-r2 | 6 ++ kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild | 61 ++++++++++++++ kde-base/kdm/Manifest | 26 +++--- 7 files changed, 177 insertions(+), 16 deletions(-) create mode 100644 kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.6-r2 create mode 100644 kde-base/kdebase-startkde/kdebase-startkde-3.5.6-r2.ebuild create mode 100644 kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2 create mode 100644 kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index c84dde869a13..88b84ab6ddfe 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.84 2007/02/05 12:23:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.85 2007/04/30 19:58:15 carlo Exp $ + +*kdebase-startkde-3.5.6-r2 (30 Apr 2007) + + 30 Apr 2007; Carsten Lohrke + +kdebase-startkde-3.5.6-r2.ebuild: + Remove virtual/x11 dependency, use new patch set. 05 Feb 2007; Diego Pettenò -files/kdebase-startkde-3.4.1-gentoo.patch, diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.6-r2 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.6-r2 new file mode 100644 index 000000000000..1d41d209c152 --- /dev/null +++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.6-r2 @@ -0,0 +1,6 @@ +MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502 +RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502 +SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502 +MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599 +RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599 +SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599 diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.6-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.6-r2.ebuild new file mode 100644 index 000000000000..b4ab68e4b61b --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.6-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.6-r2.ebuild,v 1.1 2007/04/30 19:58:15 carlo Exp $ + +KMNAME=kdebase +KMNOMODULE=true +KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde" +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2" + +DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +# The kde apps called from the startkde script. +# kdesktop, kicker etc are started because they put files in $KDEDIR/share/autostart +# and so in theory they aren't strictly necessary deps. +RDEPEND="x11-apps/xmessage + x11-apps/xsetroot + x11-apps/xset + x11-apps/xrandr + x11-apps/mkfontdir + x11-apps/xprop +$(deprange $PV $MAXKDEVER kde-base/kdesktop) +$(deprange $PV $MAXKDEVER kde-base/kcminit) +$(deprange $PV $MAXKDEVER kde-base/ksmserver) +$(deprange $PV $MAXKDEVER kde-base/kwin) +$(deprange $PV $MAXKDEVER kde-base/kpersonalizer) +$(deprange $PV $MAXKDEVER kde-base/kreadconfig) +$(deprange $PV $MAXKDEVER kde-base/ksplashml)" + + +src_compile() { :; } + +src_install() { + # startkde script + exeinto "${KDEDIR}/bin" + doexe startkde + + # 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 < "${T}/xdg.sh" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto "${KDEDIR}/env" + doins "${T}/xdg.sh" + + # x11 session script + cat < "${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" +} + +pkg_postinst () { + 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 +} diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog index 33bcdb29b93a..beff410ef528 100644 --- a/kde-base/kdesktop/ChangeLog +++ b/kde-base/kdesktop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdesktop # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.89 2007/04/21 20:50:02 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.90 2007/04/30 20:00:28 carlo Exp $ + +*kdesktop-3.5.6-r2 (30 Apr 2007) + + 30 Apr 2007; Carsten Lohrke +kdesktop-3.5.6-r2.ebuild: + Remove virtual/x11 dependency, use new patch set. 21 Apr 2007; Raúl Porcel kdesktop-3.5.5-r1.ebuild: ia64 stable diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2 b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2 new file mode 100644 index 000000000000..1d41d209c152 --- /dev/null +++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2 @@ -0,0 +1,6 @@ +MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502 +RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502 +SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502 +MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599 +RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599 +SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599 diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild new file mode 100644 index 000000000000..1f9141da7e37 --- /dev/null +++ b/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild,v 1.1 2007/04/30 20:00:28 carlo Exp $ + +KMNAME=kdebase +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2" + +DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system." +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="kdehiddenvisibility xscreensaver" + +DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq) + $(deprange $PV $MAXKDEVER kde-base/kcontrol) + xscreensaver? ( x11-proto/scrnsaverproto )" + # Requires the desktop background settings module, + # so until we separate the kcontrol modules into separate ebuilds :-), + # there's a dep here +RDEPEND="${DEPEND} + $(deprange $PV $MAXKDEVER kde-base/kcheckpass) + $(deprange 3.5.5 $MAXKDEVER kde-base/kdialog) + $(deprange $PV $MAXKDEVER kde-base/konqueror) + xscreensaver? ( x11-libs/libXScrnSaver )" + +KMCOPYLIB="libkonq libkonq/" +KMEXTRACTONLY="kcheckpass/kcheckpass.h + libkonq/ + kdm/kfrontend/themer/ + kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test +KMCOMPILEONLY="kcontrol/background + kdmlib/" +KMNODOCS=true + +PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch" + +src_unpack() { + kde-meta_src_unpack + # see bug #143375 + sed -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \ + -i kdesktop/Makefile.am +} +src_compile() { + myconf="${myconf} $(use_with xscreensaver)" + kde-meta_src_compile +} + +src_install() { + # ugly, needs fixing: don't install kcontrol/background + kde-meta_src_install + + rmdir "${D}/${PREFIX}/share/templates/.source/emptydir" +} + +pkg_postinst() { + kde_pkg_postinst + mkdir -p "${PREFIX}/share/templates/.source/emptydir" +} diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest index 9b60488cfbd8..209d161d943e 100644 --- a/kde-base/kdm/Manifest +++ b/kde-base/kdm/Manifest @@ -1,25 +1,27 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kdm-3.5.5-grub-patch.diff 941 RMD160 cec8ba370bc44c47c17ed3d12ffb42bcf5238344 SHA1 01b804deaffe0de66fe4c6843a21d1d0a87a4a2d SHA256 b8fdfe7df2bbc1854ce40f576e8310a95ef312c2749504caf7343c1c921d734b MD5 f8645dc5d0044476a01c9c6a95c4853f files/kdm-3.5.5-grub-patch.diff 941 RMD160 cec8ba370bc44c47c17ed3d12ffb42bcf5238344 files/kdm-3.5.5-grub-patch.diff 941 SHA256 b8fdfe7df2bbc1854ce40f576e8310a95ef312c2749504caf7343c1c921d734b files/kdm-3.5.5-grub-patch.diff 941 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 +DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e EBUILD kdm-3.5.5-r1.ebuild 2549 RMD160 4e9c4f4c75f99f5b5bf53a9f2b55efe4923f960d SHA1 07d451fcc395a914f99d8278a2f5842ef8d9b8c4 SHA256 4a98c728c72bc70c22d6e283c43b0629e0e6409a460b659ac1089405f844a956 MD5 a869809f2b0f88464990718b9db4cacc kdm-3.5.5-r1.ebuild 2549 RMD160 4e9c4f4c75f99f5b5bf53a9f2b55efe4923f960d kdm-3.5.5-r1.ebuild 2549 SHA256 4a98c728c72bc70c22d6e283c43b0629e0e6409a460b659ac1089405f844a956 kdm-3.5.5-r1.ebuild 2549 +EBUILD kdm-3.5.6-r1.ebuild 2363 RMD160 1dad91d03c8ee58dd81c70a88ed78d430a823371 SHA1 accec379a91418f8a74df5c4e88e0c3f604a0712 SHA256 142c41e99b57dff18af0c94e684076fa382bbd02702e7225c07c1843fb676a6a +MD5 47d696bf2887c0d872afe753ca01bb2e kdm-3.5.6-r1.ebuild 2363 +RMD160 1dad91d03c8ee58dd81c70a88ed78d430a823371 kdm-3.5.6-r1.ebuild 2363 +SHA256 142c41e99b57dff18af0c94e684076fa382bbd02702e7225c07c1843fb676a6a kdm-3.5.6-r1.ebuild 2363 EBUILD kdm-3.5.6.ebuild 2557 RMD160 e6355f87d664476176403f81bb97a2bf2cde83db SHA1 1e1b913783e1db6fc914e70368c54d7dd042948a SHA256 6f06ddd17fc6043a280e2e61d06e4e07dcc49618cc1d756cdde6ab203701d8d2 MD5 8f7ffd52f74df948d85804142900f08e kdm-3.5.6.ebuild 2557 RMD160 e6355f87d664476176403f81bb97a2bf2cde83db kdm-3.5.6.ebuild 2557 SHA256 6f06ddd17fc6043a280e2e61d06e4e07dcc49618cc1d756cdde6ab203701d8d2 kdm-3.5.6.ebuild 2557 -MISC ChangeLog 12180 RMD160 bd69b36db41a01cf49e4d7cbd81255f6da99f4b2 SHA1 29d7be20fc28d7dd841a4cf06ea396e902547807 SHA256 ba781f7f8a4aebbd7931db18f652e15916fea6c50430f97ad03c6070264ff55c -MD5 7470f7a5b3c1789583cf54f127f1927e ChangeLog 12180 -RMD160 bd69b36db41a01cf49e4d7cbd81255f6da99f4b2 ChangeLog 12180 -SHA256 ba781f7f8a4aebbd7931db18f652e15916fea6c50430f97ad03c6070264ff55c ChangeLog 12180 +MISC ChangeLog 12342 RMD160 7d778bfd2e30699e468cf9a41fc33ad88aec6da1 SHA1 11f2ba515789fde6c3f5851d780d19eca8dbaa58 SHA256 6972e5c60ec9d634af4bcefafcc38b245e7a5205c8d471020959ac9f3343a5be +MD5 f776154480dd6be6a28c1d485d804609 ChangeLog 12342 +RMD160 7d778bfd2e30699e468cf9a41fc33ad88aec6da1 ChangeLog 12342 +SHA256 6972e5c60ec9d634af4bcefafcc38b245e7a5205c8d471020959ac9f3343a5be ChangeLog 12342 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -30,10 +32,6 @@ SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/di MD5 ee171b889b6d1bf06db7b9807b6ecd54 files/digest-kdm-3.5.6 521 RMD160 b1bca8eff5d846ea0f0d76494fc35c512f14ddba files/digest-kdm-3.5.6 521 SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/digest-kdm-3.5.6 521 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFxxg1AiZjviIA2XgRAtY0AJ44QgUckD90eChCGvxsMTjNRnl94gCeNivd -1apk8By3Fwq65OebKYFJSrE= -=73MW ------END PGP SIGNATURE----- +MD5 e60a2e9e08c74ca4691800cc9baed2ed files/digest-kdm-3.5.6-r1 518 +RMD160 1aebc0611e61e808bc89e7fd2c2a6b3699f2f2a8 files/digest-kdm-3.5.6-r1 518 +SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/digest-kdm-3.5.6-r1 518 -- 2.26.2