| 1 |
commit: 6c8d00b959c1019095c630e02656dce58419f3a7 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 29 10:23:10 2013 +0000 |
| 4 |
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net> |
| 5 |
CommitDate: Mon Apr 29 10:23:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6c8d00b9 |
| 7 |
|
| 8 |
[kde-base/kscreensaver] updated live ebuild from tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha173 |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/kscreensaver-4.6.4-xf86misc.patch | 12 ++++++++++ |
| 14 |
.../kscreensaver/kscreensaver-4.10.49.9999.ebuild | 22 +++++++++++++++++-- |
| 15 |
kde-base/kscreensaver/kscreensaver-9999.ebuild | 22 +++++++++++++++++-- |
| 16 |
3 files changed, 50 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..7eb00b6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+diff -ruN kscreensaver-4.6.4.orig/ConfigureChecks.cmake kscreensaver-4.6.4/ConfigureChecks.cmake |
| 25 |
+--- kscreensaver-4.6.4.orig/ConfigureChecks.cmake 2011-02-25 22:54:48.000000000 +0100 |
| 26 |
++++ kscreensaver-4.6.4/ConfigureChecks.cmake 2011-06-13 22:34:10.713760997 +0200 |
| 27 |
+@@ -73,7 +73,7 @@ |
| 28 |
+ macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) |
| 29 |
+ macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin |
| 30 |
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker |
| 31 |
+-macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock |
| 32 |
++macro_bool_to_01(FALSE HAVE_XF86MISC) # kdesktop and kcontrol/lock |
| 33 |
+ macro_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kdesktop |
| 34 |
+ macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin |
| 35 |
+ |
| 36 |
|
| 37 |
diff --git a/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild |
| 38 |
index 4020f3e..907c2a9 100644 |
| 39 |
--- a/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild |
| 40 |
+++ b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild |
| 41 |
@@ -1,10 +1,11 @@ |
| 42 |
# Copyright 1999-2013 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
-# $Header: $ |
| 45 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $ |
| 46 |
|
| 47 |
EAPI=5 |
| 48 |
|
| 49 |
KMNAME="kde-workspace" |
| 50 |
+OPENGL_REQUIRED="optional" |
| 51 |
inherit kde4-meta |
| 52 |
|
| 53 |
DESCRIPTION="KDE screensaver framework" |
| 54 |
@@ -12,11 +13,26 @@ KEYWORDS="" |
| 55 |
IUSE="debug" |
| 56 |
|
| 57 |
RDEPEND=" |
| 58 |
+ dev-libs/glib:2 |
| 59 |
$(add_kdebase_dep kcheckpass) |
| 60 |
- x11-libs/libX11 |
| 61 |
+ >=x11-libs/libxklavier-3.2 |
| 62 |
+ >=x11-libs/libXrandr-1.2.1 |
| 63 |
+ x11-libs/libXtst |
| 64 |
+ opengl? ( virtual/opengl ) |
| 65 |
+" |
| 66 |
+DEPEND="${RDEPEND} |
| 67 |
+ x11-proto/randrproto |
| 68 |
" |
| 69 |
-DEPEND="${RDEPEND}" |
| 70 |
|
| 71 |
PATCHES=( |
| 72 |
"${FILESDIR}/${PN}-4.5.95-nsfw.patch" |
| 73 |
+ "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" |
| 74 |
) |
| 75 |
+ |
| 76 |
+src_configure() { |
| 77 |
+ mycmakeargs=( |
| 78 |
+ $(cmake-utils_use_with opengl OpenGL) |
| 79 |
+ ) |
| 80 |
+ |
| 81 |
+ kde4-meta_src_configure |
| 82 |
+} |
| 83 |
|
| 84 |
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 85 |
index 4020f3e..907c2a9 100644 |
| 86 |
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 87 |
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 88 |
@@ -1,10 +1,11 @@ |
| 89 |
# Copyright 1999-2013 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $ |
| 93 |
|
| 94 |
EAPI=5 |
| 95 |
|
| 96 |
KMNAME="kde-workspace" |
| 97 |
+OPENGL_REQUIRED="optional" |
| 98 |
inherit kde4-meta |
| 99 |
|
| 100 |
DESCRIPTION="KDE screensaver framework" |
| 101 |
@@ -12,11 +13,26 @@ KEYWORDS="" |
| 102 |
IUSE="debug" |
| 103 |
|
| 104 |
RDEPEND=" |
| 105 |
+ dev-libs/glib:2 |
| 106 |
$(add_kdebase_dep kcheckpass) |
| 107 |
- x11-libs/libX11 |
| 108 |
+ >=x11-libs/libxklavier-3.2 |
| 109 |
+ >=x11-libs/libXrandr-1.2.1 |
| 110 |
+ x11-libs/libXtst |
| 111 |
+ opengl? ( virtual/opengl ) |
| 112 |
+" |
| 113 |
+DEPEND="${RDEPEND} |
| 114 |
+ x11-proto/randrproto |
| 115 |
" |
| 116 |
-DEPEND="${RDEPEND}" |
| 117 |
|
| 118 |
PATCHES=( |
| 119 |
"${FILESDIR}/${PN}-4.5.95-nsfw.patch" |
| 120 |
+ "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" |
| 121 |
) |
| 122 |
+ |
| 123 |
+src_configure() { |
| 124 |
+ mycmakeargs=( |
| 125 |
+ $(cmake-utils_use_with opengl OpenGL) |
| 126 |
+ ) |
| 127 |
+ |
| 128 |
+ kde4-meta_src_configure |
| 129 |
+} |
Archives