diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /media-libs/libcanberra | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'media-libs/libcanberra')
| -rw-r--r-- | media-libs/libcanberra/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/libcanberra/libcanberra-0.30-r5.ebuild | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest index dc0b56f08469..98b5feb8c9be 100644 --- a/media-libs/libcanberra/Manifest +++ b/media-libs/libcanberra/Manifest @@ -1,5 +1,5 @@ AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 -EBUILD libcanberra-0.30-r5.ebuild 2466 BLAKE2B 043cbfe9b05aeb14966b9f5cd9e21f97de2826e5cb22ac9fd3b6282aba31153ffcbe247d903de91302aeca8646a32521909a601449fe6ef964f44d4ff3303f20 SHA512 a18c327f0ab13328f3ada80f27cb67a80225e49da4fd9c6dded7e92a93d579358620844999b7fcb6ea3020d93b2a7af727c578a8da1f3610d91897a5ece48c66 +EBUILD libcanberra-0.30-r5.ebuild 2459 BLAKE2B ee479bd5c14d066928d8c82d54ce09ef8fc02807112ce8022ec5f1d9255af4f7ee22c2db97159f473e303e6d2c540de696c2e17813c25617dae9a61f4d74729a SHA512 65714b83fff4e88e20a41441168870d0fe9d42bb5f5636d884f5a9f797aa7eac7a5491b4be35b692d71301e29b34b665c8dcf29ad539f055868ec0681c109d80 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061 diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild index dd0bace15bfc..344dbc295877 100644 --- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild +++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -inherit autotools-multilib eutils ltprune systemd +EAPI=7 +inherit multilib-minimal systemd DESCRIPTION="Portable sound event library" HOMEPAGE="http://git.0pointer.net/libcanberra.git/" @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev" -COMMON_DEPEND=" +DEPEND=" dev-libs/libltdl:0[${MULTILIB_USEDEP}] media-libs/libvorbis[${MULTILIB_USEDEP}] alsa? ( @@ -31,22 +31,22 @@ COMMON_DEPEND=" pulseaudio? ( >=media-sound/pulseaudio-0.9.11[${MULTILIB_USEDEP}] ) tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} gnome? ( gnome-base/dconf gnome-base/gsettings-desktop-schemas ) sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379 -DEPEND="${COMMON_DEPEND} +BDEPEND=" app-arch/xz-utils virtual/pkgconfig " REQUIRED_USE="udev? ( alsa )" -src_prepare() { +PATCHES=( # gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master') - epatch "${FILESDIR}/${PN}-0.30-wayland.patch" -} + "${FILESDIR}/${PN}-0.30-wayland.patch" +) multilib_src_configure() { ECONF_SOURCE="${S}" econf \ @@ -59,9 +59,9 @@ multilib_src_configure() { $(use_enable gtk3) \ $(use_enable tdb) \ $(use_enable udev) \ - $(systemd_with_unitdir) \ --disable-lynx \ - --disable-gtk-doc + --disable-gtk-doc \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" if multilib_is_native_abi; then ln -s "${S}"/gtkdoc/html gtkdoc/html || die @@ -75,7 +75,7 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - prune_libtool_files --modules + find "${ED}" -type f -name '*.la' -delete || die # This is needed for desktops different than GNOME, bug #520550 exeinto /etc/X11/xinit/xinitrc.d |