[gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/

[Andreas Sturmlechner]

commit:     f206af56da582dbe660f3a7358dee6572b498246
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 15:25:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 16:05:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f206af56

x11-libs/libva: Switch to release tarball

Makes eautoreconf unnecessary.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/libva/Manifest           |  2 +-
 x11-libs/libva/libva-2.4.0.ebuild | 37 ++++++++++++++++++-------------------
 x11-libs/libva/libva-9999.ebuild  |  5 ++---
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index e7511875285..98c2c3ba9dc 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -3,4 +3,4 @@ DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274
 DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163da92da7d8791547d6ca2fd407319093fee89bce5b26b26818cc0131cc0c7f3cd4f511e3f847e3fd2cf1dff3 SHA512 dd4c901f9c75d03fa45b32af5ca08ba24ef68d354ad26ad53d0f87d3290bee152eed9e61b4dd4116c2d15baf0c74f2d37996d08f007d485c57af5e8d9648eb82
 DIST libva-2.2.0.tar.gz 218971 BLAKE2B c715f5f94cf25bcdf03be9ddeeb390fc073fe3fc7cea324e2f6da9bea490b14a99c41cf5f74d89fa3847c1357297d2c6faa877e76dce470319f532dc76d36f8a SHA512 0b026c99be2600a56833377a1cfd8efb736862dee942576d4d360b9844ace1efb21a2f1b9b1c2fabbbe4a9c483af24e47f31dd07516816acc8fa72e207f8cad4
 DIST libva-2.3.0.tar.gz 222152 BLAKE2B 235cb4ba79eeac334163e32b51313f74506e54a7ca5693b81a2bf00eff1d5204ba630e32028dc02fb47268772d12032471d7d6d47e189318230e8a52cc940fcc SHA512 b328e7426bd5fb33a4ed4817d7a33fb104b1f524f5ca83f60349df66cff22e9cd46d40238d29d5bf527f32c7da153088525e43d50454832ac9b4b7fe0be40692
-DIST libva-2.4.0.tar.gz 223232 BLAKE2B b1d4c5c97aa1d182ffb99737daa20f110819ec47aac629b973bc5638c188d4feb0bb4d5b90abf8082a10aa02b2bf2bfb1773971326e9d4e4ec9b983e6a817a37 SHA512 1f59549574ddc72c0e0a3d8024e252342be49c6166fa73ce855cdff42008c5fd2c9e9383adb16247df84c542ef1ae8742053560d860711f8d63fbab813a9c663
+DIST libva-2.4.0.tar.bz2 455989 BLAKE2B 740460b5e23fc09dbb4de61dbe6c7d3820032d54d0ff9895d0a5e3235362e559e50d5349eab4c907367cef101f367256a9da3cf3a87526c444450f830b0ac4d6 SHA512 67373e20932bca0d52cd8f48ed10c1f01752be73642ad4d2c85dcee813dccf205c8ca62fdc69fb3f4f83a685e2a8ef2c6646174e3453a8f5763cac16a58321c3

diff --git a/x11-libs/libva/libva-2.4.0.ebuild b/x11-libs/libva/libva-2.4.0.ebuild
index 320f6768097..7de898cf6aa 100644
--- a/x11-libs/libva/libva-2.4.0.ebuild
+++ b/x11-libs/libva/libva-2.4.0.ebuild
@@ -3,55 +3,54 @@
 
 EAPI=5
 
-SCM=""
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SCM=git-r3
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
 fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib versionator
+inherit autotools-multilib eapi7-ver multilib
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1)"
-IUSE="+drm opengl vdpau wayland X utils"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
 
 VIDEO_CARDS="nvidia intel i965 nouveau"
 for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	utils? ( media-video/libva-utils )
-	"
+"
 
 REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
+	opengl? ( X )"
 
 DOCS=( NEWS )
 

diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 5fa3a627492..7de898cf6aa 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -7,16 +7,15 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
 fi
-
-AUTOTOOLS_AUTORECONF="yes"
 inherit autotools-multilib eapi7-ver multilib
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 
 if [[ ${PV} != *9999* ]] ; then
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi