From: Ben de Groot <yngwin@gentoo.org>
Date: Mon, 17 Aug 2015 15:39:07 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/origin/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=167b3815ced228284d1697cb85e386756a14a326;p=gentoo.git

Merge remote-tracking branch 'remotes/origin/master'
---

167b3815ced228284d1697cb85e386756a14a326
diff --cc media-sound/ardour/ardour-4.2-r1.ebuild
index c8aad5cdb632,29167b33e061..8774ca016a58
--- 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)