commit: 4ba7cb311e6bf8e65b727de19ac8932d727742ba
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 18:38:17 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 18:38:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba7cb31
media-plugins/npapi-vlc: Port to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild | 56 ++++++++++++--------------
media-plugins/npapi-vlc/npapi-vlc-9999.ebuild | 55 ++++++++++++-------------
2 files changed, 50 insertions(+), 61 deletions(-)
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 e4c53408b9d..7e64741327a 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 48a5b152ac9..b4e4e67c3dd 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
}
