From 0438b4386f57fa8255b166a8755b1eb45b254801 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 22 Nov 2011 11:05:16 +0100 Subject: wayland-demos: Fix desktop shell paths Add gnome useflag for gnome backgrounds and icons, alternatively use tango. Fix relative paths to default non-installed clients. --- media-misc/wayland-demos/Manifest | 2 +- media-misc/wayland-demos/wayland-demos-9999.ebuild | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'media-misc') diff --git a/media-misc/wayland-demos/Manifest b/media-misc/wayland-demos/Manifest index c7f5320..f3cc85f 100644 --- a/media-misc/wayland-demos/Manifest +++ b/media-misc/wayland-demos/Manifest @@ -1 +1 @@ -EBUILD wayland-demos-9999.ebuild 1817 RMD160 3ba46c86c77c6efbd7cab4aa3303ca06e93f4a50 SHA1 0d96b30b83bf003f6d174a5f8c80e91dbc9285b7 SHA256 b9e2d2c91297046f47609f95325e2bc8f93ef2310dbd9d03900622433a0c1257 +EBUILD wayland-demos-9999.ebuild 2330 RMD160 bdf7b6c703f5bf9d15d1a6ec5bf89483cadff8df SHA1 9dd855445a474df16e23cba1d72a622591487c4a SHA256 ab8e4c612ab57010b3d24b16242f9091d831294495a20175f8c74c14bf97d2ee diff --git a/media-misc/wayland-demos/wayland-demos-9999.ebuild b/media-misc/wayland-demos/wayland-demos-9999.ebuild index ea284ee..d84974a 100644 --- a/media-misc/wayland-demos/wayland-demos-9999.ebuild +++ b/media-misc/wayland-demos/wayland-demos-9999.ebuild @@ -15,7 +15,7 @@ SRC_URI="" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+poppler +svg +clients +simple-clients +IUSE="+poppler +svg +clients +simple-clients +gnome +compositor-drm +compositor-x11 +compositor-wayland compositor-openwfd" DEPEND="media-libs/wayland @@ -47,6 +47,11 @@ DEPEND="media-libs/wayland =x11-libs/libxkbcommon-9999 poppler? ( app-text/poppler[cairo] ) ) + gnome? ( + x11-themes/gnome-backgrounds + x11-themes/gnome-icon-theme + ) + !gnome? ( x11-themes/tango-icon-theme ) simple-clients? ( media-libs/mesa[wayland] ) svg? ( gnome-base/librsvg )" @@ -69,5 +74,17 @@ src_prepare() sed -i -e "/PROGRAMS/s/noinst/bin/" \ {compositor,clients}"/Makefile.am" || \ die "sed {compositor,clients}/Makefile.am failed!" + + sed -i \ + -e "s:./clients/:/usr/bin/wayland-:" \ + -e "s:/usr/share/backgrounds/:/usr/share/pixmaps/backgrounds/:" \ + data/desktop-shell.ini || die "sed data/desktop-shell.ini failed!" + + use gnome || sed -i \ + -e "s:icons/gnome:icons/Tango:" \ + -e "/gnome-terminal/d" \ + -e "s/^background-image=.*gnome.*/#\\0/" \ + data/desktop-shell.ini || die "sed data/desktop-shell.ini failed!" + eautoreconf } -- cgit v1.2.3-65-gdbad