Fix src_install(), bug 211376.
authorIngmar Vanhassel <ingmar@gentoo.org>
Mon, 10 Mar 2008 06:17:56 +0000 (06:17 +0000)
committerIngmar Vanhassel <ingmar@gentoo.org>
Mon, 10 Mar 2008 06:17:56 +0000 (06:17 +0000)
Package-Manager: portage-2.1.4.4

kde-base/kdebase/ChangeLog
kde-base/kdebase/Manifest
kde-base/kdebase/kdebase-3.5.9-r1.ebuild [new file with mode: 0644]

index 71a3b16c293e96ec70dc19939e9e4a73519fe907..9bf36e2b3c883aacfe16a7a60aa3916ce547cb99 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.435 2008/03/07 00:35:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.436 2008/03/10 06:17:56 ingmar Exp $
+
+*kdebase-3.5.9-r1 (10 Mar 2008)
+
+  10 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +kdebase-3.5.9-r1.ebuild:
+  Fix src_install(), bug 211376.
 
   07 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> kdebase-3.5.9.ebuild:
   Keyword ~mips.
index a70d90100b4df385f7256275bb9160f74395a929..1132b380c02a87f4a2bdad897fc4e2fa8f45fe09 100644 (file)
@@ -24,13 +24,14 @@ DIST kdebase-3.5-patchset-10.tar.bz2 38090 RMD160 b3fdca9c5220a213c1390ef5585426
 DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 EBUILD kdebase-3.5.8-r6.ebuild 7879 RMD160 2c1b1ada37e847ba7275d5e6eebdb2b8c92960e8 SHA1 98a6bc1b750ef071385f51815baea6078d18107f SHA256 ab32d9dc5fda630444f3a02a8dc38dcf9846f54669ec5f2c3b12d9440a72139e
+EBUILD kdebase-3.5.9-r1.ebuild 8140 RMD160 a6265eb5d7344233c79836b82577764a6d44b1bd SHA1 4b4ed6a584c5ab88aa8bb95474e5121fcee74c45 SHA256 6126f21d7bb49d378f03bbedb224e2163632795af737f80e75facb1d0ad0e17f
 EBUILD kdebase-3.5.9.ebuild 8172 RMD160 35bd3da0ab294063dd176f1da8757f328937b36a SHA1 cfc70cee64e8f97641e820755a7b23f851349f62 SHA256 deb934a983e5fb69427fc1663108b4579b0b1f4fedf9964be3d1837feb6fd672
-MISC ChangeLog 73093 RMD160 f7695a921a194691920ef72ef8503f26bb4aa18a SHA1 b1c848781fc1a96f591ca017c4bfb3918e6d19db SHA256 305de4ab8507fe00ea108a837b1b687246a692e806ea3ad1f4749ced7466b796
+MISC ChangeLog 73237 RMD160 9a4b1d8ecf5d4d348994158b1cfe4a675cde5325 SHA1 c3b80be959e72f947146be172c14c938e693d206 SHA256 bffc6ea503099d064fff4662b0a34a66514ef13e7e911a53f5a5fb93811dfc5d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH0I3eiqiDRvmkBmIRAsXpAJ4wOVUCKmtlF4c3g60q2CJ5Wt3m6ACfaBsn
-ZAtac1uoY+8LwWVQWNYcSyI=
-=6o2X
+iD8DBQFH1NJiB18eXLOpYdkRAhytAKCEkRCBCy0a/n6E3VG56U090EJFXgCbBsHk
+YyErPEY4YpUZNPlwHp8W6/Y=
+=bD0m
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/kdebase-3.5.9-r1.ebuild b/kde-base/kdebase/kdebase-3.5.9-r1.ebuild
new file mode 100644 (file)
index 0000000..ecffbfa
--- /dev/null
@@ -0,0 +1,256 @@
+# Copyright 1999-2008 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.1 2008/03/10 06:17:56 ingmar 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? ( >=dev-libs/libusb-0.1.10a )
+       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-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.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
+}