x11-libs/libva-intel-driver: Switch to release tarball

Sort DEPENDs

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

3 files changed, 33 insertions, 36 deletions

diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 1d61e74bad06..308f3d3c6d61 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,5 +1,5 @@
+DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b
 DIST libva-intel-driver-1.7.3.tar.gz 1648659 BLAKE2B 5d5bf82d02c6e887f4afd332fa395e3044ac9b9bbf8e1682aeaf80d6c61c1db537b27ed22b25e932ec71d9011af07d9008f64df2e7c77a2c6f9dd0e10860d41f SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878
 DIST libva-intel-driver-1.8.3.tar.gz 2591242 BLAKE2B 954ad024ea93073f23045530506c6988cd55bc4bce565856071b30cfc0c10b673a225d4cfdd50cd360a3f828bf236386ba2937e59c260f72717dbdf72a29152c SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990
 DIST libva-intel-driver-2.1.0.tar.gz 3954965 BLAKE2B 6ff759860477896df6ee433d7b1ff8f3fda498e98210bfcbec33dc663a65bc07b8304ae219885225985fc65a785d7510aacb785a17d9fd66fb1c16a0ca7ffd57 SHA512 2df0d617a4a64ee37641fd9134f8455f59160d003c252b0e82f7be47adaad7d531f9f2f3ab16d75457b2852e8893887d5be6da5f8128e64ffe8311853baf6453
 DIST libva-intel-driver-2.2.0.tar.gz 3966600 BLAKE2B 859bf9a51cabf4736b897bc3189ad20f1d36f9f7ee0acdf828a358e9aaed2d20f4908ad214befbd729f1dbce94d7328018376bc6a2a72e625687e8f8a7131364 SHA512 8843e184c0d4d98a694f4fb1ba692a63795968879257b5f791f9bdf2a32e3d0fe3f9cac46533d78721d91c949063778e97b58bbbc1ba4da95b53b306c04e8e90
-DIST libva-intel-driver-2.3.0.tar.gz 3967170 BLAKE2B e736881a90b5d8c2f44d2b5ec0dcb324f79cbfc17e73d62cca8514290ea43b2620293162e8b427d54ff35ef3e37ddb3389f57976ce1d145865255391d8a11ebf SHA512 98cb6e6bdc22eefa0c7f245d3a2f1fc586d5066e9273c9031e76c30d96fc5902859119ddd4ef2ba39cd044aff57edae3a90ab2e5478c47e118132f8b2c28f1dc
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
index 0662e8f819ef..1d8bbf4cd84b 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
@@ -3,23 +3,20 @@
 
 EAPI=5
 
-SCM=""
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SCM=git-r3
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
-
 AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
+inherit autotools-multilib
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -27,15 +24,17 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
 	wayland? (
-		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-	)"
-
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS NEWS README )
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 92d13cf8a5b3..1d8bbf4cd84b 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
-
 AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
+inherit autotools-multilib
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
 IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS NEWS README )
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"