From 46297d7187ccd6a63c2864e686b95245d4917f2a Mon Sep 17 00:00:00 2001 From: Jouni Kosonen Date: Sat, 20 Feb 2016 20:18:45 +0200 Subject: [PATCH] kde-apps/kdeartwork-kscreensaver: depends on Eigen3, not Eigen2 --- ...kdeartwork-kscreensaver-15.08.3-r1.ebuild} | 6 +-- .../kdeartwork-kscreensaver-4.14.3-r1.ebuild | 49 +++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) rename kde-apps/kdeartwork-kscreensaver/{kdeartwork-kscreensaver-15.08.3.ebuild => kdeartwork-kscreensaver-15.08.3-r1.ebuild} (90%) create mode 100644 kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3-r1.ebuild diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild similarity index 90% rename from kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3.ebuild rename to kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild index 90d0f45ec215..128763936b70 100644 --- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3.ebuild +++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ RDEPEND=" xscreensaver? ( x11-misc/xscreensaver ) " DEPEND="${RDEPEND} - eigen? ( dev-cpp/eigen:2 ) + eigen? ( dev-cpp/eigen:3 ) " PATCHES=( @@ -40,7 +40,7 @@ src_configure() { local mycmakeargs=( -DKSCREENSAVER_SOUND_SUPPORT=ON -DOPENGL=ON - $(cmake-utils_use_with eigen Eigen2) + $(cmake-utils_use_with eigen Eigen3) $(cmake-utils_use_with kexiv2) $(cmake-utils_use_with xscreensaver) ) diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3-r1.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3-r1.ebuild new file mode 100644 index 000000000000..c8eade077b41 --- /dev/null +++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KMMODULE="kscreensaver" +KMNAME="kdeartwork" +OPENGL_REQUIRED="optional" +KDE_SCM="svn" +inherit kde4-meta + +DESCRIPTION="Extra screensavers for kde" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +eigen +kexiv2 xscreensaver" + +# libkworkspace - only as a stub to provide KDE4Workspace config +RDEPEND=" + $(add_kdebase_dep kscreensaver '' 4.11) + $(add_kdebase_dep libkworkspace '' 4.11) + media-libs/libart_lgpl + x11-libs/libX11 + x11-libs/libXt + virtual/glu + virtual/opengl + kexiv2? ( $(add_kdeapps_dep libkexiv2) ) + xscreensaver? ( x11-misc/xscreensaver ) +" +DEPEND="${RDEPEND} + eigen? ( dev-cpp/eigen:3 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-xscreensaver.patch" + "${FILESDIR}/${PN}-4.5.95-webcollage.patch" + "${FILESDIR}/${PN}-15.08.3-missing-include.patch" +) + +src_configure() { + local mycmakeargs=( + -DKSCREENSAVER_SOUND_SUPPORT=ON + -DOPENGL=ON + $(cmake-utils_use_with eigen Eigen3) + $(cmake-utils_use_with kexiv2) + $(cmake-utils_use_with xscreensaver) + ) + + kde4-meta_src_configure +} -- 2.26.2