commit: 167b3815ced228284d1697cb85e386756a14a326
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 15:39:07 2015 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 15:39:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167b3815
Merge remote-tracking branch 'remotes/origin/master'
app-emulation/virtualbox-additions/Manifest | 1 +
....0.ebuild => virtualbox-additions-5.0.2.ebuild} | 0
app-emulation/virtualbox-bin/Manifest | 4 +
...3.ebuild => virtualbox-bin-5.0.2.102096.ebuild} | 0
app-emulation/virtualbox-extpack-oracle/Manifest | 1 +
... virtualbox-extpack-oracle-5.0.2.102096.ebuild} | 0
app-emulation/virtualbox-guest-additions/Manifest | 1 +
.../virtualbox-guest-additions-5.0.2.ebuild | 212 +++++++++++
app-emulation/virtualbox-modules/Manifest | 1 +
....0.0.ebuild => virtualbox-modules-5.0.2.ebuild} | 0
app-emulation/virtualbox/Manifest | 2 +
app-emulation/virtualbox/virtualbox-5.0.2.ebuild | 422 +++++++++++++++++++++
dev-lang/mono/mono-4.0.3.20.ebuild | 1 +
dev-libs/gmime/gmime-2.6.20-r1.ebuild | 69 ++++
dev-python/pillow/pillow-2.8.1.ebuild | 2 +-
dev-python/pillow/pillow-2.8.2.ebuild | 2 +-
dev-python/pillow/pillow-2.9.0.ebuild | 2 +-
dev-util/cmake/Manifest | 1 +
.../{cmake-3.3.0.ebuild => cmake-3.3.1.ebuild} | 0
...p-5.9.5.5.ebuild => monodevelop-5.9.5.9.ebuild} | 0
kde-misc/krename/krename-4.0.9-r3.ebuild | 2 +-
media-sound/ardour/ardour-4.1.ebuild | 2 +-
media-sound/ardour/ardour-4.2-r1.ebuild | 2 +-
...ming.patch => ardour-4.x-revision-naming.patch} | 0
net-ftp/filezilla/Manifest | 1 +
.../files/filezilla-3.13.0-fzputtygen_interface.h | 40 ++
net-ftp/filezilla/filezilla-3.13.0.ebuild | 71 ++++
.../files/linksys-tftp-1.2.1-r1-header.patch | 36 +-
net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild | 5 +-
profiles/package.mask | 2 +
sys-libs/ncurses/ncurses-6.0.ebuild | 34 +-
x11-drivers/xf86-video-virtualbox/Manifest | 1 +
...0.ebuild => xf86-video-virtualbox-5.0.2.ebuild} | 0
33 files changed, 893 insertions(+), 24 deletions(-)
diff --cc media-sound/ardour/ardour-4.2-r1.ebuild
index c8aad5c,29167b3..8774ca0
--- a/media-sound/ardour/ardour-4.2-r1.ebuild
+++ b/media-sound/ardour/ardour-4.2-r1.ebuild
@@@ -61,16 -63,28 +61,16 @@@ RDEPEND=
>=media-libs/suil-0.6.10
>=media-libs/lv2-1.4.0
)"
-
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- virtual/pkgconfig
>=media-sound/jack-audio-connection-kit-0.120
sys-devel/gettext
+ virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )"
- if ! [ ${PV} = 9999 ]; then
- DEPEND="${DEPEND}"
- fi
-
-src_unpack() {
- if [ ${PV} = 9999 ]; then
- git-2_src_unpack
- else
- unpack ${A}
- fi
-}
src_prepare(){
- if ! [ ${PV} = 9999 ]; then
+ if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.2-revision-naming.patch
+ epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
touch "${S}/libs/ardour/revision.cc"
fi
$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
