From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWDwc-0006I7-G3 for garchives@archives.gentoo.org; Mon, 13 Jun 2011 20:41:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E67F61C023; Mon, 13 Jun 2011 20:41:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A20A01C023 for ; Mon, 13 Jun 2011 20:41:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B8A1B4017 for ; Mon, 13 Jun 2011 20:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 405698003C for ; Mon, 13 Jun 2011 20:41:00 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <7ec45ed91ad2c9a93ac87860d83ce4a49979c9d4.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kscreensaver/ChangeLog kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild kde-base/kscreensaver/kscreensaver-4.6.80.ebuild kde-base/kscreensaver/kscreensaver-9999.ebuild X-VCS-Directories: kde-base/kscreensaver/files/ kde-base/kscreensaver/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 7ec45ed91ad2c9a93ac87860d83ce4a49979c9d4 Date: Mon, 13 Jun 2011 20:41:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 901bb410a5f379ef77180a2eebc1b0df commit: 7ec45ed91ad2c9a93ac87860d83ce4a49979c9d4 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Mon Jun 13 20:40:50 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Mon Jun 13 20:40:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D7ec45ed9 [kde-base/kscreensaver] Fix automagic dependency on libXxf86misc, bug 358= 655 (Portage version: 2.1.10.2/git/Linux x86_64, unsigned Manifest commit) --- kde-base/kscreensaver/ChangeLog | 9 +++++++++ .../files/kscreensaver-4.6.4-xf86misc.patch | 12 ++++++++++++ .../kscreensaver/kscreensaver-4.6.49.9999.ebuild | 7 +++++-- kde-base/kscreensaver/kscreensaver-4.6.80.ebuild | 7 +++++-- kde-base/kscreensaver/kscreensaver-9999.ebuild | 7 +++++-- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/Chan= geLog new file mode 100644 index 0000000..7d0c857 --- /dev/null +++ b/kde-base/kscreensaver/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for kde-base/kscreensaver +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 13 Jun 2011; Andreas K. Huettel + +files/kscreensaver-4.6.4-xf86misc.patch, kscreensaver-4.6.49.9999.ebu= ild, + kscreensaver-4.6.80.ebuild, kscreensaver-9999.ebuild: + [kde-base/kscreensaver] Fix automagic dependency on libXxf86misc, bug = 358655 + diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patc= h b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch new file mode 100644 index 0000000..7eb00b6 --- /dev/null +++ b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch @@ -0,0 +1,12 @@ +diff -ruN kscreensaver-4.6.4.orig/ConfigureChecks.cmake kscreensaver-4.6= .4/ConfigureChecks.cmake +--- kscreensaver-4.6.4.orig/ConfigureChecks.cmake 2011-02-25 22:54:48.00= 0000000 +0100 ++++ kscreensaver-4.6.4/ConfigureChecks.cmake 2011-06-13 22:34:10.7137609= 97 +0200 +@@ -73,7 +73,7 @@ + macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) + macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin + macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kick= er +-macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcont= rol/lock ++macro_bool_to_01(FALSE HAVE_XF86MISC) # kdesktop and kcontrol/lock + macro_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kdesktop + macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin +=20 diff --git a/kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild b/kde-= base/kscreensaver/kscreensaver-4.6.49.9999.ebuild index e4557cd..ff0de7e 100644 --- a/kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild +++ b/kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild @@ -25,8 +25,11 @@ DEPEND=3D"${RDEPEND} x11-proto/randrproto " =20 -PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=3D( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) =20 src_configure() { mycmakeargs=3D( diff --git a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild b/kde-base/= kscreensaver/kscreensaver-4.6.80.ebuild index 149315a..fc68834 100644 --- a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild +++ b/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild @@ -25,8 +25,11 @@ DEPEND=3D"${RDEPEND} x11-proto/randrproto " =20 -PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=3D( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) =20 src_configure() { mycmakeargs=3D( diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/ks= creensaver/kscreensaver-9999.ebuild index 7fceaa0..30d7240 100644 --- a/kde-base/kscreensaver/kscreensaver-9999.ebuild +++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild @@ -25,8 +25,11 @@ DEPEND=3D"${RDEPEND} x11-proto/randrproto " =20 -PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=3D( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) =20 src_configure() { mycmakeargs=3D(