* [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/
@ 2011-06-13 20:41 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2011-06-13 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 7ec45ed91ad2c9a93ac87860d83ce4a49979c9d4
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 20:40:50 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 20:40:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7ec45ed9
[kde-base/kscreensaver] Fix automagic dependency on libXxf86misc, bug 358655
(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/ChangeLog
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 <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/files/kscreensaver-4.6.4-xf86misc.patch 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.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 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="${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 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="${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 7fceaa0..30d7240 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=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/
@ 2012-02-03 14:56 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2012-02-03 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 5022f268d5169b0d6ae03fb2018248bc71639853
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 14:35:13 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 14:35:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5022f268
[kde-base/kscreensaver] Remove patch for pam here, because it has no effect. Patched libkworkspace instead bug 398333.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
---
.../files/kdebase-4.0.2-pam-optional.patch | 29 --------------------
.../kscreensaver/kscreensaver-4.8.49.9999.ebuild | 1 -
kde-base/kscreensaver/kscreensaver-9999.ebuild | 1 -
3 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch
deleted file mode 100644
index 6fb54f0..0000000
--- a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
-index 3499836..cd1c2bb 100644
---- a/kdebase/workspace/cmake/modules/FindPAM.cmake
-+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
-@@ -5,6 +5,8 @@
- # PAM_INCLUDE_DIR - the pam include directory
- # PAM_LIBRARIES - libpam library
-
-+if (WITH_PAM)
-+
- if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
- # Already in cache, be silent
- set(PAM_FIND_QUIETLY TRUE)
-@@ -72,3 +74,5 @@ else (PAM_FOUND)
- endif (PAM_FOUND)
-
- mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
-+
-+endif (WITH_PAM)
-diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-index ed8ab9e..ce3bcc2 100644
---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
-+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-@@ -1,4 +1,4 @@
--find_package(PAM)
-+macro_optional_find_package(PAM)
-
- set(UNIXAUTH_LIBRARIES)
- set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild
index 10029c0..cbcbdfa 100644
--- a/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index 10029c0..cbcbdfa 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/
@ 2013-04-09 15:39 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2013-04-09 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 3e27b5eec04fe01e2a9e8cd7847dc6481e417155
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 15:37:30 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 15:37:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3e27b5ee
[kde-base/kscreensaver] Remove unused dependencies.
Package-Manager: portage-2.1.11.60
---
.../files/kscreensaver-4.6.4-xf86misc.patch | 12 ------------
.../kscreensaver/kscreensaver-4.10.49.9999.ebuild | 20 ++------------------
kde-base/kscreensaver/kscreensaver-9999.ebuild | 20 ++------------------
3 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
deleted file mode 100644
index 7eb00b6..0000000
--- a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.10.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
index 2c1c95a..4020f3e 100644
--- a/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
@@ -5,7 +5,6 @@
EAPI=5
KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -13,26 +12,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- >=x11-libs/libxklavier-3.2
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXtst
- opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
+ x11-libs/libX11
"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
- "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index 2c1c95a..4020f3e 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=5
KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -13,26 +12,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- >=x11-libs/libxklavier-3.2
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXtst
- opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
+ x11-libs/libX11
"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
- "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/
@ 2013-04-29 10:23 Marc Schiffbauer
0 siblings, 0 replies; 5+ messages in thread
From: Marc Schiffbauer @ 2013-04-29 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 6c8d00b959c1019095c630e02656dce58419f3a7
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 10:23:10 2013 +0000
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Mon Apr 29 10:23:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6c8d00b9
[kde-base/kscreensaver] updated live ebuild from tree
Package-Manager: portage-2.2.0_alpha173
---
.../files/kscreensaver-4.6.4-xf86misc.patch | 12 ++++++++++
.../kscreensaver/kscreensaver-4.10.49.9999.ebuild | 22 +++++++++++++++++--
kde-base/kscreensaver/kscreensaver-9999.ebuild | 22 +++++++++++++++++--
3 files changed, 50 insertions(+), 6 deletions(-)
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 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.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.10.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
index 4020f3e..907c2a9 100644
--- a/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $
EAPI=5
KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -12,11 +13,26 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
+ dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- x11-libs/libX11
+ >=x11-libs/libxklavier-3.2
+ >=x11-libs/libXrandr-1.2.1
+ x11-libs/libXtst
+ opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+ x11-proto/randrproto
"
-DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
+ "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with opengl OpenGL)
+ )
+
+ kde4-meta_src_configure
+}
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index 4020f3e..907c2a9 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $
EAPI=5
KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -12,11 +13,26 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
+ dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- x11-libs/libX11
+ >=x11-libs/libxklavier-3.2
+ >=x11-libs/libXrandr-1.2.1
+ x11-libs/libXtst
+ opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+ x11-proto/randrproto
"
-DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
+ "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with opengl OpenGL)
+ )
+
+ kde4-meta_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/
@ 2013-04-29 17:27 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2013-04-29 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 143e9c4218b6e28f8591087a6503160b7fdf1198
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 17:18:36 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 17:22:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=143e9c42
Revert "[kde-base/kscreensaver] updated live ebuild from tree"
This reverts commit 6c8d00b959c1019095c630e02656dce58419f3a7.
---
.../files/kscreensaver-4.6.4-xf86misc.patch | 12 ----------
.../kscreensaver/kscreensaver-4.10.49.9999.ebuild | 22 ++-----------------
kde-base/kscreensaver/kscreensaver-9999.ebuild | 22 ++-----------------
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
deleted file mode 100644
index 7eb00b6..0000000
--- a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.10.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
index 907c2a9..4020f3e 100644
--- a/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.10.49.9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $
+# $Header: $
EAPI=5
KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -13,26 +12,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- >=x11-libs/libxklavier-3.2
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXtst
- opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
+ x11-libs/libX11
"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
- "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index 907c2a9..4020f3e 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.10.2.ebuild,v 1.1 2013/04/06 00:04:07 dilfridge Exp $
+# $Header: $
EAPI=5
KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
@@ -13,26 +12,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- dev-libs/glib:2
$(add_kdebase_dep kcheckpass)
- >=x11-libs/libxklavier-3.2
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXtst
- opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
+ x11-libs/libX11
"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
- "${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
)
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-29 17:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 10:23 [gentoo-commits] proj/kde:master commit in: kde-base/kscreensaver/files/, kde-base/kscreensaver/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2013-04-29 17:27 Michael Palimaka
2013-04-09 15:39 Michael Palimaka
2012-02-03 14:56 Johannes Huber
2011-06-13 20:41 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox