gentoo resync : 04.01.2018

3 files changed, 52 insertions, 63 deletions

diff --git a/media-plugins/npapi-vlc/Manifest b/media-plugins/npapi-vlc/Manifest
index ddfe9f091298..1467095200aa 100644
--- a/media-plugins/npapi-vlc/Manifest
+++ b/media-plugins/npapi-vlc/Manifest
@@ -1,5 +1,5 @@
 AUX xembed.h 1138 BLAKE2B e1259b74781bcc134702b5bdd3a914c7dbfbdcb14ea969141975e482db198e2016c1f58a2f9fafe83a945dec71271dc4be57c0aef595a8dbf6d785a283a4e119 SHA512 155f7f5787d23e0913650d83bb1f1904aabb6d6889ae44886757e9f6da9c022c91a73b6ec61acda1975c8bb2a3c029a12f1321c94ab81b9a5a6d095f2c483c52
 DIST npapi-vlc-2.0.0.tar.xz 359508 BLAKE2B 0d502e70b4cb56f1bbaedebed570d13d17ac2c5f43da39f453b88095a2ed1008c2bd4c00f08706a895d66bd83e172cd20e1416d16905752d536795c40ac26851 SHA512 76da0e013c5477cd9b5eb84f7374912f3077bb03cf6723b3d173ec4df31a021ab72d6e8d1847951ff7e39f61c42e3e5e913dcdd1d0f77e6b0028dcb4ac579466
-EBUILD npapi-vlc-2.0.0.ebuild 1192 BLAKE2B e8fc77dfe913651e5db58e4057de6d4844c658e431f8acb78c878eee532d9e54c480bedbc2da26565073f312e3e15d31517bce7e93950dd98dea0c6e606affb5 SHA512 72cb180663bcbbda448d277b77a422ca4418c2ca3d89b47ba32e2a4e81a6ff42c0bf780f0c40765e6564f4eac83c5f8a55c735aa242d931d35ac6af3912771dd
-EBUILD npapi-vlc-9999.ebuild 1134 BLAKE2B b9069e65c6717fbcd139c0be0d64072a5ed87926461bddc28880e8d866fd3be0cd82ef265c90fe37c8bfea345c7f8a4befa40aec4310679f1e1a589544a6df4e SHA512 2fee9f64cf719ebfa3983f1a5213c2f1535b339f778e947caaca799781738e3b72489524659c2b5cba766640de61f7477f72a28fd3906367b9b25af08df09bff
+EBUILD npapi-vlc-2.0.0.ebuild 1005 BLAKE2B 42525d8a9590377bbc45ac58f0c42857453d24f55a6f964bcb03c8eb9f14b5ccfe0278de700b6e04770f1e49c355ceb0e32644cce93c639bb377f124e58364d1 SHA512 095b80dd9a202f1ac200ffe6c013f59d83fa88d6f3d3d0247b14c819c74d1a74f4bf2c46f72b4226b8a350c23f4ef231a03ecc8f799b4f5c748f9f64d44c4baf
+EBUILD npapi-vlc-9999.ebuild 1007 BLAKE2B 947ad63e0ac24faa77b79dc19ad9e021e734dfc2d67ea6b8ef3605b464198ab0264e7a6b7b07e6a786d5fae96ba5a0cbf32eb13ff694f512a3ddd99e1bb0af52 SHA512 68d0a4e534b9f4cea91a4cb0513ab1c4f5902d2fcceb592c53bef56238510c438d38dee6924161a7abd7a4f7f33d91606d169e09fbed43a350d87fcc48998fc5
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
index e4c53408b9d7..7e64741327ae 100644
--- a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
+++ b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
@@ -1,57 +1,51 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP=""
-	EGIT_REPO_URI="git://git.videolan.org/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git"
+else
+	KEYWORDS="amd64 ~ppc64 x86"
+	DEPEND="app-arch/xz-utils"
+	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
 fi
 
-inherit autotools multilib ${SCM}
-
 DESCRIPTION="Mozilla plugin based on VLC"
 HOMEPAGE="http://www.videolan.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	KEYWORDS=""
-	SRC_URI=""
-fi
 IUSE="gtk"
 
-RDEPEND=">=media-video/vlc-1.1
+RDEPEND="
+	>=media-video/vlc-1.1
 	x11-libs/libX11
-	!gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE )
+	!gtk? (
+		x11-libs/libXpm
+		x11-libs/libSM
+		x11-libs/libICE
+	)
 	gtk? ( x11-libs/gtk+:2 )
 	!<media-video/vlc-1.2[nsplugin]"
-DEPEND="${RDEPEND}
-	${DEPEND}
+DEPEND+="
+	${RDEPEND}
 	virtual/pkgconfig
 	>=net-misc/npapi-sdk-0.27"
 
 src_prepare() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		eautoreconf
-	fi
-	cp "${FILESDIR}/xembed.h" "${S}/npapi/" || die
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_with gtk)
+	econf $(use_with gtk)
 }
 
 src_install() {
-	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die
-	find "${D}" -name '*.la' -delete
-	dodoc NEWS AUTHORS ChangeLog || die
+	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
index 48a5b152ac91..b4e4e67c3dd1 100644
--- a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
+++ b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
@@ -1,56 +1,51 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP=""
-	EGIT_REPO_URI="git://git.videolan.org/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git"
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	DEPEND="app-arch/xz-utils"
+	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
 fi
 
-inherit autotools multilib ${SCM}
-
 DESCRIPTION="Mozilla plugin based on VLC"
 HOMEPAGE="http://www.videolan.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64"
-	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	KEYWORDS=""
-	SRC_URI=""
-fi
 IUSE="gtk"
 
-RDEPEND=">=media-video/vlc-1.1
+RDEPEND="
+	>=media-video/vlc-1.1
 	x11-libs/libX11
-	!gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE )
+	!gtk? (
+		x11-libs/libXpm
+		x11-libs/libSM
+		x11-libs/libICE
+	)
 	gtk? ( x11-libs/gtk+:2 )
 	!<media-video/vlc-1.2[nsplugin]"
-DEPEND="${RDEPEND}
-	${DEPEND}
+DEPEND+="
+	${RDEPEND}
 	virtual/pkgconfig
 	>=net-misc/npapi-sdk-0.27"
 
 src_prepare() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		eautoreconf
-	fi
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_with gtk)
+	econf $(use_with gtk)
 }
 
 src_install() {
-	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die
-	find "${D}" -name '*.la' -delete
-	dodoc NEWS AUTHORS ChangeLog || die
+	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
 }