diff options
| -rw-r--r-- | kde-base/kscreensaver/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kscreensaver/Manifest | 28 | ||||
| -rw-r--r-- | kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch | 12 | ||||
| -rw-r--r-- | kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild | 7 | ||||
| -rw-r--r-- | kde-base/kscreensaver/kscreensaver-4.6.80.ebuild | 7 | ||||
| -rw-r--r-- | kde-base/kscreensaver/kscreensaver-9999.ebuild | 7 |
6 files changed, 41 insertions, 29 deletions
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog new file mode 100644 index 00000000000..7d0c8578a37 --- /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 <dilfridge@gentoo.org> + +files/kscreensaver-4.6.4-xf86misc.patch, kscreensaver-4.6.49.9999.ebuild, + kscreensaver-4.6.80.ebuild, kscreensaver-9999.ebuild: + [kde-base/kscreensaver] Fix automagic dependency on libXxf86misc, bug 358655 + diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest index c6bdac8865c..a3643cd723b 100644 --- a/kde-base/kscreensaver/Manifest +++ b/kde-base/kscreensaver/Manifest @@ -1,27 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea AUX kscreensaver-4.5.95-nsfw.patch 1232 RMD160 3b74f5968006817b92ff7e19ca12434ae731ea14 SHA1 b6e7e4cd4e2566e5d2bf3f51eb6157d7946afbf2 SHA256 2741df667e564dec6834848b3e185efcc4f976b82c52755289fea1b87c6f86db +AUX kscreensaver-4.6.4-xf86misc.patch 723 RMD160 dd4ef13c5b8e48fb481b984b994e5ecb76310dc9 SHA1 adee744807f862d4d1822fbc929b04496a61beef SHA256 01921713a45c76a635bbb90443f89dfb16166a53327369096b6ee9a6ea3fb401 DIST kde-workspace-4.6.80.tar.bz2 20151396 RMD160 c01926ccd552fbe27abf3aae07c5b19a01841f3d SHA1 99bf68ee90c4cfa3568527a55c7c68d4247d9b13 SHA256 dc9894be42be86d60af857bdf66ae7d77ac48d44a64af48bb84ed0b8d79d3c16 -EBUILD kscreensaver-4.6.49.9999.ebuild 746 RMD160 44b4ef9c633f67dbd9f7ce619836f07eb2cbee20 SHA1 830b71475624de6a1f919e6242e58372e39a4f07 SHA256 1f2f04f4ed687143b334f9522ff301f86792524b76277e444f084b63c14640f9 -EBUILD kscreensaver-4.6.80.ebuild 777 RMD160 fa82f9d358ae5c96df3ebaca4a52c0e3d97d9e11 SHA1 50ac40a0bdee10cd34442334ac9a50d80eb0a034 SHA256 4e3ab6ee7b82366cf94602399da713606df35cf386c3727a8cfff61881df0666 -EBUILD kscreensaver-9999.ebuild 742 RMD160 17cc8ce130512877866ca0922788418f0fdbc820 SHA1 952b2a7f00157c20485dc8e58ecdbbdfad081d34 SHA256 0109a920c576d0030a6e37d898b699ca03a39bb239526419cdb74277277ba370 +EBUILD kscreensaver-4.6.49.9999.ebuild 789 RMD160 b281582b25bd8e9cb6812528314bf0cc951c8e43 SHA1 f7083b5436271dfbb46e0a39ac46e0992a48f08b SHA256 9d44370a54d2ac899e4488f45d4d70703623187a5f485cee4388ca1cb94a40b7 +EBUILD kscreensaver-4.6.80.ebuild 820 RMD160 a2694433ec117a813979ecaf6635c07e856973c1 SHA1 0cc1915e94cfd09d81a7c167abd3b7be5960b8f8 SHA256 59c4f337103ee6c593463964521cc5802a60af6dc5799957dcd86e10c6366cd7 +EBUILD kscreensaver-9999.ebuild 785 RMD160 e7bc2a38aa0f98fefd0f4293eb8722d9d5359dc3 SHA1 261205d18f11139bce0aa037bc6fcc54735fd82f SHA256 f1cf7832b20040c844e97b1c44b98f8b81611fc8fb4ec5d2f8ef00f0b386793c +MISC ChangeLog 392 RMD160 9d77df382bd9fb4926ba1d20b5bcf8f6f1da7f8b SHA1 d1886e0eea826f02a72ec2b232dd80827482e101 SHA256 f20627e377c6290aed7b4a1f649756c5dc3c309d2c43109bf5d7dd1f3ce73ba1 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJN8l6nAAoJENwGBM22xffeJ84P/iTNtVGRTl/l1cDQFNuLjRuh -rHY+gtZ7Xb3vup/RYaTy8JyypGHKrneh/UoYEecRqcH4BiDS7DXhERQ5RA1/Pqra -V5Tzj2zN0DvchmFXep38LRg5PcUzLPre9y4YvfkRMLR97PIEQKC3dQ4LFZh5nzO/ -Mb2y4pLy8jX98wYP/8OndY2w/tXoiPa46cT0mREQgcI8xRUM7tjYd5pRbwz8mMBo -vcIeEWPO37FdJ/navtlzUBIfDbC5643964wWOp114gbmiYtdPHZ4SxVrsJpAo5PL -HPLTdItCaadkOK2hKpxEEh1met5KxBppVcpxiLzaLIRB5nSdIaT0VFhxOxLKAosZ -7b0wGA2IIH9SIovq+PFHbTiYOEZiub+P/KTSbUZPyAhTAgKwV4zUtAoBF5DxeSzI -WgHtOs6qequvURCHjO1m90vNjtSIraKG6lc57iYNlpUh6Nv67hrep+PMzNViJ0yF -wxqo0zch/TpjX8umsQoV/8XaALMQY5Fvw4TfPpz0Ydi9pSBHQluXxT3YCgb7Sf7V -5806VnJf1WpFZAsxgJPrtVq3Nt9ZSa3YdWf21ZwyRQ9hUlfUo18KC39iByz6yGfa -QrMW5UadqLmlvlVNgc4JxI/ZUVVzRZQErIv6mNRyJkmTRzSqaUIOaDJUFku1EIkO -SwqTSSJmZhfhkowcac4p -=PQdf ------END PGP SIGNATURE----- diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch new file mode 100644 index 00000000000..7eb00b6f860 --- /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.000000000 +0100 ++++ kscreensaver-4.6.4/ConfigureChecks.cmake 2011-06-13 22:34:10.713760997 +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, kicker +-macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/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 + diff --git a/kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.49.9999.ebuild index e4557cd8837..ff0de7e198e 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="${RDEPEND} x11-proto/randrproto " -PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) src_configure() { mycmakeargs=( diff --git a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild index 149315a1961..fc68834d20b 100644 --- a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild +++ b/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild @@ -25,8 +25,11 @@ DEPEND="${RDEPEND} x11-proto/randrproto " -PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) src_configure() { mycmakeargs=( diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild index 7fceaa000f1..30d724003ad 100644 --- a/kde-base/kscreensaver/kscreensaver-9999.ebuild +++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild @@ -25,8 +25,11 @@ DEPEND="${RDEPEND} x11-proto/randrproto " -PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) src_configure() { mycmakeargs=( |