From: Tim Harder Date: Mon, 8 Aug 2016 15:48:13 +0000 (-0400) Subject: media-libs/libbluray: simplify vcs eclass inherit X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc6da5298a5c573765e57254d68dcfa230434e11;p=gentoo.git media-libs/libbluray: simplify vcs eclass inherit Multiple eclass inherit lines have always worked. --- diff --git a/media-libs/libbluray/libbluray-0.9.3.ebuild b/media-libs/libbluray/libbluray-0.9.3.ebuild index 16182bd9b291..bc7c11179b32 100644 --- a/media-libs/libbluray/libbluray-0.9.3.ebuild +++ b/media-libs/libbluray/libbluray-0.9.3.ebuild @@ -5,17 +5,16 @@ EAPI=5 if [ "${PV#9999}" != "${PV}" ] ; then - VCSECLASS="git-r3" + inherit git-r3 KEYWORDS="" EGIT_REPO_URI="git://git.videolan.org/libbluray.git" SRC_URI="" else - VCSECLASS="" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" fi -inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal +inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal DESCRIPTION="Blu-ray playback libraries" HOMEPAGE="http://www.videolan.org/developers/libbluray.html" diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 768289ccb938..9b3bac6a3bb4 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -5,17 +5,16 @@ EAPI=5 if [ "${PV#9999}" != "${PV}" ] ; then - VCSECLASS="git-r3" + inherit git-r3 KEYWORDS="" EGIT_REPO_URI="git://git.videolan.org/libbluray.git" SRC_URI="" else - VCSECLASS="" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" fi -inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal +inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal DESCRIPTION="Blu-ray playback libraries" HOMEPAGE="http://www.videolan.org/developers/libbluray.html"