# 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.337 2007/01/28 11:34:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.338 2007/01/28 11:55:28 flameeyes Exp $
+
+ 28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ -files/kdebase-3.4.1-configure.patch,
+ -files/kdebase-3.4.1-startkde-gentoo.patch,
+ -files/kdebase-3.4.2-kinfocenter-opengl-fix.patch,
+ -files/kdebase-3.4.2-konqueror-filter.patch,
+ -files/kdebase-3.4.3-noimake.patch, -files/kdebase-3.4.3-xdmcp.patch,
+ -files/kdebase-3.4-configure.patch,
+ -files/konsole-3.5.1-detach-send2all.patch,
+ -files/kwin-3.5.2-parallel-make.diff,
+ -files/drkonqi-3.5.2-splitdebug.patch,
+ -files/nsplugins-3.5.3-applet-redirects.patch,
+ -files/kdm-3.5.3-strict-aliasing.patch,
+ -files/kdebase-kioslaves-3.5.4-dbuscrash.patch,
+ -files/kdm-3.5.4-strict-aliasing.patch, -files/kde.desktop,
+ -files/kde.pam, -files/kde-np.pam, -kdebase-3.5.5-r2.ebuild,
+ -kdebase-3.5.6.ebuild:
+ Remove old versions and a bunch of files that are orphaned for quite a while
+ now.
*kdebase-3.5.6-r1 (28 Jan 2007)
+++ /dev/null
-MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
-RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
-SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
-MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
-RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
-SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
+++ /dev/null
-MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
-RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
-SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
-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
+++ /dev/null
-Index: kdebase-3.5.2/drkonqi/debuggers/gdbrc
-===================================================================
---- kdebase-3.5.2.orig/drkonqi/debuggers/gdbrc
-+++ kdebase-3.5.2/drkonqi/debuggers/gdbrc
-@@ -140,8 +140,8 @@ Comment[xh]=Text based debugger evela kw
- Comment[zh_CN]=在控制台中运行的文本 GNU 调试器
- Comment[zh_TW]=在 Konsole 中執行的 GNU 文字型除錯器
- Comment[zu]=Umcoshi wamaphutha osekelwe umbhalo osuka kwi-GNU kwikhonsoli
--Exec=konsole -e gdb -nw %execname %pid
--ExecBatch=gdb -nw -n -batch -x %tempfile %execname %pid
-+Exec=konsole -e gdb -nw --symbols %execname %execname %pid
-+ExecBatch=gdb -nw -n -batch -x %tempfile --symbols %execname %execname %pid
- TryExec=gdb
- BacktraceCommand=bt
- RemoveFromBacktraceRegExp=\(no debugging symbols found\)\.\.\.\\n?
+++ /dev/null
-#%PAM-1.0
-
-auth required /lib/security/pam_nologin.so
-auth required /lib/security/pam_permit.so
-
-account required /lib/security/pam_stack.so service=system-auth
-
-password required /lib/security/pam_stack.so service=system-auth
-
-session required /lib/security/pam_stack.so service=system-auth
-
-session optional /lib/security/pam_console.so
+++ /dev/null
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=_PREFIX_/bin/startkde
-TryExec=_PREFIX_/bin/startkde
-Name=KDE _VERSION_
-Name[hi]=केडीई
-Name[mn]=КДЭ
-Name[ta]=Kஏற்றக் காவலன்
-Name[xh]=iKDE
-Name[xx]=xxKDExx
-Comment=The K Desktop Environment. A powerful Open Source graphical desktop environment
-Comment[bs]=K Desktop Environment. Moćan grafički desktop otvorenog izvornog koda
-Comment[ca]=L'entorn d'escriptori K. Un poderós entorn d'escriptori gràfic de Codi Font Obert
-Comment[cy]=Yr Amgylchedd Penbwrdd K. Amgylchedd penbwrdd graffegol pwerus, sy'n gôd-agored.
-Comment[da]=K Skrivebordsmiljøet. Et kraftigt, åbent, grafisk skrivebordsmiljø
-Comment[de]=Das K Desktop Environment. Eine mächtige, graphische Arbeitsumgebung und Open Source / Freie Software
-Comment[el]=Το K Desktop Environment. Ένα πανίσχυρο ελεύθερης προέλευσης γραφικό περιβάλλον επιφάνειας εργασίας
-Comment[es]=El Entorno de Escritorio K, un potente entorno de escritorio gráfico realizado de código abierto
-Comment[et]=K töölaua keskkond on võimas vaba tarkvara graafiline töölaua keskkond
-Comment[fi]=KDE-työpöytäympäristö (K Desktop Environment) on tehokas avoimen lähdekoodin graafinen työpöytäympäristö
-Comment[fr]=The K Desktop Environment. Un environnement de bureau graphique, puissant et Open Source
-Comment[he]=The K Desktop Environment. סביבת עבודה גרפית, בעלת-עוצמה בקוד פתוח
-Comment[hi]=के डेस्कटॉप वातावरण. एक शक्तिशाली, ओपन सोर्स चित्रमय डेस्कटॉप वातावरण
-Comment[hu]=A KDE grafikus munkakörnyezet, egy szabad forráskódú grafikus ablakkezelő környezet
-Comment[it]=L'ambiente desktop KDE. Un potente ambiente desktop grafico Open Source
-Comment[mn]=The K Desktop Environment. Хүчирхэг нээлттэй эх код бүхий график дэлгэцийн орчин
-Comment[nb]=K Desktop Environment. Et kraftig grafisk skrivebordsmiljø med åpen kildekode.
-Comment[nl]=De K Desktop Environment, een krachtige open source grafische desktop environment
-Comment[nn]=K Desktop Environment. Eit kraftig grafisk skrivebordsmiljø med open kjeldekode.
-Comment[pl]=Środowisko KDE. Potężne środowisko graficzne Wolnego Oprogramowania.
-Comment[pt]=O K Desktop Environment. Um ambiente gráfico open source poderoso
-Comment[pt_BR]=Acrônimo para K Desktop Environment (ou Ambiente de Trabalho K). Um poderoso ambiente de trabalho gráfico de código aberto
-Comment[ro]=K Desktop Environment. Un mediu grafic cu surse deschise, foarte puternic
-Comment[sk]=The K Desktop Environment. Výkonné, voľne šíriteľné grafické pracovné prostredie
-Comment[sl]=Namizno okolje K. Zmogljivo grafično namizno okolje odprte kode
-Comment[sr]=K Desktop Environment (KDE). Моћно графичко радно окружење отвореног кода
-Comment[sv]=K-skrivbordsmiljön. En kraftfull grafisk skrivbordsmiljö med öppen källkod
-Comment[ta]= Kமேல்மேசை சூழல். சக்திவாய்ந்த திறந்த ஆணைமூல சித்திர வகை மேல்மேசை சூழல்
-Comment[tr]=KDE Masaüstü Yöneticisi. Güçlü bir grafiksel masaüstü ortamı
-Comment[uk]=The K Desktop Environment. Потужне графічне середовище з відкритими текстами
-Comment[uz]=KDE (K Desktop Environment) - кучли Open Source график иш столи муҳити
-Comment[vi]=môi trường desktop K, môi trường desktop đồ hoạ mã nguồn mở rất mạnh
-Comment[xx]=xxThe K Desktop Environment. A powerful Open Source graphical desktop environmentxx
-Comment[zh_CN]=K 桌面环境。强大的开放源代码图形桌面环境
+++ /dev/null
-#%PAM-1.0
-
-auth required /lib/security/pam_stack.so service=system-auth
-auth required /lib/security/pam_nologin.so
-
-account required /lib/security/pam_stack.so service=system-auth
-
-password required /lib/security/pam_stack.so service=system-auth
-
-session required /lib/security/pam_stack.so service=system-auth
-
-session optional /lib/security/pam_console.so
+++ /dev/null
-diff -Nur kdebase-3.4.2.orig/kcontrol/input/configure.in.bot kdebase-3.4.2/kcontrol/input/configure.in.bot
---- kdebase-3.4.2.orig/kcontrol/input/configure.in.bot 2005-05-23 14:13:38.000000000 +0200
-+++ kdebase-3.4.2/kcontrol/input/configure.in.bot 2005-07-28 13:35:17.000000000 +0200
-@@ -1,10 +1,4 @@
--if test "$LUSBLIB" = "no"; then
-- echo
-- echo " Problem! libusb library not found, get it from"
-- echo " http://libusb.sourceforge.net"
--fi
--
--if (test x"$USB_LIBS" = x""); then
-+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
- echo ""
- echo "Logitech mouse support is disabled. Provide libusb to enable it."
- echo ""
-diff -Nur kdebase-3.4.2.orig/kcontrol/input/configure.in.in kdebase-3.4.2/kcontrol/input/configure.in.in
---- kdebase-3.4.2.orig/kcontrol/input/configure.in.in 2005-05-23 14:13:38.000000000 +0200
-+++ kdebase-3.4.2/kcontrol/input/configure.in.in 2005-07-28 13:35:17.000000000 +0200
-@@ -1,19 +1,26 @@
--LIBUSBCONFIG=""
--AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
--if test $LIBUSBCONFIG = "no" ; then
-- AC_MSG_WARN(Can't find libusb-config)
-- AC_MSG_WARN(Check your libusb installation)
-- USB_LIBS=""
-- USB_CFLAGS=""
--else
-- USB_LIBS="$($LIBUSBCONFIG --libs)"
-- USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
--AC_CHECK_LIB(usb,main,
-- AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb]),
-- [],
-- $USB_LIBS
--)
-+AC_ARG_WITH(libusb,
-+ [AS_HELP_STRING(--with-libusb,
-+ [enable control of some mouse models through libusb @<:@default=check@:>@])],
-+ [], with_libusb=check)
-+
-+USB_LIBS=
-+USB_CFLAGS=
-+have_libusb=no
-+if test "x$with_libusb" != xno; then
-+ AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
-+ if test $LIBUSBCONFIG != "no"; then
-+ USB_LIBS="$($LIBUSBCONFIG --libs)"
-+ USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
-+
-+ AC_CHECK_LIB(usb,main,
-+ [have_libusb=yes
-+ AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])],
-+ [], [$USB_LIBS]
-+ )
-+ fi
-+ if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
-+ AC_MSG_FAILURE([--with-libusb was given, but test for libusb failed])
-+ fi
- fi
- AC_SUBST(USB_LIBS)
- AC_SUBST(USB_CFLAGS)
--
-diff -Nur kdebase-3.4.2.orig/kcontrol/view1394/configure.in.in kdebase-3.4.2/kcontrol/view1394/configure.in.in
---- kdebase-3.4.2.orig/kcontrol/view1394/configure.in.in 2005-05-23 14:13:48.000000000 +0200
-+++ kdebase-3.4.2/kcontrol/view1394/configure.in.in 2005-07-28 13:35:17.000000000 +0200
-@@ -1,3 +1,15 @@
-+AC_ARG_WITH(libraw1394,
-+ [AS_HELP_STRING(--with-libraw1394,
-+ [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])],
-+ [], with_libraw1394=check)
-+
- VIEW1394_SUBDIR=
--KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+if test "x$with_libraw1394" != xno; then
-+ KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+
-+ if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
-+ AC_MSG_FAILURE([--with-libraw1394 was given, but test for libraw1394 failed])
-+ fi
-+fi
-+
- AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR")
-diff -Nur kdebase-3.4.2.orig/kioslave/smb/configure.in.bot kdebase-3.4.2/kioslave/smb/configure.in.bot
---- kdebase-3.4.2.orig/kioslave/smb/configure.in.bot 2005-05-23 14:14:19.000000000 +0200
-+++ kdebase-3.4.2/kioslave/smb/configure.in.bot 2005-07-28 13:35:17.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$have_libsmbclient" = no; then
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
- echo ""
- echo "You're missing libsmbclient from samba 3.0"
- echo "KDE will not be able to browse windows shares without it,"
-diff -Nur kdebase-3.4.2.orig/kioslave/smb/configure.in.in kdebase-3.4.2/kioslave/smb/configure.in.in
---- kdebase-3.4.2.orig/kioslave/smb/configure.in.in 2005-05-23 14:14:19.000000000 +0200
-+++ kdebase-3.4.2/kioslave/smb/configure.in.in 2005-07-28 13:35:17.000000000 +0200
-@@ -1,20 +1,34 @@
- AC_DEFUN([SMB_CHECK],
- [
- AC_REQUIRE([KDE_CHECK_LARGEFILE])
--have_libsmbclient=yes
--KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
--KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
-
--AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
-+AC_ARG_WITH(samba,
-+ [AS_HELP_STRING(--with-samba,
-+ [enable the samba ioslave @<:@default=check@:>@])],
-+ [], with_samba=check)
-
--SMBCLIENT_EXTRA_LIBS=""
--AC_CHECK_FUNC(yp_get_default_domain, [],
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+ have_libsmbclient=yes
-+ KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
-+ KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
-+
-+ SMBCLIENT_EXTRA_LIBS=""
-+ AC_CHECK_FUNC(yp_get_default_domain, [],
- [
- KDE_CHECK_LIB(nsl, yp_get_default_domain,
- [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
- ])
-
--AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+ AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+
-+ if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+ AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
-+ fi
-+fi
-+
-+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
-+
- ])
-
- SMB_CHECK
-diff -Nur kdebase-3.4.2.orig/kioslave/thumbnail/configure.in.in kdebase-3.4.2/kioslave/thumbnail/configure.in.in
---- kdebase-3.4.2.orig/kioslave/thumbnail/configure.in.in 2005-05-23 14:14:20.000000000 +0200
-+++ kdebase-3.4.2/kioslave/thumbnail/configure.in.in 2005-07-28 13:35:59.000000000 +0200
-@@ -99,6 +99,18 @@
- AC_SUBST(EXR_FLAGS)
- ])
-
--AC_FIND_LIBEXR
-+AC_ARG_WITH(openexr,
-+ [AC_HELP_STRING(--with-openexr,
-+ [enable support for OpenEXR @<:@default=check@:>@])],
-+ [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+ AC_FIND_LIBEXR
-+
-+ if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+ AC_MSG_ERROR([--with-openexr was given, but test for OpenEXR failed])
-+ fi
-+fi
-+
- AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
-
-diff -Nur kdebase-3.4.2.orig/ksysguard/configure.in.in kdebase-3.4.2/ksysguard/configure.in.in
---- kdebase-3.4.2.orig/ksysguard/configure.in.in 2005-05-23 14:15:09.000000000 +0200
-+++ kdebase-3.4.2/ksysguard/configure.in.in 2005-07-28 13:35:17.000000000 +0200
-@@ -23,11 +23,19 @@
- AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
- AC_SUBST(UNAME)
-
--KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
--AC_SUBST(LIBSENSORS)
-+AC_ARG_WITH(sensors,
-+ [AS_HELP_STRING(--with-sensors,
-+ [enable support for lm_sensors @<:@default=check@:>@])],
-+ [], with_sensors=check)
-
--dnl Check for dell laptop support
--AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
-+if test "x$with_sensors" != xno; then
-+ KDE_CHECK_HEADERS(sensors/sensors.h)
-+ KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
-+
-+ if test "x$with_readline" != xcheck && test -z "$LIBSENSORS"; then
-+ AC_MSG_FAILURE([--with-sensors was given, but test for lm_sensors failed])
-+ fi
-+fi
-
- case "$UNAME" in
- Linux) LIBHOSTS="$LIBSENSORS" ;;
-@@ -35,5 +43,7 @@
- Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
- esac
- AC_SUBST(LIBHOSTS)
-+AC_SUBST(LIBSENSORS)
-
--KDE_CHECK_HEADERS(sensors/sensors.h)
-+dnl Check for dell laptop support
-+AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
+++ /dev/null
-diff -Nur kdebase-3.4.1.orig/kcontrol/input/configure.in.bot kdebase-3.4.1/kcontrol/input/configure.in.bot
---- kdebase-3.4.1.orig/kcontrol/input/configure.in.bot 2005-05-23 14:13:38.000000000 +0200
-+++ kdebase-3.4.1/kcontrol/input/configure.in.bot 2005-06-05 22:22:40.000000000 +0200
-@@ -1,10 +1,4 @@
--if test "$LUSBLIB" = "no"; then
-- echo
-- echo " Problem! libusb library not found, get it from"
-- echo " http://libusb.sourceforge.net"
--fi
--
--if (test x"$USB_LIBS" = x""); then
-+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
- echo ""
- echo "Logitech mouse support is disabled. Provide libusb to enable it."
- echo ""
-diff -Nur kdebase-3.4.1.orig/kcontrol/input/configure.in.in kdebase-3.4.1/kcontrol/input/configure.in.in
---- kdebase-3.4.1.orig/kcontrol/input/configure.in.in 2005-05-23 14:13:38.000000000 +0200
-+++ kdebase-3.4.1/kcontrol/input/configure.in.in 2005-06-05 22:22:40.000000000 +0200
-@@ -1,19 +1,26 @@
--LIBUSBCONFIG=""
--AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
--if test $LIBUSBCONFIG = "no" ; then
-- AC_MSG_WARN(Can't find libusb-config)
-- AC_MSG_WARN(Check your libusb installation)
-- USB_LIBS=""
-- USB_CFLAGS=""
--else
-- USB_LIBS="$($LIBUSBCONFIG --libs)"
-- USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
--AC_CHECK_LIB(usb,main,
-- AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb]),
-- [],
-- $USB_LIBS
--)
-+AC_ARG_WITH(libusb,
-+ [AS_HELP_STRING(--with-libusb,
-+ [enable control of some mouse models through libusb @<:@default=check@:>@])],
-+ [], with_libusb=check)
-+
-+USB_LIBS=
-+USB_CFLAGS=
-+have_libusb=no
-+if test "x$with_libusb" != xno; then
-+ AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
-+ if test $LIBUSBCONFIG != "no"; then
-+ USB_LIBS="$($LIBUSBCONFIG --libs)"
-+ USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
-+
-+ AC_CHECK_LIB(usb,main,
-+ [have_libusb=yes
-+ AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])],
-+ [], [$USB_LIBS]
-+ )
-+ fi
-+ if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
-+ AC_MSG_FAILURE([--with-libusb was given, but test for libusb failed])
-+ fi
- fi
- AC_SUBST(USB_LIBS)
- AC_SUBST(USB_CFLAGS)
--
-diff -Nur kdebase-3.4.1.orig/kcontrol/view1394/configure.in.in kdebase-3.4.1/kcontrol/view1394/configure.in.in
---- kdebase-3.4.1.orig/kcontrol/view1394/configure.in.in 2005-05-23 14:13:48.000000000 +0200
-+++ kdebase-3.4.1/kcontrol/view1394/configure.in.in 2005-06-05 22:22:48.000000000 +0200
-@@ -1,3 +1,15 @@
-+AC_ARG_WITH(libraw1394,
-+ [AS_HELP_STRING(--with-libraw1394,
-+ [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])],
-+ [], with_libraw1394=check)
-+
- VIEW1394_SUBDIR=
--KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+if test "x$with_libraw1394" != xno; then
-+ KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
-+
-+ if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
-+ AC_MSG_FAILURE([--with-libraw1394 was given, but test for libraw1394 failed])
-+ fi
-+fi
-+
- AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR")
-diff -Nur kdebase-3.4.1.orig/kioslave/smb/configure.in.bot kdebase-3.4.1/kioslave/smb/configure.in.bot
---- kdebase-3.4.1.orig/kioslave/smb/configure.in.bot 2005-05-23 14:14:19.000000000 +0200
-+++ kdebase-3.4.1/kioslave/smb/configure.in.bot 2005-06-05 22:22:43.000000000 +0200
-@@ -1,4 +1,4 @@
--if test "$have_libsmbclient" = no; then
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
- echo ""
- echo "You're missing libsmbclient from samba 3.0"
- echo "KDE will not be able to browse windows shares without it,"
-diff -Nur kdebase-3.4.1.orig/kioslave/smb/configure.in.in kdebase-3.4.1/kioslave/smb/configure.in.in
---- kdebase-3.4.1.orig/kioslave/smb/configure.in.in 2005-05-23 14:14:19.000000000 +0200
-+++ kdebase-3.4.1/kioslave/smb/configure.in.in 2005-06-05 22:22:43.000000000 +0200
-@@ -1,20 +1,34 @@
- AC_DEFUN([SMB_CHECK],
- [
- AC_REQUIRE([KDE_CHECK_LARGEFILE])
--have_libsmbclient=yes
--KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
--KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
-
--AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
-+AC_ARG_WITH(samba,
-+ [AS_HELP_STRING(--with-samba,
-+ [enable the samba ioslave @<:@default=check@:>@])],
-+ [], with_samba=check)
-
--SMBCLIENT_EXTRA_LIBS=""
--AC_CHECK_FUNC(yp_get_default_domain, [],
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+ have_libsmbclient=yes
-+ KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
-+ KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
-+
-+ SMBCLIENT_EXTRA_LIBS=""
-+ AC_CHECK_FUNC(yp_get_default_domain, [],
- [
- KDE_CHECK_LIB(nsl, yp_get_default_domain,
- [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
- ])
-
--AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+ AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+
-+ if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+ AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
-+ fi
-+fi
-+
-+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
-+
- ])
-
- SMB_CHECK
-diff -Nur kdebase-3.4.1.orig/ksysguard/configure.in.in kdebase-3.4.1/ksysguard/configure.in.in
---- kdebase-3.4.1.orig/ksysguard/configure.in.in 2005-05-23 14:15:09.000000000 +0200
-+++ kdebase-3.4.1/ksysguard/configure.in.in 2005-06-05 22:22:46.000000000 +0200
-@@ -23,11 +23,19 @@
- AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
- AC_SUBST(UNAME)
-
--KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
--AC_SUBST(LIBSENSORS)
-+AC_ARG_WITH(sensors,
-+ [AS_HELP_STRING(--with-sensors,
-+ [enable support for lm_sensors @<:@default=check@:>@])],
-+ [], with_sensors=check)
-
--dnl Check for dell laptop support
--AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
-+if test "x$with_sensors" != xno; then
-+ KDE_CHECK_HEADERS(sensors/sensors.h)
-+ KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
-+
-+ if test "x$with_readline" != xcheck && test -z "$LIBSENSORS"; then
-+ AC_MSG_FAILURE([--with-sensors was given, but test for lm_sensors failed])
-+ fi
-+fi
-
- case "$UNAME" in
- Linux) LIBHOSTS="$LIBSENSORS" ;;
-@@ -35,5 +43,7 @@
- Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
- esac
- AC_SUBST(LIBHOSTS)
-+AC_SUBST(LIBSENSORS)
-
--KDE_CHECK_HEADERS(sensors/sensors.h)
-+dnl Check for dell laptop support
-+AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
+++ /dev/null
-diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
---- kdebase-3.4.0.orig/startkde 2005-03-04 12:20:04.000000000 +0100
-+++ kdebase-3.4.0/startkde 2005-05-26 02:04:35.000000000 +0200
-@@ -14,6 +14,40 @@
- exit 1
- fi
-
-+# Gentoo part:
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+
-+cd ${HOME}
-+if [ -L .kde -o ! -d .kde ]; then
-+ # handle ~/.kde* dirs - separate ones for separate KDEs
-+ rm -f .kde
-+ if [ ! -e .kde3.4 ]; then
-+ # migrate old config files
-+ if [ -e .kde3.3 ]; then
-+ cp -r .kde3.3 .kde3.4
-+ elif [ -e .kde3.2 ]; then
-+ cp -r .kde3.2 .kde3.4
-+ else
-+ mkdir .kde3.4
-+ fi
-+ cd .kde3.4
-+ for file in share/apps/kdevdocumentation/search/htdig.conf \
-+ share/apps/kalarmd/clients \
-+ share/config/kresources/calendar/stdrc \
-+ share/config/*rc; do
-+ if [ -e "${file}" ]; then
-+ sed -i -e "s:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g" \
-+ -e 's:$HOME/\.kde3\.[23]:$HOME/\.kde3\.4:g' \
-+ -e 's:/usr/kde/3\.[23]/:/usr/kde/3\.4/:g' \
-+ "${file}"
-+ fi
-+ done
-+ cd ${HOME}
-+ fi
-+ ln -sf .kde3.4 .kde
-+fi
-+# Gentoo part ends
-+
- # Set the background to plain grey.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
+++ /dev/null
---- kcontrol/info/opengl.cpp.bak 2005-05-23 07:13:35.000000000 -0500
-+++ kcontrol/info/opengl.cpp 2005-08-27 10:45:08.000000000 -0500
-@@ -235,6 +235,9 @@
- GL_COMPRESSED_TEXTURE_FORMATS
- */
-
-+ if (!glExtensions)
-+ return;
-+
- struct token_name {
- GLuint type; // count and flags, !!! count must be <=2 for now
- GLenum token;
+++ /dev/null
---- kdebase-3.4.2/konqueror/konq_mainwindow_old.cc 2005-08-05 17:29:06.000000000 -0400
-+++ kdebase-3.4.2/konqueror/konq_mainwindow.cc 2005-08-05 19:05:53.000000000 -0400
-@@ -39,6 +39,7 @@
- #include <kzip.h>
- #include <config.h>
- #include <pwd.h>
-+#include <kio/netaccess.h>
- // we define STRICT_ANSI to get rid of some warnings in glibc
- #ifndef __STRICT_ANSI__
- #define __STRICT_ANSI__
-@@ -428,7 +429,7 @@
- QString fileName = path.mid( lastSlash + 1 );
- QString testPath = path.left( lastSlash + 1 );
- if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
-- && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
-+ && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) )
- {
- nameFilter = fileName;
- url.setFileName( QString::null );
+++ /dev/null
-diff -Nur kdebase-3.4.3.orig/kdm/configure.in.in kdebase-3.4.3/kdm/configure.in.in
---- kdebase-3.4.3.orig/kdm/configure.in.in 2005-10-05 15:39:13.000000000 +0200
-+++ kdebase-3.4.3/kdm/configure.in.in 2005-10-19 11:26:29.000000000 +0200
-@@ -1,42 +1,22 @@
-
- dnl this is for kdm:
-
--KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+AC_MSG_CHECKING([X paths for KDM])
-
--dnl ask imake about various X settings
--AC_MSG_CHECKING([X paths])
--imkv=8
--test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
--AC_CACHE_VAL(kde_cv_defines_imake, [
-- rm -fr conftestdir
-- if mkdir conftestdir; then
-- cd conftestdir
-- cat > Imakefile <<'EOF'[
--
--acimake:
-- @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
--
--]EOF
-- if $XMKMF >&5 2>&1 && test -f Makefile; then
-- kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
-- kde_cv_defines_imake_version=$imkv
-- else
-- AC_MSG_RESULT([failed])
-- AC_MSG_ERROR([$XMKMF (imake) failed.
--Make sure you have all necessary X development packages installed.
--On some systems a missing /lib/cpp symlink is at fault.])
-- fi
-- cd ..
-- rm -fr conftestdir
-- else
-- AC_MSG_RESULT([failed])
-- AC_MSG_ERROR([cannot create temporary directory])
-- fi
--])
--AC_MSG_RESULT([done])
--eval "$kde_cv_defines_imake"
--AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
--AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+AC_ARG_WITH(x-binaries-dir,
-+ [AS_HELP_STRING(--with-x-binaries-dir=DIR,
-+ [set the location of X binaries for KDM])],
-+ [], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
-+
-+AC_ARG_WITH(x-libraries-dir,
-+ [AS_HELP_STRING(--with-x-libraries-dir=DIR,
-+ [set the location of X libraries for KDM])],
-+ [], [with_x_libraries_dir=$kde_x_libraries])
-+
-+AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
-+
-+AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
-
- if test -f /etc/ttys; then
- AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
+++ /dev/null
-diff -Nur kdebase-3.4.3.orig/kdm/backend/xdmcp.c kdebase-3.4.3/kdm/backend/xdmcp.c
---- kdebase-3.4.3.orig/kdm/backend/xdmcp.c 2005-10-05 15:39:11.000000000 +0200
-+++ kdebase-3.4.3/kdm/backend/xdmcp.c 2005-10-18 15:30:05.000000000 +0200
-@@ -940,7 +940,12 @@
- }
- DisposeProtoDisplay( pdpy );
- Debug( "starting display %s,%s\n", d->name, d->class2 );
-- StartDisplay( d );
-+ if (LoadDisplayResources( d ) < 0) {
-+ LogError( "Unable to read configuration for display %s; "
-+ "stopping it.\n", d->name );
-+ StopDisplay( d );
-+ } else
-+ StartDisplay( d );
- CloseGetter();
- }
- }
+++ /dev/null
---- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp 2006/06/21 08:56:19 553501
-+++ branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp 2006/07/26 08:18:37 566466
-@@ -112,6 +112,14 @@
- DBusError error;
- dbus_error_init(&error);
- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
-+
-+ if (!dbus_connection || dbus_error_is_set(&error)) {
-+ dbus_error_free(&error);
-+ libhal_ctx_free(m_halContext);
-+ m_halContext = NULL;
-+ return false;
-+ }
-+
- dbus_bus_register(dbus_connection, &error);
-
- if (dbus_error_is_set(&error)) {
+++ /dev/null
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
- access.c \
- auth.c \
-Index: kdebase-3.5.3/kdm/backend/xdmcp.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/xdmcp.c
-+++ kdebase-3.5.3/kdm/backend/xdmcp.c
-@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from
- int family;
- int length;
-
-- family = ConvertAddr( (XdmcpNetaddr)from, &length, (char **)&(addr.data) );
-+ family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
- addr.length = length; /* convert int to short */
- Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
- family, addr.length, addr.data );
-Index: kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/kfrontend/kdm_config.c
-+++ kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-@@ -733,7 +733,7 @@ CvtValue( Ent *et, Value *retval, int va
- }
- }
- retval->ptr = 0;
-- if (sscanf( buf, "%li", (long *)&retval->ptr ) != 1)
-+ if (sscanf( buf, "%li", &retval->ptr ) != 1)
- return "integer";
- return 0;
- case C_TYPE_STR:
+++ /dev/null
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
- access.c \
- auth.c \
+++ /dev/null
-Index: kdebase-3.5.1/konsole/konsole/konsole.cpp
-===================================================================
---- kdebase-3.5.1.orig/konsole/konsole/konsole.cpp
-+++ kdebase-3.5.1/konsole/konsole/konsole.cpp
-@@ -3619,6 +3619,21 @@ void Konsole::detachSession(TESession* _
- sessions.remove(_se);
- delete ra;
-
-+ if ( _se->isMasterMode() ) {
-+ // Disable master mode when detaching master
-+ setMasterMode(false);
-+ } else {
-+ QPtrListIterator<TESession> from_it(sessions);
-+ for(; from_it.current(); ++from_it) {
-+ TESession *from = from_it.current();
-+ if(from->isMasterMode())
-+ disconnect(from->widget(), SIGNAL(keyPressedSignal(QKeyEvent*)),
-+ _se->getEmulation(), SLOT(onKeyPress(QKeyEvent*)));
-+ }
-+ }
-+
-+ disconnect(0, 0, _se->getEmulation(), SLOT(onKeyPress(QKeyEvent*)));
-+
- QColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
-
- disconnect( _se,SIGNAL(done(TESession*)),
+++ /dev/null
---- kdebase/kwin/kcmkwin/kwinrules/Makefile.am.orig 2006-05-10 09:14:29.000000000 -0400
-+++ kdebase/kwin/kcmkwin/kwinrules/Makefile.am 2006-05-10 09:14:55.000000000 -0400
-@@ -16,12 +16,12 @@
- kcm_kwinrules_la_SOURCES = kcm.cpp
- kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- kcm_kwinrules_la_LIBADD = libkwinrules.la
--kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h
-+kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
-
- kwin_rules_dialog_la_SOURCES = main.cpp
- kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- kwin_rules_dialog_la_LIBADD = libkwinrules.la
--kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h
-+kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
-
- messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
+++ /dev/null
-Index: nsplugins/viewer/nsplugin.cpp
-===================================================================
---- nsplugins/viewer/nsplugin.cpp (revision 565997)
-+++ nsplugins/viewer/nsplugin.cpp (revision 565998)
-@@ -1602,6 +1602,12 @@
- return true;
- }
-
-+void NSPluginStreamBase::updateURL( const KURL& newURL )
-+{
-+ _url = newURL;
-+ free(const_cast<char*>(_stream->url));
-+ _stream->url = strdup(_url.url().ascii());
-+}
-
- int NSPluginStreamBase::process( const QByteArray &data, int start )
- {
-@@ -1824,6 +1830,8 @@
- SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
- connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
- SLOT(mimetype(KIO::Job *, const QString &)));
-+ connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
-+ SLOT(redirection(KIO::Job *, const KURL&)));
- }
-
- return false;
-@@ -1847,6 +1855,8 @@
- SLOT(totalSize(KIO::Job *, KIO::filesize_t)));
- connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
- SLOT(mimetype(KIO::Job *, const QString &)));
-+ connect(_job, SIGNAL(redirection(KIO::Job *, const KURL&)),
-+ SLOT(redirection(KIO::Job *, const KURL&)));
- }
-
- return false;
-@@ -1863,6 +1873,11 @@
- }
- }
-
-+void NSPluginStream::redirection(KIO::Job * /*job*/, const KURL& url)
-+{
-+ updateURL( url );
-+}
-+
- void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size)
- {
- kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size) << endl;
-Index: nsplugins/viewer/nsplugin.h
-===================================================================
---- nsplugins/viewer/nsplugin.h (revision 565997)
-+++ nsplugins/viewer/nsplugin.h (revision 565998)
-@@ -85,6 +85,7 @@
- bool create( const QString& url, const QString& mimeType, void *notify, bool forceNotify = false );
- int tries() { return _tries; }
- void inform( );
-+ void updateURL( const KURL& newURL );
-
- class NSPluginInstance *_instance;
- uint16 _streamType;
-@@ -126,6 +127,7 @@
- void totalSize(KIO::Job *job, KIO::filesize_t size);
- void mimetype(KIO::Job * job, const QString &mimeType);
- void result(KIO::Job *job);
-+ void redirection(KIO::Job *job, const KURL& url);
- void resume();
-
- protected:
+++ /dev/null
-# 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.5-r2.ebuild,v 1.4 2007/01/05 16:56:10 flameeyes Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama kdehiddenvisibility"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
- >=media-libs/freetype-2
- media-libs/fontconfig
- pam? ( kde-base/kdebase-pam )
- >=dev-libs/cyrus-sasl-2
- ldap? ( >=net-nds/openldap-2 )
- cups? ( net-print/cups )
- ssl? ( dev-libs/openssl )
- 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.90 >=sys-apps/dbus-0.34 ) )
- =sys-apps/hal-0.5* )
- zeroconf? ( net-misc/mDNSResponder )
- xcomposite? ( || ( (
- x11-libs/libXcomposite
- x11-libs/libXdamage
- ) <x11-base/xorg-x11-7 )
- )
- || ( (
- 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 )
- ) <virtual/x11-7 )"
-
-RDEPEND="${DEPEND}
- sys-apps/usbutils
- java? ( >=virtual/jre-1.4 )
- kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
- || ( (
- x11-apps/xmessage
- x11-apps/xsetroot
- x11-apps/xset
- x11-apps/xrandr
- x11-apps/mkfontdir
- x11-apps/xinit
- || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
- x11-apps/setxkbmap
- x11-apps/xprop
- ) <virtual/x11-7 )"
-
-DEPEND="${DEPEND}
- xcomposite? ( || ( (
- x11-proto/compositeproto
- x11-proto/damageproto
- ) <x11-base/xorg-x11-7 )
- )
- || ( (
- xscreensaver? ( x11-proto/scrnsaverproto )
- xinerama? ( x11-proto/xineramaproto )
- x11-apps/bdftopcf
- ) <virtual/x11-7 )
- dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
- ${FILESDIR}/kdebase-kioslaves-3.5.5-fstab.patch
- ${FILESDIR}/kwin-3.5.5-input-shape.patch
- ${FILESDIR}/nsplugins-3.5.5-npapi-64bit.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"
- 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"
-}
-
-src_compile() {
- local myconf="--with-dpms
- $(use_with arts) $(use_with ldap)
- $(use_with opengl gl) $(use_with ssl)
- $(use_with samba) $(use_with openexr)
- $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
- $(use_with ieee1394 libraw1394) $(use_with hal)
- $(use_enable zeroconf dnssd)
- $(use_with xcomposite composite)
- $(use_with xscreensaver)
- $(use_with xinerama)
- --with-usbids=/usr/share/misc/usb.ids"
-
- if use pam; then
- myconf="${myconf} --with-pam=yes"
- else
- myconf="${myconf} --with-pam=no --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 "${FILESDIR}/agent-startup.sh"
-
- exeinto ${KDEDIR}/shutdown
- doexe "${FILESDIR}/agent-shutdown.sh"
-
- # freedesktop environment variables
- cat <<EOF > "${T}/xdg.sh"
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-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"
-}
-
-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
-}
+++ /dev/null
-# 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.ebuild,v 1.6 2007/01/25 18:53:12 flameeyes Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama kdehiddenvisibility"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND=">=media-libs/freetype-2
- media-libs/fontconfig
- pam? ( kde-base/kdebase-pam )
- >=dev-libs/cyrus-sasl-2
- ldap? ( >=net-nds/openldap-2 )
- cups? ( net-print/cups )
- ssl? ( dev-libs/openssl )
- 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.90 >=sys-apps/dbus-0.34 ) )
- =sys-apps/hal-0.5* )
- zeroconf? ( net-misc/mDNSResponder )
- xcomposite? ( || ( (
- x11-libs/libXcomposite
- x11-libs/libXdamage
- ) <x11-base/xorg-x11-7 )
- )
- || ( (
- 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 )
- ) <virtual/x11-7 )"
-
-RDEPEND="${DEPEND}
- sys-apps/usbutils
- java? ( >=virtual/jre-1.4 )
- kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
- || ( (
- x11-apps/xmessage
- x11-apps/xsetroot
- x11-apps/xset
- x11-apps/xrandr
- x11-apps/mkfontdir
- x11-apps/xinit
- || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
- x11-apps/setxkbmap
- x11-apps/xprop
- ) <virtual/x11-7 )"
-
-DEPEND="${DEPEND}
- xcomposite? ( || ( (
- x11-proto/compositeproto
- x11-proto/damageproto
- ) <x11-base/xorg-x11-7 )
- )
- || ( (
- xscreensaver? ( x11-proto/scrnsaverproto )
- xinerama? ( x11-proto/xineramaproto )
- x11-apps/bdftopcf
- ) <virtual/x11-7 )
- dev-util/pkgconfig"
-
-need-kde 3.5.6
-
-PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
- ${FILESDIR}/nsplugins-3.5.5-npapi-64bit.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"
- 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"
-}
-
-src_compile() {
- local myconf="--with-dpms $(use_with ldap)
- $(use_with opengl gl) $(use_with ssl)
- $(use_with samba) $(use_with openexr)
- $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
- $(use_with ieee1394 libraw1394) $(use_with hal)
- $(use_enable zeroconf dnssd)
- $(use_with xcomposite composite)
- $(use_with xscreensaver)
- $(use_with xinerama) $(use_with pam)
- --with-usbids=/usr/share/misc/usb.ids"
-
- 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 "${FILESDIR}/agent-startup.sh"
-
- exeinto ${KDEDIR}/shutdown
- doexe "${FILESDIR}/agent-shutdown.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"
-}
-
-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
-}
# ChangeLog for kde-base/kdelibs
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.409 2007/01/28 11:29:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.410 2007/01/28 11:59:14 flameeyes Exp $
+
+ 28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ -files/kdelibs-3.4.3-inttypes.patch, -files/post-3.4.3-kdelibs-kjs.diff,
+ -files/kde3-dcopidlng.patch, -files/kdelibs-3.4.1-configure.patch,
+ -kdelibs-3.5.5-r6.ebuild, -kdelibs-3.5.6.ebuild:
+ Remove old versions and a bunch of files that are orphaned for quite a while
+ now.
*kdelibs-3.5.6-r1 (28 Jan 2007)
+++ /dev/null
-MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
-RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
-SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
-MD5 2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 15486690
-RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 kdelibs-3.5.5.tar.bz2 15486690
-SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 kdelibs-3.5.5.tar.bz2 15486690
+++ /dev/null
-MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
-RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
-SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
-MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
-RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
-SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
-MD5 e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 15509460
-RMD160 ce8c088e13f0e59238719600da9c768eac58b57d kdelibs-3.5.6.tar.bz2 15509460
-SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c kdelibs-3.5.6.tar.bz2 15509460
+++ /dev/null
---- dcop/dcopidlng/dcopidlng.orig 2005-03-01 18:33:22.000000000 +0100
-+++ dcop/dcopidlng/dcopidlng 2005-03-01 18:50:16.000000000 +0100
-@@ -1,13 +1,15 @@
- #!/bin/sh
-+
-+trap "rm -f dcopidlng.stderr.$$" 0 1 2 15
-+
- if test -z "$KDECONFIG"; then
- KDECONFIG=kde-config
- fi
- LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
--perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>/tmp/dcopidlng.stderr.$$
-+perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
- RET=$?
- if [ $RET -ne 0 ]
- then
-- cat /tmp/dcopidlng.stderr.$$ >&2
-+ cat dcopidlng.stderr.$$ >&2
- fi
--rm /tmp/dcopidlng.stderr.$$
- exit $RET
+++ /dev/null
-diff -Nur kdelibs-3.4.1.orig/configure.in.in kdelibs-3.4.1/configure.in.in
---- kdelibs-3.4.1.orig/configure.in.in 2005-05-23 14:17:19.000000000 +0200
-+++ kdelibs-3.4.1/configure.in.in 2005-06-05 21:10:19.000000000 +0200
-@@ -324,11 +324,19 @@
- AC_DEFINE_UNQUOTED(KDE_DISTRIBUTION_TEXT, "$kde_distribution_text", [Distribution Text to append to OS])
- AC_MSG_RESULT($kde_distribution_text)
-
--kde_have_utempter=yes
--AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
--AC_SUBST(LIBUTEMPTER)
--if test "$kde_have_utempter" = "yes"; then
-- AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
-+AC_ARG_WITH(utempter,
-+[AS_HELP_STRING([--with-utempter], [use utempter for utmp management @<:@default=check@:>@])],
-+[], with_utempter=check)
-+if test "x$with_utempter" != xno; then
-+ kde_have_utempter=yes
-+ AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-+ AC_SUBST(LIBUTEMPTER)
-+ if test "$kde_have_utempter" = "yes"; then
-+ AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
-+ fi
-+ if test "x$with_utempter" != xcheck && test "x$kde_have_utempter" != xyes; then
-+ AC_MSG_FAILURE([--with-utempter was given, but test for utempter failed])
-+ fi
- fi
-
- KDE_INIT_DOXYGEN([The KDE API Reference], [Version $VERSION])
-diff -Nur kdelibs-3.4.1.orig/kdecore/configure.in.in kdelibs-3.4.1/kdecore/configure.in.in
---- kdelibs-3.4.1.orig/kdecore/configure.in.in 2005-05-23 14:16:21.000000000 +0200
-+++ kdelibs-3.4.1/kdecore/configure.in.in 2005-06-05 21:10:32.000000000 +0200
-@@ -42,12 +42,21 @@
- dnl Test for libidn (IDNA support)
- dnl -------
-
-+AC_ARG_WITH(libidn,
-+ [AS_HELP_STRING(--with-libidn,
-+ [enable support for libidn @<:@default=check@:>@])],
-+ [], with_libidn=check)
- LIB_IDN=
--KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
-- AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
-- LIB_IDN=-lidn
--])
--AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
-+if test "x$with_libidn" != xno; then
-+ AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
-+ KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
-+ AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
-+ LIB_IDN=-lidn
-+ ])
-+ if test "x$with_libidn" != xcheck && test -z "$LIB_IDN"; then
-+ AC_MSG_FAILURE([--with-libidn was given, but test for libidn failed])
-+ fi
-+fi
- AC_SUBST(LIB_IDN)
-
- dnl --------
-@@ -164,30 +173,40 @@
-
- SVGICONS=
-
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
-- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-- if test -n "$vers" && test "$vers" -ge 2003008
-- then
-- LIBART_LIBS="`$LIBART_CONFIG --libs`"
-- LIBART_RPATH=
-- for args in $LIBART_LIBS; do
-+AC_ARG_WITH(libart,
-+ [AS_HELP_STRING(--with-libart,
-+ [enable support for libart @<:@default=check@:>@])],
-+ [], with_libart=check)
-+
-+if test "x$with_libart" != xno; then
-+ KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-+ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-+ ])
-+
-+ if test -n "$LIBART_CONFIG"; then
-+ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+ if test -n "$vers" && test "$vers" -ge 2003008
-+ then
-+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
-+ LIBART_RPATH=
-+ for args in $LIBART_LIBS; do
- case $args in
- -L*)
- LIBART_RPATH="$LIBART_RPATH $args"
- ;;
- esac
-- done
-- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-- SVGICONS=svgicons
--
-- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-- else
-- AC_MSG_WARN([You need at least libart 2.3.8])
-+ done
-+ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
-+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
-+ SVGICONS=svgicons
-+
-+ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
-+ else
-+ AC_MSG_WARN([You need at least libart 2.3.8])
-+ fi
-+ fi
-+ if test "x$with_libart" != xcheck && test -z "$LIBART_LIBS"; then
-+ AC_MSG_FAILURE([--with-libart was given, but test for libart failed])
- fi
- fi
-
+++ /dev/null
---- kdelibs-3.4.3/kwallet/backend/sha1.cc.orig 2005-10-18 10:18:33.000000000 -0700
-+++ kdelibs-3.4.3/kwallet/backend/sha1.cc 2005-10-18 10:20:53.000000000 -0700
-@@ -25,6 +25,9 @@
- #ifdef HAVE_SYS_BITYPES_H
- #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
- #endif
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-
- #include "sha1.h"
- #include <string.h>
+++ /dev/null
-Index: kjs/function.cpp
-===================================================================
---- kjs/function.cpp (revision 495921)
-+++ kjs/function.cpp (working copy)
-@@ -77,7 +77,8 @@ UString encodeURI(ExecState *exec, UStri
- }
- else if (C.uc >= 0xD800 && C.uc <= 0xDBFF) {
-
-- if (k == string.size()) {
-+ // we need two chars
-+ if (k + 1 >= string.size()) {
- Object err = Error::create(exec,URIError);
- exec->setException(err);
- free(encbuf);
-@@ -197,6 +198,10 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- k += 2;
-+
-+ if (decbufLen+2 >= decbufAlloc)
-+ decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-+
- if ((B & 0x80) == 0) {
- // Single-byte character
- C = B;
-@@ -257,6 +262,12 @@ UString decodeURI(ExecState *exec, UStri
- assert(n == 4);
- unsigned long uuuuu = ((octets[0] & 0x07) << 2) | ((octets[1] >> 4) & 0x03);
- unsigned long vvvv = uuuuu-1;
-+ if (vvvv > 0x0F) {
-+ Object err = Error::create(exec,URIError);
-+ exec->setException(err);
-+ free(decbuf);
-+ return UString();
-+ }
- unsigned long wwww = octets[1] & 0x0F;
- unsigned long xx = (octets[2] >> 4) & 0x03;
- unsigned long yyyy = octets[2] & 0x0F;
-@@ -270,9 +281,7 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- if (reservedSet.find(C) < 0) {
-- if (decbufLen+1 >= decbufAlloc)
-- decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-- decbuf[decbufLen++] = C;
-+ decbuf[decbufLen++] = C;
- }
- else {
- while (decbufLen+k-start >= decbufAlloc)
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild,v 1.9 2007/01/19 10:05:02 flameeyes Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
- mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
-zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-
-# Added aspell-en as dependency to work around bug 131512.
-RDEPEND="$(qt_min_version 3.3.3)
- arts? ( ~kde-base/arts-${PV} )
- app-arch/bzip2
- >=media-libs/freetype-2
- media-libs/fontconfig
- >=dev-libs/libxslt-1.1.16
- >=dev-libs/libxml2-2.6.6
- >=dev-libs/libpcre-4.2
- media-libs/libart_lgpl
- net-dns/libidn
- acl? ( kernel_linux? ( sys-apps/acl ) )
- ssl? ( >=dev-libs/openssl-0.9.7d )
- alsa? ( media-libs/alsa-lib )
- cups? ( >=net-print/cups-1.1.19 )
- tiff? ( media-libs/tiff )
- kerberos? ( virtual/krb5 )
- jpeg2k? ( media-libs/jasper )
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
- fam? ( virtual/fam )
- virtual/ghostscript
- utempter? ( sys-libs/libutempter )
- !kde-base/kde-env
- lua? ( dev-lang/lua )
- spell? ( app-text/aspell app-dicts/aspell-en
- linguas_he? ( >=app-text/hspell-1.0 ) )"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
- || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
-
-PDEPEND="zeroconf? ( avahi? ( kde-misc/kdnssd-avahi ) )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
- if use legacyssl ; then
- echo ""
- elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
- elog "sites, but breaks others instead. It is strongly discouraged to use it."
- elog "For more information, see bug #128922."
- echo ""
- fi
- if ! use utempter ; then
- echo ""
- elog "On some setups that relies on the correct update of utmp records, not using"
- elog "utempter might not update them correctly. If you experience unexpected"
- elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
- echo ""
- fi
-
- if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
- eerror "The alsa USE flag in this package enables ALSA support"
- eerror "for libkmid, KDE midi library."
- eerror "For this reason, you have to merge media-libs/alsa-lib"
- eerror "with the midi USE flag enabled, or disable alsa USE flag"
- eerror "for this package."
- die "Missing midi USE flag on media-libs/alsa-lib"
- fi
-}
-
-src_unpack() {
- kde_src_unpack
- if use legacyssl ; then
- # This patch won't be included upstream, see bug #128922
- epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch" || die "Patch did not apply."
- fi
-
- # Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
- # bug #135409), which corrects a nasty regression in the cstyle indenter.
- epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
-
- # Fix kdeprint timeout when trying to connect to cupsd. Bug #151261.
- epatch "${FILESDIR}/${P}-kdeprint-cupsd-timeout-fix.patch"
-
- # Fix rendering (see upstream bug #135639).
- epatch "${FILESDIR}/${P}-khtml.patch"
-
- # Allow notification with arts disabled
- epatch "${FILESDIR}/${P}-noarts.patch"
- epatch "${FILESDIR}/${P}-noarts-2.patch"
-}
-
-src_compile() {
- rm -f "${S}/configure"
-
- myconf="--with-distribution=Gentoo --disable-fast-malloc
- $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
- --with-libart --with-libidn
- $(use_with acl) $(use_with ssl)
- $(use_with alsa) $(use_with arts)
- $(use_with kerberos gssapi) $(use_with tiff)
- $(use_with jpeg2k jasper) $(use_with openexr)
- $(use_enable cups)
- $(use_with utempter) $(use_with lua)
- $(use_enable kernel_linux sendfile) --enable-mitshm
- $(use_with spell aspell)"
-
- if use zeroconf && ! use avahi; then
- myconf="${myconf} --enable-dnssd"
- else
- myconf="${myconf} --disable-dnssd"
- fi
-
- if use spell; then
- myconf="${myconf} $(use_with linguas_he hspell)"
- else
- myconf="${myconf} --without-hspell"
- fi
-
- if has_version x11-apps/rgb; then
- myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
- fi
-
- # fix bug 58179, bug 85593
- # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
- # closer look... - corsair
- use ppc64 && append-flags "-mminimal-toc"
-
- # work around bug #120858, gcc 3.4.x -Os miscompilation
- use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
- export BINDNOW_FLAGS="$(bindnow-flags)"
-
- kde_src_compile
-
- if use doc; then
- make apidox || die
- fi
-}
-
-src_install() {
- kde_src_install
-
- if use doc; then
- make DESTDIR="${D}" install-apidox || die
- fi
-
- # Needed to create lib -> lib64 symlink for amd64 2005.0 profile
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
- fi
-
- # Get rid of the disabled version of the kdnsd libraries
- if use zeroconf && use avahi; then
- rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
- fi
-
- dodir /etc/env.d
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${PREFIX}/${libdir}"
- done
-
- cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="${PREFIX}:/usr:/usr/local"
-#KDE_IS_PRELINKED=1
-EOF
-}
-
-pkg_postinst() {
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
- elog "is running. Make sure also that multicast dns lookups are enabled by editing"
- elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
- elog " hosts: files mdns dns"
- echo
- fi
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6.ebuild,v 1.4 2007/01/19 17:20:26 flameeyes Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
- mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2
- mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
-zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-
-# Added aspell-en as dependency to work around bug 131512.
-RDEPEND="$(qt_min_version 3.3.3)
- arts? ( >=kde-base/arts-3.5.5 )
- app-arch/bzip2
- >=media-libs/freetype-2
- media-libs/fontconfig
- >=dev-libs/libxslt-1.1.16
- >=dev-libs/libxml2-2.6.6
- >=dev-libs/libpcre-4.2
- media-libs/libart_lgpl
- net-dns/libidn
- acl? ( kernel_linux? ( sys-apps/acl ) )
- ssl? ( >=dev-libs/openssl-0.9.7d )
- alsa? ( media-libs/alsa-lib )
- cups? ( >=net-print/cups-1.1.19 )
- tiff? ( media-libs/tiff )
- kerberos? ( virtual/krb5 )
- jpeg2k? ( media-libs/jasper )
- openexr? ( >=media-libs/openexr-1.2.2-r2 )
- zeroconf? ( !avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
- fam? ( virtual/fam )
- virtual/ghostscript
- utempter? ( sys-libs/libutempter )
- !kde-base/kde-env
- lua? ( dev-lang/lua )
- spell? ( app-text/aspell app-dicts/aspell-en
- linguas_he? ( >=app-text/hspell-1.0 ) )"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
- || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
-
-PDEPEND="zeroconf? ( avahi? ( kde-misc/kdnssd-avahi ) )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
- if use legacyssl ; then
- echo ""
- elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
- elog "sites, but breaks others instead. It is strongly discouraged to use it."
- elog "For more information, see bug #128922."
- echo ""
- fi
- if ! use utempter ; then
- echo ""
- elog "On some setups that relies on the correct update of utmp records, not using"
- elog "utempter might not update them correctly. If you experience unexpected"
- elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
- echo ""
- fi
-
- if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
- eerror "The alsa USE flag in this package enables ALSA support"
- eerror "for libkmid, KDE midi library."
- eerror "For this reason, you have to merge media-libs/alsa-lib"
- eerror "with the midi USE flag enabled, or disable alsa USE flag"
- eerror "for this package."
- die "Missing midi USE flag on media-libs/alsa-lib"
- fi
-}
-
-src_unpack() {
- kde_src_unpack
- if use legacyssl ; then
- # This patch won't be included upstream, see bug #128922
- epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
- fi
-
- # xinerama patch from Lubos Lunak
- # http://ktown.kde.org/~seli/xinerama/
- epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
- rm -f "${S}/configure"
-
- myconf="--with-distribution=Gentoo --disable-fast-malloc
- $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
- --with-libart --with-libidn
- $(use_with acl) $(use_with ssl)
- $(use_with alsa) $(use_with arts)
- $(use_with kerberos gssapi) $(use_with tiff)
- $(use_with jpeg2k jasper) $(use_with openexr)
- $(use_enable cups)
- $(use_with utempter) $(use_with lua)
- $(use_enable kernel_linux sendfile) --enable-mitshm
- $(use_with spell aspell)"
-
- if use zeroconf && ! use avahi; then
- myconf="${myconf} --enable-dnssd"
- else
- myconf="${myconf} --disable-dnssd"
- fi
-
- if use spell; then
- myconf="${myconf} $(use_with linguas_he hspell)"
- else
- myconf="${myconf} --without-hspell"
- fi
-
- if has_version x11-apps/rgb; then
- myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
- fi
-
- # fix bug 58179, bug 85593
- # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
- # closer look... - corsair
- use ppc64 && append-flags "-mminimal-toc"
-
- # work around bug #120858, gcc 3.4.x -Os miscompilation
- use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
- export BINDNOW_FLAGS="$(bindnow-flags)"
-
- kde_src_compile
-
- if use doc; then
- make apidox || die
- fi
-}
-
-src_install() {
- kde_src_install
-
- if use doc; then
- make DESTDIR="${D}" install-apidox || die
- fi
-
- # Needed to create lib -> lib64 symlink for amd64 2005.0 profile
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
- fi
-
- # Get rid of the disabled version of the kdnsd libraries
- if use zeroconf && use avahi; then
- rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
- fi
-
- dodir /etc/env.d
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${PREFIX}/${libdir}"
- done
-
- cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="${PREFIX}:/usr:/usr/local"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-XDG_CONFIG_DIRS="${PREFIX}/etc/xdg"
-COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"
-EOF
-}
-
-pkg_postinst() {
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
- elog "is running. Make sure also that multicast dns lookups are enabled by editing"
- elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
- elog " hosts: files mdns dns"
- echo
- fi
-}
projects / gentoo.git / commitdiff