diff options
3 files changed, 2 insertions, 34 deletions
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d84..00000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - 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 diff --git a/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild index 57438982a0c..cd7d9b67b51 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild @@ -12,7 +12,7 @@ inherit python kde4-meta DESCRIPTION="Plasma: KDE desktop framework" KEYWORDS="" -IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama" +IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop" COMMONDEPEND=" $(add_kdebase_dep kactivities) @@ -40,7 +40,6 @@ COMMONDEPEND=" $(add_kdebase_dep libplasmaclock 'holidays') ) !rss? ( $(add_kdebase_dep libplasmaclock '-holidays') ) - xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} rss? ( dev-libs/boost ) @@ -48,7 +47,6 @@ DEPEND="${COMMONDEPEND} x11-proto/damageproto x11-proto/fixesproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} $(add_kdebase_dep plasma-runtime) @@ -71,10 +69,6 @@ KMEXTRACTONLY=" KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - pkg_setup() { python_set_active_version 2 python_pkg_setup @@ -107,7 +101,6 @@ src_configure() { $(cmake-utils_use_with semantic-desktop Akonadi) $(cmake-utils_use_with semantic-desktop Nepomuk) $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with xinerama X11_Xinerama) -DWITH_Xmms=OFF ) diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild index 57438982a0c..cd7d9b67b51 100644 --- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild @@ -12,7 +12,7 @@ inherit python kde4-meta DESCRIPTION="Plasma: KDE desktop framework" KEYWORDS="" -IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama" +IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop" COMMONDEPEND=" $(add_kdebase_dep kactivities) @@ -40,7 +40,6 @@ COMMONDEPEND=" $(add_kdebase_dep libplasmaclock 'holidays') ) !rss? ( $(add_kdebase_dep libplasmaclock '-holidays') ) - xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} rss? ( dev-libs/boost ) @@ -48,7 +47,6 @@ DEPEND="${COMMONDEPEND} x11-proto/damageproto x11-proto/fixesproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} $(add_kdebase_dep plasma-runtime) @@ -71,10 +69,6 @@ KMEXTRACTONLY=" KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - pkg_setup() { python_set_active_version 2 python_pkg_setup @@ -107,7 +101,6 @@ src_configure() { $(cmake-utils_use_with semantic-desktop Akonadi) $(cmake-utils_use_with semantic-desktop Nepomuk) $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with xinerama X11_Xinerama) -DWITH_Xmms=OFF ) |