Pinkbyte/pinkbyte-overlay
1
Fork 0
Code Releases Activity

x11-plugins/cairo-dock-plugins: bump EAPI to 7

Browse Source 
Fix automagic with alsa
Drop old non-working code for building with GTK+ 2
This commit is contained in:
Sergey Popov 2020-03-09 12:36:43 +03:00
parent 048ee1ca48
commit aa18c26101
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-plugins/cairo-dock-plugins/Manifest
View File

@ -1 +1 @@
DIST cairo-dock-plug-ins-3.4.1.tar.gz 6827195 SHA256 e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e SHA512 0b6ab8f06f8e7f24787a6b87531434286276a3a626fcd31a136ff1e256241fbea96a72b673fd8a05bd5be772f6c3abcb7c593e30784c183f7be0c5b373e96f03 WHIRLPOOL fb083ad8d496ded403cbfb73e2a181350f00d3863ef4b119fe4442abd9d6c7d90743171663cf05c1ceef2e56adf51217d4e562c9a189a1550abac82cc23046b6 DIST cairo-dock-plug-ins-3.4.1.tar.gz 6827195 BLAKE2B 7944a92ca0b70c92e3974e6201da22a5a718aeb3e250cec1ee9204e7a6eb0a51f5658e84aac484c81f2b5fb01be3ffc9e0c0a45d93faeadd1014ade916ac9f30 SHA512 0b6ab8f06f8e7f24787a6b87531434286276a3a626fcd31a136ff1e256241fbea96a72b673fd8a05bd5be772f6c3abcb7c593e30784c183f7be0c5b373e96f03

20
x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
View File

@ -1,13 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id $
EAPI="6" EAPI=7
inherit cmake-utils eutils versionator inherit cmake-utils eutils
MY_PN="${PN/plugins/plug-ins}" MY_PN="${PN/plugins/plug-ins}"
MM_PV=$(get_version_component_range '1-2') MM_PV=$(ver_cut 1-2)
DESCRIPTION="Official plugins for cairo-dock" DESCRIPTION="Official plugins for cairo-dock"
HOMEPAGE="http://www.glx-dock.org" HOMEPAGE="http://www.glx-dock.org"
@ -16,7 +15,7 @@ SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${MY_PN}-${PV}.t
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="alsa exif gmenu gtk3 kde terminal gnote vala webkit xfce xgamma xklavier twitter indicator3 zeitgeist mail" IUSE="alsa exif gmenu kde terminal gnote vala webkit xfce xgamma xklavier twitter indicator3 zeitgeist mail"
RDEPEND=" RDEPEND="
dev-libs/dbus-glib dev-libs/dbus-glib
@ -25,10 +24,9 @@ RDEPEND="
gnome-base/librsvg:2 gnome-base/librsvg:2
sys-apps/dbus sys-apps/dbus
x11-libs/cairo x11-libs/cairo
!gtk3? ( x11-libs/gtk+:2 )
x11-libs/gtkglext x11-libs/gtkglext
~x11-misc/cairo-dock-${PV} ~x11-misc/cairo-dock-${PV}
gtk3? ( x11-libs/gtk+:3 ) x11-libs/gtk+:3
alsa? ( media-libs/alsa-lib ) alsa? ( media-libs/alsa-lib )
exif? ( media-libs/libexif ) exif? ( media-libs/libexif )
gmenu? ( gnome-base/gnome-menus ) gmenu? ( gnome-base/gnome-menus )
@ -52,11 +50,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig virtual/pkgconfig
dev-libs/libdbusmenu[gtk3] dev-libs/libdbusmenu[gtk3]
" "
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
"-Denable-alsa-mixer=$(usex alsa)"
"-Denable-sound-effects=$(usex alsa)"
# broken with 0.99.x (as of cairo-dock 3.3.2) # broken with 0.99.x (as of cairo-dock 3.3.2)
"-Denable-upower-support=OFF" "-Denable-upower-support=OFF"
`use gtk3 && echo "-Dforce-gtk2=OFF" || echo "-Dforce-gtk2=ON"`
) )
cmake-utils_src_configure cmake-utils_src_configure
} }