1 |
commit: 4ba7cb311e6bf8e65b727de19ac8932d727742ba |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 18:38:17 2018 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 3 18:38:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba7cb31 |
7 |
|
8 |
media-plugins/npapi-vlc: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild | 56 ++++++++++++-------------- |
13 |
media-plugins/npapi-vlc/npapi-vlc-9999.ebuild | 55 ++++++++++++------------- |
14 |
2 files changed, 50 insertions(+), 61 deletions(-) |
15 |
|
16 |
diff --git a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild |
17 |
index e4c53408b9d..7e64741327a 100644 |
18 |
--- a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild |
19 |
+++ b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild |
20 |
@@ -1,57 +1,51 @@ |
21 |
-# Copyright 1999-2012 Gentoo Foundation |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=3 |
26 |
+EAPI=6 |
27 |
|
28 |
-SCM="" |
29 |
-if [ "${PV%9999}" != "${PV}" ] ; then |
30 |
- SCM=git-2 |
31 |
- EGIT_BOOTSTRAP="" |
32 |
- EGIT_REPO_URI="git://git.videolan.org/${PN}.git" |
33 |
+if [[ ${PV} == *9999 ]] ; then |
34 |
+ inherit autotools git-r3 |
35 |
+ EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git" |
36 |
+else |
37 |
+ KEYWORDS="amd64 ~ppc64 x86" |
38 |
+ DEPEND="app-arch/xz-utils" |
39 |
+ SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" |
40 |
fi |
41 |
|
42 |
-inherit autotools multilib ${SCM} |
43 |
- |
44 |
DESCRIPTION="Mozilla plugin based on VLC" |
45 |
HOMEPAGE="http://www.videolan.org/" |
46 |
|
47 |
LICENSE="LGPL-2.1" |
48 |
SLOT="0" |
49 |
- |
50 |
-if [ "${PV%9999}" = "${PV}" ] ; then |
51 |
- KEYWORDS="amd64 ~ppc64 x86" |
52 |
- SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" |
53 |
- DEPEND="app-arch/xz-utils" |
54 |
-else |
55 |
- KEYWORDS="" |
56 |
- SRC_URI="" |
57 |
-fi |
58 |
IUSE="gtk" |
59 |
|
60 |
-RDEPEND=">=media-video/vlc-1.1 |
61 |
+RDEPEND=" |
62 |
+ >=media-video/vlc-1.1 |
63 |
x11-libs/libX11 |
64 |
- !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) |
65 |
+ !gtk? ( |
66 |
+ x11-libs/libXpm |
67 |
+ x11-libs/libSM |
68 |
+ x11-libs/libICE |
69 |
+ ) |
70 |
gtk? ( x11-libs/gtk+:2 ) |
71 |
!<media-video/vlc-1.2[nsplugin]" |
72 |
-DEPEND="${RDEPEND} |
73 |
- ${DEPEND} |
74 |
+DEPEND+=" |
75 |
+ ${RDEPEND} |
76 |
virtual/pkgconfig |
77 |
>=net-misc/npapi-sdk-0.27" |
78 |
|
79 |
src_prepare() { |
80 |
- if [ "${PV%9999}" != "${PV}" ] ; then |
81 |
- eautoreconf |
82 |
- fi |
83 |
- cp "${FILESDIR}/xembed.h" "${S}/npapi/" || die |
84 |
+ default |
85 |
+ [[ ${PV} == *9999 ]] && eautoreconf |
86 |
} |
87 |
|
88 |
src_configure() { |
89 |
- econf \ |
90 |
- $(use_with gtk) |
91 |
+ econf $(use_with gtk) |
92 |
} |
93 |
|
94 |
src_install() { |
95 |
- emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die |
96 |
- find "${D}" -name '*.la' -delete |
97 |
- dodoc NEWS AUTHORS ChangeLog || die |
98 |
+ emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install |
99 |
+ einstalldocs |
100 |
+ |
101 |
+ find "${D}" -name '*.la' -delete || die |
102 |
} |
103 |
|
104 |
diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild |
105 |
index 48a5b152ac9..b4e4e67c3dd 100644 |
106 |
--- a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild |
107 |
+++ b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild |
108 |
@@ -1,56 +1,51 @@ |
109 |
-# Copyright 1999-2012 Gentoo Foundation |
110 |
+# Copyright 1999-2018 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
|
113 |
-EAPI=3 |
114 |
+EAPI=6 |
115 |
|
116 |
-SCM="" |
117 |
-if [ "${PV%9999}" != "${PV}" ] ; then |
118 |
- SCM=git-2 |
119 |
- EGIT_BOOTSTRAP="" |
120 |
- EGIT_REPO_URI="git://git.videolan.org/${PN}.git" |
121 |
+if [[ ${PV} == *9999 ]] ; then |
122 |
+ inherit autotools git-r3 |
123 |
+ EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git" |
124 |
+else |
125 |
+ KEYWORDS="~amd64 ~ppc64 ~x86" |
126 |
+ DEPEND="app-arch/xz-utils" |
127 |
+ SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" |
128 |
fi |
129 |
|
130 |
-inherit autotools multilib ${SCM} |
131 |
- |
132 |
DESCRIPTION="Mozilla plugin based on VLC" |
133 |
HOMEPAGE="http://www.videolan.org/" |
134 |
|
135 |
LICENSE="LGPL-2.1" |
136 |
SLOT="0" |
137 |
- |
138 |
-if [ "${PV%9999}" = "${PV}" ] ; then |
139 |
- KEYWORDS="~amd64" |
140 |
- SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" |
141 |
- DEPEND="app-arch/xz-utils" |
142 |
-else |
143 |
- KEYWORDS="" |
144 |
- SRC_URI="" |
145 |
-fi |
146 |
IUSE="gtk" |
147 |
|
148 |
-RDEPEND=">=media-video/vlc-1.1 |
149 |
+RDEPEND=" |
150 |
+ >=media-video/vlc-1.1 |
151 |
x11-libs/libX11 |
152 |
- !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) |
153 |
+ !gtk? ( |
154 |
+ x11-libs/libXpm |
155 |
+ x11-libs/libSM |
156 |
+ x11-libs/libICE |
157 |
+ ) |
158 |
gtk? ( x11-libs/gtk+:2 ) |
159 |
!<media-video/vlc-1.2[nsplugin]" |
160 |
-DEPEND="${RDEPEND} |
161 |
- ${DEPEND} |
162 |
+DEPEND+=" |
163 |
+ ${RDEPEND} |
164 |
virtual/pkgconfig |
165 |
>=net-misc/npapi-sdk-0.27" |
166 |
|
167 |
src_prepare() { |
168 |
- if [ "${PV%9999}" != "${PV}" ] ; then |
169 |
- eautoreconf |
170 |
- fi |
171 |
+ default |
172 |
+ [[ ${PV} == *9999 ]] && eautoreconf |
173 |
} |
174 |
|
175 |
src_configure() { |
176 |
- econf \ |
177 |
- $(use_with gtk) |
178 |
+ econf $(use_with gtk) |
179 |
} |
180 |
|
181 |
src_install() { |
182 |
- emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die |
183 |
- find "${D}" -name '*.la' -delete |
184 |
- dodoc NEWS AUTHORS ChangeLog || die |
185 |
+ emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install |
186 |
+ einstalldocs |
187 |
+ |
188 |
+ find "${D}" -name '*.la' -delete || die |
189 |
} |