Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild mplayer2-2.0_p20130428-r1.ebuild ChangeLog
Date: Thu, 01 May 2014 20:17:15
Message-Id: 20140501201709.C5AC82004C@flycatcher.gentoo.org
1 maksbotan 14/05/01 20:17:09
2
3 Modified: mplayer2-9999.ebuild
4 mplayer2-2.0_p20130428-r1.ebuild ChangeLog
5 Log:
6 Drop usage of base.eclass, bug #508128. Thanks to Nikoli.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
9
10 Revision Changes Path
11 1.66 media-video/mplayer2/mplayer2-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.66&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.66&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.65&r2=1.66
16
17 Index: mplayer2-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
20 retrieving revision 1.65
21 retrieving revision 1.66
22 diff -u -r1.65 -r1.66
23 --- mplayer2-9999.ebuild 29 Jan 2014 22:58:13 -0000 1.65
24 +++ mplayer2-9999.ebuild 1 May 2014 20:17:09 -0000 1.66
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.65 2014/01/29 22:58:13 eva Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.66 2014/05/01 20:17:09 maksbotan Exp $
30
31 EAPI=5
32
33 @@ -9,7 +9,7 @@
34
35 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
36
37 -inherit toolchain-funcs flag-o-matic multilib base python-any-r1
38 +inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
39 [[ ${PV} == *9999* ]] && inherit git-2
40
41 NAMESUF="${PN/mplayer/}"
42 @@ -109,7 +109,6 @@
43 >=virtual/ffmpeg-9[threads?,vdpau?]
44 symlink? ( !media-video/mplayer )
45 "
46 -ASM_DEP="dev-lang/yasm"
47 DEPEND="${RDEPEND}
48 virtual/pkgconfig
49 ${PYTHON_DEPS}
50 @@ -120,21 +119,14 @@
51 xinerama? ( x11-proto/xineramaproto )
52 xscreensaver? ( x11-proto/scrnsaverproto )
53 )
54 - amd64? ( ${ASM_DEP} )
55 doc? (
56 dev-libs/libxslt
57 app-text/docbook-xml-dtd
58 app-text/docbook-xsl-stylesheets
59 )
60 - x86? ( ${ASM_DEP} )
61 - x86-fbsd? ( ${ASM_DEP} )
62 "
63 DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
64
65 -PATCHES=(
66 - "${FILESDIR}/${PN}-py2compat.patch"
67 -)
68 -
69 pkg_setup() {
70 if [[ ${PV} == *9999* ]]; then
71 elog
72 @@ -168,6 +160,9 @@
73 }
74
75 src_prepare() {
76 + epatch "${FILESDIR}/${PN}-py2compat.patch"
77 + epatch_user
78 +
79 # fix path to bash executable in configure scripts
80 sed -i -e "1c\#!${EPREFIX}/bin/bash" \
81 configure version.sh || die
82 @@ -182,8 +177,6 @@
83 sed -e "s/mplayer/${PN}/" \
84 -i TOOLS/midentify.sh || die
85 fi
86 -
87 - base_src_prepare
88 }
89
90 src_configure() {
91 @@ -355,12 +348,12 @@
92 }
93
94 src_compile() {
95 - base_src_compile
96 + default
97 use doc && emake -C DOCS/xml html-chunked
98 }
99
100 src_install() {
101 - base_src_install
102 + default
103
104 if use doc; then
105 rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
106
107
108
109 1.9 media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
110
111 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild?rev=1.9&view=markup
112 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild?rev=1.9&content-type=text/plain
113 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild?r1=1.8&r2=1.9
114
115 Index: mplayer2-2.0_p20130428-r1.ebuild
116 ===================================================================
117 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v
118 retrieving revision 1.8
119 retrieving revision 1.9
120 diff -u -r1.8 -r1.9
121 --- mplayer2-2.0_p20130428-r1.ebuild 4 Mar 2014 20:46:56 -0000 1.8
122 +++ mplayer2-2.0_p20130428-r1.ebuild 1 May 2014 20:17:09 -0000 1.9
123 @@ -1,6 +1,6 @@
124 # Copyright 1999-2014 Gentoo Foundation
125 # Distributed under the terms of the GNU General Public License v2
126 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.8 2014/03/04 20:46:56 vincent Exp $
127 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.9 2014/05/01 20:17:09 maksbotan Exp $
128
129 EAPI=5
130
131 @@ -9,7 +9,7 @@
132
133 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
134
135 -inherit toolchain-funcs flag-o-matic multilib base python-any-r1
136 +inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
137 [[ ${PV} == *9999* ]] && inherit git-2
138
139 NAMESUF="${PN/mplayer/}"
140 @@ -39,6 +39,7 @@
141 dvdnav? ( dvd )
142 enca? ( iconv )
143 lcms? ( opengl )
144 + libass? ( iconv )
145 opengl? ( || ( aqua X ) )
146 portaudio? ( threads )
147 pvr? ( v4l )
148 @@ -108,7 +109,6 @@
149 >=virtual/ffmpeg-9[threads?,vdpau?]
150 symlink? ( !media-video/mplayer )
151 "
152 -ASM_DEP="dev-lang/yasm"
153 DEPEND="${RDEPEND}
154 virtual/pkgconfig
155 ${PYTHON_DEPS}
156 @@ -119,21 +119,14 @@
157 xinerama? ( x11-proto/xineramaproto )
158 xscreensaver? ( x11-proto/scrnsaverproto )
159 )
160 - amd64? ( ${ASM_DEP} )
161 doc? (
162 dev-libs/libxslt
163 app-text/docbook-xml-dtd
164 app-text/docbook-xsl-stylesheets
165 )
166 - x86? ( ${ASM_DEP} )
167 - x86-fbsd? ( ${ASM_DEP} )
168 "
169 DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
170
171 -PATCHES=(
172 - "${FILESDIR}/${PN}-py2compat.patch"
173 -)
174 -
175 pkg_setup() {
176 if [[ ${PV} == *9999* ]]; then
177 elog
178 @@ -167,6 +160,9 @@
179 }
180
181 src_prepare() {
182 + epatch "${FILESDIR}/${PN}-py2compat.patch"
183 + epatch_user
184 +
185 # fix path to bash executable in configure scripts
186 sed -i -e "1c\#!${EPREFIX}/bin/bash" \
187 configure version.sh || die
188 @@ -181,8 +177,6 @@
189 sed -e "s/mplayer/${PN}/" \
190 -i TOOLS/midentify.sh || die
191 fi
192 -
193 - base_src_prepare
194 }
195
196 src_configure() {
197 @@ -354,12 +348,12 @@
198 }
199
200 src_compile() {
201 - base_src_compile
202 + default
203 use doc && emake -C DOCS/xml html-chunked
204 }
205
206 src_install() {
207 - base_src_install
208 + default
209
210 if use doc; then
211 rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
212
213
214
215 1.119 media-video/mplayer2/ChangeLog
216
217 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.119&view=markup
218 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.119&content-type=text/plain
219 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.118&r2=1.119
220
221 Index: ChangeLog
222 ===================================================================
223 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
224 retrieving revision 1.118
225 retrieving revision 1.119
226 diff -u -r1.118 -r1.119
227 --- ChangeLog 4 Mar 2014 20:46:56 -0000 1.118
228 +++ ChangeLog 1 May 2014 20:17:09 -0000 1.119
229 @@ -1,6 +1,10 @@
230 # ChangeLog for media-video/mplayer2
231 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
232 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.118 2014/03/04 20:46:56 vincent Exp $
233 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.119 2014/05/01 20:17:09 maksbotan Exp $
234 +
235 + 01 May 2014; Maxim Koltsov <maksbotan@g.o>
236 + mplayer2-2.0_p20130428-r1.ebuild, mplayer2-9999.ebuild:
237 + Drop usage of base.eclass, bug #508128. Thanks to Nikoli.
238
239 04 Mar 2014; Vicente Olivert Riera <vincent@g.o>
240 mplayer2-2.0_p20130428-r1.ebuild:
Report Message
Find on MARC Find on Google Groups