diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2018-11-17 23:44:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-11-17 23:44:11 +0000 |
| commit | a25e85384f2d639865ed07a4c8131c675546cc07 (patch) | |
| tree | ce64eca74faf1340588e82e35dc33eeb1619be91 | |
| parent | 2018-11-17 23:24:34 UTC (diff) | |
| parent | media-plugins/audacious-plugins: Drop USE hotkey (diff) | |
| download | gentoo-a25e85384f2d639865ed07a4c8131c675546cc07.tar.gz gentoo-a25e85384f2d639865ed07a4c8131c675546cc07.tar.bz2 gentoo-a25e85384f2d639865ed07a4c8131c675546cc07.zip | |
Merge updates from master
| -rw-r--r-- | dev-db/pgpool2/pgpool2-3.7.5.ebuild | 4 | ||||
| -rw-r--r-- | media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild | 4 | ||||
| -rw-r--r-- | media-plugins/audacious-plugins/audacious-plugins-9999.ebuild | 4 | ||||
| -rw-r--r-- | net-misc/dmr_utils/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/hblink/metadata.xml | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/dev-db/pgpool2/pgpool2-3.7.5.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild index 5a571f868228..285ca5b87272 100644 --- a/dev-db/pgpool2/pgpool2-3.7.5.ebuild +++ b/dev-db/pgpool2/pgpool2-3.7.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -POSTGRES_COMPAT=( 9.{3..6} {10..11} ) +POSTGRES_COMPAT=( 9.{3..6} 10 ) inherit autotools postgres-multi diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild index 13310dcdcc9a..b1303a24820f 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild @@ -18,7 +18,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme jack lame libav +IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" REQUIRED_USE=" || ( alsa jack pulseaudio sdl ) @@ -116,6 +116,7 @@ src_configure() { --enable-songchange \ --disable-coreaudio \ --disable-gtk \ + --disable-hotkey \ --disable-notify \ --disable-oss4 \ --disable-qtglspectrum \ @@ -131,7 +132,6 @@ src_configure() { $(use_enable fluidsynth amidiplug) \ $(use_enable flac filewriter) \ $(use_enable gme console) \ - $(use_enable hotkeys hotkey) \ $(use_enable http neon) \ $(use_enable jack) \ $(use_enable lame filewriter_mp3) \ diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild index 43c66a075ef2..8bda5cbd07e6 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" REQUIRED_USE=" ^^ ( gtk gtk3 qt5 ) - qt5? ( !libnotify ) + qt5? ( !hotkeys !libnotify ) || ( alsa jack pulseaudio sdl ) ampache? ( qt5 http )" diff --git a/net-misc/dmr_utils/metadata.xml b/net-misc/dmr_utils/metadata.xml index b4ca965f410a..f4c696b2c619 100644 --- a/net-misc/dmr_utils/metadata.xml +++ b/net-misc/dmr_utils/metadata.xml @@ -5,6 +5,4 @@ <name>Rick Farina</name> <email>zerochaos@gentoo.org</email> </maintainer> - <longdescription lang="en"> - </longdescription> </pkgmetadata> diff --git a/net-misc/hblink/metadata.xml b/net-misc/hblink/metadata.xml index b4ca965f410a..f4c696b2c619 100644 --- a/net-misc/hblink/metadata.xml +++ b/net-misc/hblink/metadata.xml @@ -5,6 +5,4 @@ <name>Rick Farina</name> <email>zerochaos@gentoo.org</email> </maintainer> - <longdescription lang="en"> - </longdescription> </pkgmetadata> |