From 5266b08b5ee0f4dd555100131e31922766bc342c Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Tue, 1 May 2007 12:05:03 +0000 Subject: [PATCH] Multiple fixes, see the recent corresponding split ebuild revision bumps for more information. Package-Manager: portage-2.1.2.5 --- kde-base/kdebase/ChangeLog | 8 +- kde-base/kdebase/Manifest | 16 +- .../kdebase/files/digest-kdebase-3.5.6-r3 | 6 + kde-base/kdebase/kdebase-3.5.6-r3.ebuild | 200 ++++++++++++++++++ kde-base/khelpcenter/Manifest | 26 ++- 5 files changed, 237 insertions(+), 19 deletions(-) create mode 100644 kde-base/kdebase/files/digest-kdebase-3.5.6-r3 create mode 100644 kde-base/kdebase/kdebase-3.5.6-r3.ebuild diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 10ad9d9ac326..147ca3eb89fc 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.355 2007/04/25 08:33:11 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.356 2007/05/01 12:05:03 carlo Exp $ + +*kdebase-3.5.6-r3 (01 May 2007) + + 01 May 2007; Carsten Lohrke +kdebase-3.5.6-r3.ebuild: + Multiple fixes, see the recent corresponding split ebuild revision bumps for + more information. 25 Apr 2007; Carsten Lohrke kdebase-3.5.6-r2.ebuild: XDG path care. diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 36b0038a237b..4768a1464482 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -35,6 +35,7 @@ MD5 8538e54f7c6ecb5fded8481536ad325a files/nsplugins-3.5.6-keyboard-handler.diff RMD160 d7b5e2ed6f95bc9a493b62713f43f56f653e2f60 files/nsplugins-3.5.6-keyboard-handler.diff 2360 SHA256 bc162a970d1e5511bb757de7881af2b8604224cf83f2115da28b68c7a7c37c1d files/nsplugins-3.5.6-keyboard-handler.diff 2360 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 kdebase-3.5.5-r1.ebuild 5908 RMD160 5f885f281109188f11ff75c9055a1343139c45c5 SHA1 7037fa8d9edb955ae95f8351241c233945b820c4 SHA256 6a137abd8e9ded6f94303aeb02ccee466614bd063ec276f93373edda03bae892 @@ -57,10 +58,14 @@ EBUILD kdebase-3.5.6-r2.ebuild 6472 RMD160 01da599795b6e1a3a485e59f8a0db2d7c8eda MD5 4ca1abe55a2fff07b571ab2ad7696fd2 kdebase-3.5.6-r2.ebuild 6472 RMD160 01da599795b6e1a3a485e59f8a0db2d7c8eda561 kdebase-3.5.6-r2.ebuild 6472 SHA256 4de26dce8066ab981f430e5b3ff789c1e1df4875fa318a3d8d9408fa920f38bd kdebase-3.5.6-r2.ebuild 6472 -MISC ChangeLog 60671 RMD160 a0b4bb1e6c3b12e2390abf3c8ef7a48f5f09deb9 SHA1 8a5b16d2df3172c26d1a3058cda222b1514dfb55 SHA256 d22ece7f4b6a4754aed792773ca4014c6f85c835dbbc5be6a0bc64ec175bf54d -MD5 67cb7ba920000f1efbba3fd8637c39db ChangeLog 60671 -RMD160 a0b4bb1e6c3b12e2390abf3c8ef7a48f5f09deb9 ChangeLog 60671 -SHA256 d22ece7f4b6a4754aed792773ca4014c6f85c835dbbc5be6a0bc64ec175bf54d ChangeLog 60671 +EBUILD kdebase-3.5.6-r3.ebuild 6200 RMD160 f53aa2c6bac25681b9a63e9e94df0bc2dc5d2bbc SHA1 ef8565df95f08363b184483f1e5d0d3086cccbb7 SHA256 1d3b3ad7e1dd20286d0bf474c8b41b23ee859326c587fdc2f56863d5be0526be +MD5 f9e2220b13e194af931ab06c63ae5266 kdebase-3.5.6-r3.ebuild 6200 +RMD160 f53aa2c6bac25681b9a63e9e94df0bc2dc5d2bbc kdebase-3.5.6-r3.ebuild 6200 +SHA256 1d3b3ad7e1dd20286d0bf474c8b41b23ee859326c587fdc2f56863d5be0526be kdebase-3.5.6-r3.ebuild 6200 +MISC ChangeLog 60879 RMD160 490803a4c5ad690ae1354a4e5b389094498737b5 SHA1 88c38c308ae166c706b0381a902e01d06b5a830f SHA256 ab14d717f93d390c75bb59118887454677b7be6a13ee8c1e722af3123b0b0f70 +MD5 2502d7cc6577ce248f03eeb237c6ef76 ChangeLog 60879 +RMD160 490803a4c5ad690ae1354a4e5b389094498737b5 ChangeLog 60879 +SHA256 ab14d717f93d390c75bb59118887454677b7be6a13ee8c1e722af3123b0b0f70 ChangeLog 60879 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -80,3 +85,6 @@ SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/di MD5 ee171b889b6d1bf06db7b9807b6ecd54 files/digest-kdebase-3.5.6-r2 521 RMD160 b1bca8eff5d846ea0f0d76494fc35c512f14ddba files/digest-kdebase-3.5.6-r2 521 SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/digest-kdebase-3.5.6-r2 521 +MD5 e60a2e9e08c74ca4691800cc9baed2ed files/digest-kdebase-3.5.6-r3 518 +RMD160 1aebc0611e61e808bc89e7fd2c2a6b3699f2f2a8 files/digest-kdebase-3.5.6-r3 518 +SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/digest-kdebase-3.5.6-r3 518 diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.6-r3 b/kde-base/kdebase/files/digest-kdebase-3.5.6-r3 new file mode 100644 index 000000000000..1d41d209c152 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5.6-r3 @@ -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/kdebase-3.5.6-r3.ebuild b/kde-base/kdebase/kdebase-3.5.6-r3.ebuild new file mode 100644 index 000000000000..b4602c1761ea --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5.6-r3.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6-r3.ebuild,v 1.1 2007/05/01 12:05:03 carlo Exp $ + +inherit kde-dist eutils flag-o-matic + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2" + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl +pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" + +# hal: enables hal backend for 'media:' ioslave + +DEPEND=">=media-libs/freetype-2 + 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? ( >=dev-libs/libusb-0.1.10a ) + ieee1394? ( sys-libs/libraw1394 ) + hal? ( || ( dev-libs/dbus-qt3-old ( =sys-apps/dbus-0.34 ) ) + =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 ) ) + www-misc/htdig + x11-apps/mkfontdir + x11-apps/setxkbmap + x11-apps/xinit + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + 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.6 + +pkg_setup() { + kde_pkg_setup + if use hal && has_version '> /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() { + 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" + + export BINDNOW_FLAGS="$(bindnow-flags)" + + 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 < "${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" + + # 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" +} + +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 +} diff --git a/kde-base/khelpcenter/Manifest b/kde-base/khelpcenter/Manifest index 99cd5c775acb..16d8f86daa84 100644 --- a/kde-base/khelpcenter/Manifest +++ b/kde-base/khelpcenter/Manifest @@ -1,20 +1,22 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +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 khelpcenter-3.5.5.ebuild 510 RMD160 e69d3b97af505bc72af894b852f895652a8bf01b SHA1 68cac3d8a2f7a746568930a87761b3d400a8942a SHA256 a8949c860302b55d195cf4f81b8ee19aac3733f055f0c0b6aca007cc8e6f65e4 MD5 251de6a538c88b4320c1971beb2750c3 khelpcenter-3.5.5.ebuild 510 RMD160 e69d3b97af505bc72af894b852f895652a8bf01b khelpcenter-3.5.5.ebuild 510 SHA256 a8949c860302b55d195cf4f81b8ee19aac3733f055f0c0b6aca007cc8e6f65e4 khelpcenter-3.5.5.ebuild 510 +EBUILD khelpcenter-3.5.6-r1.ebuild 646 RMD160 442be8d5315c768655a8f5790b340227c553d8f0 SHA1 4eab2057cf45f83224f8efa5cdf8fcb69b5dbb7f SHA256 ec56118128fdbef84fdfee78130a452bf2f9bc0330a3c66d8d6268af3db6a0e2 +MD5 18d56ad75d2577800ee0dc428a7b8f07 khelpcenter-3.5.6-r1.ebuild 646 +RMD160 442be8d5315c768655a8f5790b340227c553d8f0 khelpcenter-3.5.6-r1.ebuild 646 +SHA256 ec56118128fdbef84fdfee78130a452bf2f9bc0330a3c66d8d6268af3db6a0e2 khelpcenter-3.5.6-r1.ebuild 646 EBUILD khelpcenter-3.5.6.ebuild 520 RMD160 4fa0a35f551351094b5d3793765949c855dd3ca2 SHA1 2893dcf3b7cfad0ddcc1806e18f880cfefaa4af6 SHA256 6e686cab6a0e282aebb6a23fb545d44a6046bb376efd236361ce7f2d2055cca0 MD5 2d7d0f879d580ddbfefbe9708fd2ee84 khelpcenter-3.5.6.ebuild 520 RMD160 4fa0a35f551351094b5d3793765949c855dd3ca2 khelpcenter-3.5.6.ebuild 520 SHA256 6e686cab6a0e282aebb6a23fb545d44a6046bb376efd236361ce7f2d2055cca0 khelpcenter-3.5.6.ebuild 520 -MISC ChangeLog 8481 RMD160 a7c4d284775f8395880ea16fc1fe30c4ea732e94 SHA1 07f7c9821398bf971b2e5f11c40edbae3a82fbf0 SHA256 253c3493e74cacd4c124a567d17f7b5eb6de276149fb881a2605cdef074fe2d7 -MD5 e1e6db416676a7e821973a6733647b8c ChangeLog 8481 -RMD160 a7c4d284775f8395880ea16fc1fe30c4ea732e94 ChangeLog 8481 -SHA256 253c3493e74cacd4c124a567d17f7b5eb6de276149fb881a2605cdef074fe2d7 ChangeLog 8481 +MISC ChangeLog 8649 RMD160 b0d99708e9732f4abbb7f454c2902d7f7a6f3016 SHA1 2ea1a82feee2cac7978a51b98d6273e585a9a628 SHA256 9efe14e6822b690444dc749e454c783296d4a2067dffae0ebbed3b9bd6e6af96 +MD5 3dde3c94b7f1fbfd7e23ebe5d9311471 ChangeLog 8649 +RMD160 b0d99708e9732f4abbb7f454c2902d7f7a6f3016 ChangeLog 8649 +SHA256 9efe14e6822b690444dc749e454c783296d4a2067dffae0ebbed3b9bd6e6af96 ChangeLog 8649 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -25,10 +27,6 @@ SHA256 9cc3c28d08df92a966fea0a4803780aa582eecd497d09fced2e5dc1c4160c76c files/di MD5 5b4b7959fbce967a88b396358a318508 files/digest-khelpcenter-3.5.6 250 RMD160 728a8b2a4aaecee59ec1fdddc0c6bed46d377dfe files/digest-khelpcenter-3.5.6 250 SHA256 0902944a0dc76b7a18cc06bd4ae16233216ffb1dfe5eabe9f3b62ef4b1bd83c5 files/digest-khelpcenter-3.5.6 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFxUSbAiZjviIA2XgRAl0WAJ4trLhf3QiIqEVY0V57ZGFWq5gODQCgxCtE -DdlmiX0nuTZTU4swNAhmU1Q= -=xgAB ------END PGP SIGNATURE----- +MD5 e60a2e9e08c74ca4691800cc9baed2ed files/digest-khelpcenter-3.5.6-r1 518 +RMD160 1aebc0611e61e808bc89e7fd2c2a6b3699f2f2a8 files/digest-khelpcenter-3.5.6-r1 518 +SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/digest-khelpcenter-3.5.6-r1 518 -- 2.26.2