diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-14 09:33:24 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-14 09:33:24 +0000 |
commit | 5980088141d71127ca5daaf0638a5a34a95a12d9 (patch) | |
tree | 331185ac3b69491af0d22199d677114cc991df8b /kde-base | |
parent | Marked ppc-macos stable for bug #118831 (diff) | |
download | historical-5980088141d71127ca5daaf0638a5a34a95a12d9.tar.gz historical-5980088141d71127ca5daaf0638a5a34a95a12d9.tar.bz2 historical-5980088141d71127ca5daaf0638a5a34a95a12d9.zip |
Use patch from tarball in mirrors.
Package-Manager: portage-2529-svn
Diffstat (limited to 'kde-base')
40 files changed, 158 insertions, 364 deletions
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog index 7138d64adfdf..7da4024479c5 100644 --- a/kde-base/kcheckpass/ChangeLog +++ b/kde-base/kcheckpass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kcheckpass -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.37 2005/12/17 10:12:18 corsair Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.38 2006/01/14 09:24:55 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kcheckpass-3.5.0-bindnow.patch, kcheckpass-3.5.0.ebuild: + Use patch from tarball in mirrors. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> kcheckpass-3.5.0.ebuild: Added ~ppc64 diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest index d6f97a5704bc..0b557ea84833 100644 --- a/kde-base/kcheckpass/Manifest +++ b/kde-base/kcheckpass/Manifest @@ -1,11 +1,10 @@ MD5 223e7643897bcd25fa9328acd2827b15 ChangeLog 4948 -MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517 -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529 -MD5 48607d84b834a766c76bd0be7dbd6c63 kcheckpass-3.4.3.ebuild 523 -MD5 d8b71179546b256ff276f4963198b7f9 kcheckpass-3.5.0.ebuild 693 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcheckpass-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcheckpass-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcheckpass-3.4.3 68 -MD5 d57023f742587584d5493144970b07c6 files/kcheckpass-3.5.0-bindnow.patch 574 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcheckpass-3.5.0 68 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kcheckpass-3.5.0 142 +MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517 +MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529 +MD5 48607d84b834a766c76bd0be7dbd6c63 kcheckpass-3.4.3.ebuild 523 +MD5 3954f629b3aa70afe53f1e07c98b8474 kcheckpass-3.5.0.ebuild 852 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 diff --git a/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0 b/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0 +++ b/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch b/kde-base/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch deleted file mode 100644 index b04cfb37a2b2..000000000000 --- a/kde-base/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kdebase-3.5.0/kcheckpass/Makefile.am -=================================================================== ---- kdebase-3.5.0.orig/kcheckpass/Makefile.am -+++ kdebase-3.5.0/kcheckpass/Makefile.am -@@ -10,7 +10,7 @@ kcheckpass_SOURCES = kcheckpass.c \ - checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \ - checkpass_osfc2passwd.c checkpass_aix.c - kcheckpass_LDADD = -lkdefakes $(PASSWDLIBS) $(LIBSOCKET) --kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) -+kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(BINDNOW_FLAGS) - - noinst_HEADERS = kcheckpass.h - diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild index 4c896197f261..4a6ca0e28fc2 100644 --- a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild +++ b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild @@ -1,18 +1,26 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.6 2005/12/17 10:12:18 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.7 2006/01/14 09:24:55 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils flag-o-matic +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="A simple password checker, used by any software in need of user authentication." KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="pam" DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )" -PATCHES="${FILESDIR}/${P}-bindnow.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-bindnow.patch" +} src_compile() { myconf="$(use_with pam)" diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog index 24b90feafc7f..d3400f254d83 100644 --- a/kde-base/kcontrol/ChangeLog +++ b/kde-base/kcontrol/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kcontrol -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.46 2005/12/31 21:42:41 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.47 2006/01/14 09:28:04 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kcontrol-3.5.0-global-usbids.patch, kcontrol-3.5.0.ebuild: + Use patch from tarball in mirrors. 31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> +files/kcontrol-3.5.0-global-usbids.patch, kcontrol-3.5.0.ebuild: diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest index 95c2b922e88f..47475eb54df7 100644 --- a/kde-base/kcontrol/Manifest +++ b/kde-base/kcontrol/Manifest @@ -5,8 +5,7 @@ MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcontrol-3.4.1-r1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2 287 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2-r1 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcontrol-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcontrol-3.5.0 68 -MD5 8f494976be0b5e5286f26d5ef7ee8d7d files/kcontrol-3.5.0-global-usbids.patch 1790 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kcontrol-3.5.0 142 MD5 5da6ade21525a3e320c94c4b3351a7a3 files/kdebase-3.4.1-configure.patch 2936 MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346 MD5 4a0b15f07ae8a1bc4c778165f7083a13 kcontrol-3.4.1-r1.ebuild 1551 @@ -14,5 +13,5 @@ MD5 8c071d64261cb5641d4f140ab61debd2 kcontrol-3.4.1.ebuild 1326 MD5 ac9c4ad066ae48aaee618b7f297f1768 kcontrol-3.4.2-r1.ebuild 1916 MD5 f6ddcb89e8d636e9dad86a9ff397928e kcontrol-3.4.2.ebuild 1779 MD5 ea2e76e8a64aa4ce995d6e1de2d17af4 kcontrol-3.4.3.ebuild 1773 -MD5 eb2b549afb6c18ab6faa671179b2c085 kcontrol-3.5.0.ebuild 1744 +MD5 f5a587797837449b99f43a3a1bdd8474 kcontrol-3.5.0.ebuild 1903 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.5.0 b/kde-base/kcontrol/files/digest-kcontrol-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kcontrol/files/digest-kcontrol-3.5.0 +++ b/kde-base/kcontrol/files/digest-kcontrol-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kcontrol/files/kcontrol-3.5.0-global-usbids.patch b/kde-base/kcontrol/files/kcontrol-3.5.0-global-usbids.patch deleted file mode 100644 index 9a04f685fc45..000000000000 --- a/kde-base/kcontrol/files/kcontrol-3.5.0-global-usbids.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: kcontrol/usbview/usbdb.cpp -=================================================================== ---- kcontrol/usbview/usbdb.cpp (revision 492938) -+++ kcontrol/usbview/usbdb.cpp (working copy) -@@ -8,6 +8,7 @@ - * * - ***************************************************************************/ - -+#include <config.h> - - #include <iostream> - -@@ -24,7 +25,11 @@ - - USBDB::USBDB() - { -+#ifndef USBIDS_FILE - QString db = locate("data", "kcmusb/usb.ids"); -+#else -+ QString db = USBIDS_FILE; -+#endif - if (db.isEmpty()) - return; - -Index: kcontrol/usbview/Makefile.am -=================================================================== ---- kcontrol/usbview/Makefile.am (revision 492938) -+++ kcontrol/usbview/Makefile.am (working copy) -@@ -14,6 +14,8 @@ - - xdg_apps_DATA = kcmusb.desktop - -+if install_usbids - usb_DATA = usb.ids - usbdir = $(kde_datadir)/kcmusb -+endif - -Index: kcontrol/usbview/configure.in.in -=================================================================== ---- kcontrol/usbview/configure.in.in (revision 492938) -+++ kcontrol/usbview/configure.in.in (working copy) -@@ -1,10 +1,16 @@ - case "$host" in -- *-*-linux*) -+ *-*-linux*|*-*-freebsd*) - FOUND_USBVIEW=yes - ;; -- *-*-freebsd*) -- FOUND_USBVIEW=yes -- ;; - esac - - AM_CONDITIONAL(include_kcontrol_usbview, test "$FOUND_USBVIEW" = "yes") -+ -+AC_ARG_WITH([usbids], AC_HELP_STRING([--with-usbids=PATH], [Use the usb.ids file at the specified path, instead of the local copy])) -+ -+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then -+ AC_DEFINE_UNQUOTED(USBIDS_FILE, "$with_usbids", [Path for the usb.ids file to use]) -+ dont_install_usbids="yes" -+fi -+ -+AM_CONDITIONAL(install_usbids, test "x$dont_install_usbids" != "xyes") diff --git a/kde-base/kcontrol/kcontrol-3.5.0.ebuild b/kde-base/kcontrol/kcontrol-3.5.0.ebuild index 182dad1072c3..9a4772f9a835 100644 --- a/kde-base/kcontrol/kcontrol-3.5.0.ebuild +++ b/kde-base/kcontrol/kcontrol-3.5.0.ebuild @@ -1,12 +1,15 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0.ebuild,v 1.6 2006/01/01 06:53:46 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0.ebuild,v 1.7 2006/01/14 09:28:04 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="The KDE Control Center" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="ssl arts ieee1394 logitech-mouse opengl" @@ -45,7 +48,12 @@ KMCOPYLIB="libkonq libkonq libtaskbar kicker/taskbar libtaskmanager kicker/taskmanager" -PATCHES="${FILESDIR}/${P}-global-usbids.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-global-usbids.patch" +} src_compile() { myconf="$myconf `use_with ssl` `use_with arts` `use_with opengl gl` diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog index 1398563e6247..54d9093f06ca 100644 --- a/kde-base/kdesktop/ChangeLog +++ b/kde-base/kdesktop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdesktop # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.38 2006/01/11 19:58:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.39 2006/01/14 09:30:59 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kdesktop-3.5.0-xscreensaver.patch, kdesktop-3.5.0.ebuild: + Use patch from tarball in mirrors. 11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> +files/kdesktop-3.5.0-xscreensaver.patch, kdesktop-3.5.0.ebuild: diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest index e42f26300035..a821a2c149ad 100644 --- a/kde-base/kdesktop/Manifest +++ b/kde-base/kdesktop/Manifest @@ -1,21 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 f6af49de9e7e82f8af02fd3d6fdccabb ChangeLog 4867 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesktop-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdesktop-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdesktop-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdesktop-3.5.0 68 -MD5 3825d839fdaeeb754564b3428ee92442 files/kdesktop-3.5.0-xscreensaver.patch 705 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdesktop-3.5.0 142 MD5 ffb8567a9ab217b33273996584a848f5 kdesktop-3.4.1.ebuild 1355 MD5 72704bb9b1063c9447f0101cb11d95b5 kdesktop-3.4.2.ebuild 1370 MD5 de979b633e1249d35a977c4e3b3000c5 kdesktop-3.4.3.ebuild 1364 -MD5 14cb68a2fcfa16f184a92fc32bcc4f47 kdesktop-3.5.0.ebuild 1544 +MD5 b696646cc96494eb820582cdc310479d kdesktop-3.5.0.ebuild 1703 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxWNdAiZjviIA2XgRAi9MAKDdTpYHvM0p9BjfJaDxo6vDuzOFnQCguo/Q -OP/yetCQ/l7uW5BFHe/1pBA= -=nT0w ------END PGP SIGNATURE----- diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.0 b/kde-base/kdesktop/files/digest-kdesktop-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kdesktop/files/digest-kdesktop-3.5.0 +++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch b/kde-base/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch deleted file mode 100644 index ee427436837b..000000000000 --- a/kde-base/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: kdebase-3.5.0/kdesktop/configure.in.in -=================================================================== ---- kdebase-3.5.0/kdesktop/configure.in.in (revision 497039) -+++ kdebase-3.5.0/kdesktop/configure.in.in (working copy) -@@ -3,7 +3,11 @@ - - LIB_XSS= - --KDE_CHECK_HEADER(X11/extensions/scrnsaver.h, -+AC_ARG_WITH([xscreensaver], -+ AS_HELP_STRING([--without-xscreensaver], [Disable XScreenSaver support (default: check)]) ) -+ -+if test "x$with_xscreensaver" != "xno"; then -+ KDE_CHECK_HEADER(X11/extensions/scrnsaver.h, - [ - AC_CHECK_LIB(Xext,XScreenSaverQueryInfo, - [ -@@ -29,6 +33,7 @@ - [ - #include <X11/Xlib.h> - ] ) -+fi - - AC_SUBST(LIB_XSS) - LDFLAGS="$xss_save_ldflags" diff --git a/kde-base/kdesktop/kdesktop-3.5.0.ebuild b/kde-base/kdesktop/kdesktop-3.5.0.ebuild index 659eb39aaf76..5be9a864e81d 100644 --- a/kde-base/kdesktop/kdesktop-3.5.0.ebuild +++ b/kde-base/kdesktop/kdesktop-3.5.0.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0.ebuild,v 1.5 2006/01/11 19:58:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0.ebuild,v 1.6 2006/01/14 09:30:59 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="The KDE desktop" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="xscreensaver" @@ -39,7 +42,12 @@ KMCOMPILEONLY="kcontrol/background kdmlib/" KMNODOCS=true -PATCHES="${FILESDIR}/${P}-xscreensaver.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-xscreensaver.patch" +} src_compile() { myconf="${myconf} $(use_with xscreensaver)" diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog index f43ffd8136d4..cb3834ae1df1 100644 --- a/kde-base/kdesu/ChangeLog +++ b/kde-base/kdesu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdesu -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.26 2005/12/17 09:33:31 corsair Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.27 2006/01/14 09:21:45 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kdesu-3.5.0-bindnow.patch, kdesu-3.5.0.ebuild: + Use patch from tarball in mirrors. 17 Dec 2005; Markus Rothe <corsair@gentoo.org> kdesu-3.5.0.ebuild: Added ~ppc64 diff --git a/kde-base/kdesu/Manifest b/kde-base/kdesu/Manifest index 112c1838ae47..3bf37e28abbe 100644 --- a/kde-base/kdesu/Manifest +++ b/kde-base/kdesu/Manifest @@ -1,7 +1,6 @@ MD5 e891ff400b1128fb142592b573242191 ChangeLog 3307 +MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesu-3.4.1 212 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdesu-3.5.0 142 MD5 a6da71a58b3249e90acd36fdd8dbeb64 kdesu-3.4.1.ebuild 390 +MD5 dd0466fca76ca76b2c27a3c13007f59a kdesu-3.5.0.ebuild 687 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 0f7e8395fcee0b912ec376c161f003d8 kdesu-3.5.0.ebuild 528 -MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesu-3.4.1 212 -MD5 09763d6f85e43dbedf65f713cb378ab7 files/kdesu-3.5.0-bindnow.patch 1112 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdesu-3.5.0 68 diff --git a/kde-base/kdesu/files/digest-kdesu-3.5.0 b/kde-base/kdesu/files/digest-kdesu-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kdesu/files/digest-kdesu-3.5.0 +++ b/kde-base/kdesu/files/digest-kdesu-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kdesu/files/kdesu-3.5.0-bindnow.patch b/kde-base/kdesu/files/kdesu-3.5.0-bindnow.patch deleted file mode 100644 index ada07222d868..000000000000 --- a/kde-base/kdesu/files/kdesu-3.5.0-bindnow.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: kdebase-3.5.0/kdesu/kdesu/Makefile.am -=================================================================== ---- kdebase-3.5.0.orig/kdesu/kdesu/Makefile.am -+++ kdebase-3.5.0/kdesu/kdesu/Makefile.am -@@ -5,7 +5,7 @@ INCLUDES= $(all_includes) - ## kdesu - bin_PROGRAMS = kdesu - kdesu_SOURCES = kdesu.cpp sudlg.cpp --kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS) - kdesu_LDADD = $(LIB_KIO) -lkdesu - kdesu_METASOURCES = AUTO - noinst_HEADERS = sudlg.h -Index: kdebase-3.5.0/kdesu/kdesud/Makefile.am -=================================================================== ---- kdebase-3.5.0.orig/kdesu/kdesud/Makefile.am -+++ kdebase-3.5.0/kdesu/kdesud/Makefile.am -@@ -6,7 +6,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE) - - bin_PROGRAMS = kdesud - kdesud_SOURCES = kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp --kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) -+kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS) - kdesud_LDADD = $(LIB_KDECORE) -lkdesu $(LIBSOCKET) - noinst_HEADERS = repo.h handler.h lexer.h secure.h - diff --git a/kde-base/kdesu/kdesu-3.5.0.ebuild b/kde-base/kdesu/kdesu-3.5.0.ebuild index 9d1040a96569..cc0f0cac68dd 100644 --- a/kde-base/kdesu/kdesu-3.5.0.ebuild +++ b/kde-base/kdesu/kdesu-3.5.0.ebuild @@ -1,17 +1,25 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5.0.ebuild,v 1.5 2005/12/17 09:33:31 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5.0.ebuild,v 1.6 2006/01/14 09:21:45 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils flag-o-matic +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="KDE: gui for su(1)" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -PATCHES="${FILESDIR}/${P}-bindnow.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-bindnow.patch" +} src_compile() { export BINDNOW_FLAGS="$(bindnow-flags)" diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog index ad6f44c5a62b..40a45aa46c19 100644 --- a/kde-base/kicker/ChangeLog +++ b/kde-base/kicker/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kicker # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.36 2006/01/11 20:21:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.37 2006/01/14 09:30:45 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kicker-3.5.0-composite.patch, kicker-3.5.0.ebuild: + Use patch from tarball in mirrors. 11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> +files/kicker-3.5.0-composite.patch, kicker-3.5.0.ebuild: diff --git a/kde-base/kicker/Manifest b/kde-base/kicker/Manifest index 2104d1c98003..6e9cda0b8354 100644 --- a/kde-base/kicker/Manifest +++ b/kde-base/kicker/Manifest @@ -1,22 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 bb2dafcbb68142b2b318c71d35824677 ChangeLog 4395 MD5 07e3f3f7982d29e2317f32f209e06573 files/applets-configure.in.in.diff 606 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kicker-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kicker-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kicker-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kicker-3.5.0 68 -MD5 b91aa3f99533b486954c5227dbdd758c files/kicker-3.5.0-composite.patch 1685 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kicker-3.5.0 142 MD5 3f169df7532dad28d299bdb3c4683484 kicker-3.4.1.ebuild 680 MD5 cc9e587f4748ebb5f8aadab99eba7b8f kicker-3.4.2.ebuild 693 MD5 b20ed87b60ff2dc2058c88eedbe44fec kicker-3.4.3.ebuild 687 -MD5 184b1ab7ac27a3a407ea71fc9d9ad73f kicker-3.5.0.ebuild 997 +MD5 e1198bfba572e675c3aeee10200313ad kicker-3.5.0.ebuild 1215 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxWjfAiZjviIA2XgRAr/GAJ9PW1ZsT22JeklTk5MyDqHXS8LNMgCdHHgQ -uq1XL2DZuVf9aD/UkGQNDxE= -=Qq/d ------END PGP SIGNATURE----- diff --git a/kde-base/kicker/files/digest-kicker-3.5.0 b/kde-base/kicker/files/digest-kicker-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kicker/files/digest-kicker-3.5.0 +++ b/kde-base/kicker/files/digest-kicker-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kicker/files/kicker-3.5.0-composite.patch b/kde-base/kicker/files/kicker-3.5.0-composite.patch deleted file mode 100644 index fb8543d9c6b6..000000000000 --- a/kde-base/kicker/files/kicker-3.5.0-composite.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: kicker/taskmanager/configure.in.in -=================================================================== ---- kicker/taskmanager/configure.in.in (revision 492938) -+++ kicker/taskmanager/configure.in.in (working copy) -@@ -1,14 +1,16 @@ --dnl XComposite check --KDE_CHECK_HEADER(X11/extensions/Xcomposite.h, [xcomposite_h=yes], [xcomposite_h=no], [#include <X11/Xlib.h>]) --if test "$xcomposite_h" = yes; then -- KDE_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [ -- LIB_XCOMPOSITE=-lXcomposite -- AC_DEFINE_UNQUOTED(HAVE_XCOMPOSITE, 1, [Define if you have the XComposite extension]) -- ], [], -lXext -X11 $X_EXTRA_LIBS) --else -- LIB_XCOMPOSITE= -+if test "x$with_composite" != "xno"; then -+ dnl XComposite check -+ KDE_CHECK_HEADER(X11/extensions/Xcomposite.h, [xcomposite_h=yes], [xcomposite_h=no], [#include <X11/Xlib.h>]) -+ if test "$xcomposite_h" = yes; then -+ KDE_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [ -+ LIB_XCOMPOSITE=-lXcomposite -+ AC_DEFINE_UNQUOTED(HAVE_XCOMPOSITE, 1, [Define if you have the XComposite extension]) -+ ], [], -lXext -X11 $X_EXTRA_LIBS) -+ else -+ LIB_XCOMPOSITE= -+ fi -+ AC_SUBST(LIB_XCOMPOSITE) - fi --AC_SUBST(LIB_XCOMPOSITE) - - dnl XFixes check - KDE_CHECK_HEADER(X11/extensions/Xfixes.h, [xfixes_h=yes], [xfixes_h=no], [#include <X11/Xlib.h>]) -Index: configure.in.in -=================================================================== ---- configure.in.in (revision 492938) -+++ configure.in.in (working copy) -@@ -275,3 +275,7 @@ - AC_SUBST(LIBART_LIBS) - AC_SUBST(LIBART_CFLAGS) - AC_SUBST(LIBART_RPATH) -+ -+AC_ARG_WITH([composite], -+ AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) ) -+ diff --git a/kde-base/kicker/kicker-3.5.0.ebuild b/kde-base/kicker/kicker-3.5.0.ebuild index a8311822421e..c74a708c5144 100644 --- a/kde-base/kicker/kicker-3.5.0.ebuild +++ b/kde-base/kicker/kicker-3.5.0.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0.ebuild,v 1.5 2006/01/11 20:21:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0.ebuild,v 1.6 2006/01/14 09:30:45 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="KDE panel housing varous applets" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="xcomposite" @@ -31,7 +34,13 @@ KMEXTRACTONLY="libkonq kdm/kfrontend/themer/" KMCOMPILEONLY="kdmlib/" -PATCHES="${FILESDIR}/${P}-composite.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/kdebase-${PV}-composite.patch" + epatch "${WORKDIR}/patches/${P}-composite.patch" +} src_compile() { myconf="$myconf $(use_with xcomposite composite)" diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog index d45c896ffe4a..fe7926c61037 100644 --- a/kde-base/ksplashml/ChangeLog +++ b/kde-base/ksplashml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/ksplashml # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.35 2006/01/11 23:49:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.36 2006/01/14 09:33:24 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/ksplashml-3.5.0-xinerama.patch, ksplashml-3.5.0.ebuild: + Use patch from tarball in mirrors. 11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> +files/ksplashml-3.5.0-xinerama.patch, ksplashml-3.5.0.ebuild: diff --git a/kde-base/ksplashml/Manifest b/kde-base/ksplashml/Manifest index 835652539e6c..88a70beedbc1 100644 --- a/kde-base/ksplashml/Manifest +++ b/kde-base/ksplashml/Manifest @@ -1,21 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 96e94e7f9bf51514bc4ee588cec500aa ChangeLog 4478 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksplashml-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksplashml-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksplashml-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-ksplashml-3.5.0 68 -MD5 623a9c0df1865e941d98a5a09a9ab3c9 files/ksplashml-3.5.0-xinerama.patch 951 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-ksplashml-3.5.0 142 MD5 74938eb37f676ad3d3846ae958978035 ksplashml-3.4.1.ebuild 450 MD5 b0a0fa51cd7386f08ac2e0d0c14ba792 ksplashml-3.4.2.ebuild 463 MD5 a075a3f05dbccef1380eccb0425a8c6e ksplashml-3.4.3.ebuild 457 -MD5 066b768b58b7928b865bd1e354ba4a3f ksplashml-3.5.0.ebuild 744 +MD5 10e863decf2ce5e3508fb016c3e7f121 ksplashml-3.5.0.ebuild 902 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxZmDAiZjviIA2XgRAn/uAKCDbV6k/ZTo/q3hXwPpp1eG3aPeBwCfbnys -PLeuHIAwpCa03IpdEst8ggU= -=t0Gt ------END PGP SIGNATURE----- diff --git a/kde-base/ksplashml/files/digest-ksplashml-3.5.0 b/kde-base/ksplashml/files/digest-ksplashml-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/ksplashml/files/digest-ksplashml-3.5.0 +++ b/kde-base/ksplashml/files/digest-ksplashml-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/ksplashml/files/ksplashml-3.5.0-xinerama.patch b/kde-base/ksplashml/files/ksplashml-3.5.0-xinerama.patch deleted file mode 100644 index 4b824247e89b..000000000000 --- a/kde-base/ksplashml/files/ksplashml-3.5.0-xinerama.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in -=================================================================== ---- kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in (revision 497108) -+++ kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in (working copy) -@@ -1,9 +1,13 @@ --xinerama_save_ldflags="$LDFLAGS" --LDFLAGS="$X_LDFLAGS" -- - LIB_XINERAMA= - --KDE_CHECK_HEADER(X11/extensions/Xinerama.h, -+AC_ARG_WITH([xinerama], -+ AS_HELP_STRING([--without-xinerama], [Disable xinerama extension support (default: check)]) ) -+ -+if test "x$with_xinerama" != "xno"; then -+ xinerama_save_ldflags="$LDFLAGS" -+ LDFLAGS="$X_LDFLAGS" -+ -+ KDE_CHECK_HEADER(X11/extensions/Xinerama.h, - [ - AC_CHECK_LIB(Xinerama,XineramaQueryExtension, - [ -@@ -17,5 +21,7 @@ - #include <X11/Xlib.h> - ] ) - --AC_SUBST(LIB_XINERAMA) --LDFLAGS="$xinerama_save_ldflags" -+ AC_SUBST(LIB_XINERAMA) -+ LDFLAGS="$xinerama_save_ldflags" -+fi -+ diff --git a/kde-base/ksplashml/ksplashml-3.5.0.ebuild b/kde-base/ksplashml/ksplashml-3.5.0.ebuild index e985d5460ab3..acae5368f15e 100644 --- a/kde-base/ksplashml/ksplashml-3.5.0.ebuild +++ b/kde-base/ksplashml/ksplashml-3.5.0.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0.ebuild,v 1.5 2006/01/11 23:49:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0.ebuild,v 1.6 2006/01/14 09:33:24 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="xinerama" @@ -16,11 +19,15 @@ RDEPEND="xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )" DEPEND="${RDEPEND} xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )" -PATCHES="${FILESDIR}/${P}-xinerama.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-xinerama.patch" +} src_compile() { myconf="${myconf} $(use_with xinerama)" kde-meta_src_compile } - diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog index 82847a4fe439..69bc695c73c8 100644 --- a/kde-base/kwin/ChangeLog +++ b/kde-base/kwin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kwin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.38 2006/01/11 19:24:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.39 2006/01/14 09:28:44 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kwin-3.5.0-composite.patch, kwin-3.5.0.ebuild: + Use patch from tarball in mirrors. 11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> +files/kwin-3.5.0-composite.patch, kwin-3.5.0.ebuild: diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest index 24165f6409dd..db38dc2e63e3 100644 --- a/kde-base/kwin/Manifest +++ b/kde-base/kwin/Manifest @@ -1,21 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 657fe5760ceb4e533484ab598a48436a ChangeLog 4565 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kwin-3.5.0 68 -MD5 72a291ae02f5fe8b283948c8f2aaea30 files/kwin-3.5.0-composite.patch 1158 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kwin-3.5.0 142 MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384 MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388 MD5 5767108ce048c3bc1caa8f5749250b9c kwin-3.4.3.ebuild 382 -MD5 4e14c0b89c86cc0f22908d29f27ba60c kwin-3.5.0.ebuild 781 +MD5 ea36fa3e34ea43c8b387c65053bddfc2 kwin-3.5.0.ebuild 999 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxVuhAiZjviIA2XgRAqaDAJwKCTyys6Xyow2XHtRPX5sKHW5s5wCfW8pZ -ilw5iBshxRcWkpZwwQ1VP8I= -=iGuM ------END PGP SIGNATURE----- diff --git a/kde-base/kwin/files/digest-kwin-3.5.0 b/kde-base/kwin/files/digest-kwin-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kwin/files/digest-kwin-3.5.0 +++ b/kde-base/kwin/files/digest-kwin-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kwin/files/kwin-3.5.0-composite.patch b/kde-base/kwin/files/kwin-3.5.0-composite.patch deleted file mode 100644 index c7f5dab275a0..000000000000 --- a/kde-base/kwin/files/kwin-3.5.0-composite.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdebase-3.5.0/kwin/kompmgr/configure.in.in -=================================================================== ---- kdebase-3.5.0/kwin/kompmgr/configure.in.in (revision 497003) -+++ kdebase-3.5.0/kwin/kompmgr/configure.in.in (working copy) -@@ -1,5 +1,11 @@ --compile_kompmgr=yes --KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) --KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) --KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) --AM_CONDITIONAL(include_kompmgr, test "$compile_kompmgr" = "yes" ) -+AC_ARG_WITH([composite], -+ AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) ) -+ -+if test "x$with_composite" != "xno"; then -+ KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) -+ KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) -+ KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>]) -+else -+ compile_kompmgr=no -+fi -+AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" ) diff --git a/kde-base/kwin/kwin-3.5.0.ebuild b/kde-base/kwin/kwin-3.5.0.ebuild index 74d147f63377..84aeb851e530 100644 --- a/kde-base/kwin/kwin-3.5.0.ebuild +++ b/kde-base/kwin/kwin-3.5.0.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.5 2006/01/11 19:24:57 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.6 2006/01/14 09:28:44 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="KDE window manager" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="xcomposite" @@ -22,7 +25,13 @@ DEPEND="${RDEPEND} ) <=x11-base/xorg-x11-6.9 ) )" -PATCHES="${FILESDIR}/${P}-composite.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/kdebase-${PV}-composite.patch" + epatch "${WORKDIR}/patches/${P}-composite.patch" +} src_compile() { myconf="$myconf $(use_with xcomposite composite)" diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog index fbd86ed7c6db..7c500c1c9459 100644 --- a/kde-base/kxkb/ChangeLog +++ b/kde-base/kxkb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kxkb # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.38 2006/01/02 17:05:50 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.39 2006/01/14 09:26:03 flameeyes Exp $ + + 14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kxkb-3.5.0-modularxkb.patch, kxkb-3.5.0.ebuild: + Use patch from tarball in mirrors. 02 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> files/kxkb-3.5.0-modularxkb.patch: diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest index 29474ad76a2f..3c4a9d6db433 100644 --- a/kde-base/kxkb/Manifest +++ b/kde-base/kxkb/Manifest @@ -1,21 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 90f65e06822afb40c9798cbbd3874462 ChangeLog 4789 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68 -MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kxkb-3.5.0 68 -MD5 94b8f1686d4ab032ff789fff17b79cee files/kxkb-3.5.0-modularxkb.patch 1265 +MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kxkb-3.5.0 142 MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399 MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412 MD5 6bb9bb872499703635e47ca53c1b4981 kxkb-3.4.3.ebuild 406 -MD5 b60b3083f1e52772e6a712d997a5f66c kxkb-3.5.0.ebuild 548 +MD5 11f04a38a5fa05fc2f93f8649363a5dc kxkb-3.5.0.ebuild 707 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDuV2BAiZjviIA2XgRAtzOAKC/GdMcnMKAXAQMAvtL9iKmNw3dbwCeJp2/ -fB0TNMjN1NEkIuS0RL1AeRU= -=F4AP ------END PGP SIGNATURE----- diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.0 b/kde-base/kxkb/files/digest-kxkb-3.5.0 index 7ccd6e40bb2a..37052d4ffe23 100644 --- a/kde-base/kxkb/files/digest-kxkb-3.5.0 +++ b/kde-base/kxkb/files/digest-kxkb-3.5.0 @@ -1 +1,2 @@ +MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185 diff --git a/kde-base/kxkb/files/kxkb-3.5.0-modularxkb.patch b/kde-base/kxkb/files/kxkb-3.5.0-modularxkb.patch deleted file mode 100644 index 47eea8ee7efa..000000000000 --- a/kde-base/kxkb/files/kxkb-3.5.0-modularxkb.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: kdebase-3.5.0/kxkb/rules.cpp -=================================================================== ---- kdebase-3.5.0.orig/kxkb/rules.cpp -+++ kdebase-3.5.0/kxkb/rules.cpp -@@ -17,13 +17,13 @@ - - #include "rules.h" - --const char* X11DirList[3] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/share/X11/"}; -+const char* X11DirList[6] = {"/usr/share/X11/", "/usr/local/share/X11/", "/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/lib/X11/", "/usr/local/lib/X11/"}; - const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"}; - - KeyRules::KeyRules(): - m_layouts(90) - { -- for(int ii=0; ii<3; ii++) -+ for(int ii=0; ii<6; ii++) - if( QDir(X11DirList[ii]).exists() ) { - X11_DIR = X11DirList[ii]; - break; -@@ -292,8 +292,8 @@ KeyRules::getVariants(const QString& lay - - void KeyRules::parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars) - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_]*"; -- static const char* VARIANT_PATTERN = "\\([a-z0-9_]*\\)"; -+ static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; - for (QStringList::ConstIterator it = vars.begin(); it != vars.end(); ++it) - { - QString varLine = (*it).stripWhiteSpace(); diff --git a/kde-base/kxkb/kxkb-3.5.0.ebuild b/kde-base/kxkb/kxkb-3.5.0.ebuild index e633f3c9364a..d7cfc648a2c7 100644 --- a/kde-base/kxkb/kxkb-3.5.0.ebuild +++ b/kde-base/kxkb/kxkb-3.5.0.ebuild @@ -1,12 +1,15 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.8 2005/12/21 21:02:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.9 2006/01/14 09:26:03 flameeyes Exp $ KMNAME=kdebase MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2" + DESCRIPTION="Kicker applet for management of X keymaps" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" @@ -17,4 +20,9 @@ RDEPEND="${RDEPEND} x11-apps/setxkbmap ) virtual/x11 )" -PATCHES="${FILESDIR}/${P}-modularxkb.patch" +src_unpack() { + unpack "kdebase-${PV}-patches-1.tar.bz2" + kde-meta_src_unpack + + epatch "${WORKDIR}/patches/${P}-modularxkb.patch" +} |