maksbotan 14/05/01 20:17:09
Modified: mplayer2-9999.ebuild
mplayer2-2.0_p20130428-r1.ebuild ChangeLog
Log:
Drop usage of base.eclass, bug #508128. Thanks to Nikoli.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F8DBDADE)
Revision Changes Path
1.66 media-video/mplayer2/mplayer2-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.66&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.66&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.65&r2=1.66
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mplayer2-9999.ebuild 29 Jan 2014 22:58:13 -0000 1.65
+++ mplayer2-9999.ebuild 1 May 2014 20:17:09 -0000 1.66
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
1.65 2014/01/29 22:58:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
1.66 2014/05/01 20:17:09 maksbotan Exp $
EAPI=5
@@ -9,7 +9,7 @@
EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-inherit toolchain-funcs flag-o-matic multilib base python-any-r1
+inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
[[ ${PV} == *9999* ]] && inherit git-2
NAMESUF="${PN/mplayer/}"
@@ -109,7 +109,6 @@
>=virtual/ffmpeg-9[threads?,vdpau?]
symlink? ( !media-video/mplayer )
"
-ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
${PYTHON_DEPS}
@@ -120,21 +119,14 @@
xinerama? ( x11-proto/xineramaproto )
xscreensaver? ( x11-proto/scrnsaverproto )
)
- amd64? ( ${ASM_DEP} )
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
)
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf
etc/codecs.conf )
-PATCHES=(
- "${FILESDIR}/${PN}-py2compat.patch"
-)
-
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
@@ -168,6 +160,9 @@
}
src_prepare() {
+ epatch "${FILESDIR}/${PN}-py2compat.patch"
+ epatch_user
+
# fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" \
configure version.sh || die
@@ -182,8 +177,6 @@
sed -e "s/mplayer/${PN}/" \
-i TOOLS/midentify.sh || die
fi
-
- base_src_prepare
}
src_configure() {
@@ -355,12 +348,12 @@
}
src_compile() {
- base_src_compile
+ default
use doc && emake -C DOCS/xml html-chunked
}
src_install() {
- base_src_install
+ default
if use doc; then
rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
1.9 media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild?rev=1.9&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild?r1=1.8&r2=1.9
Index: mplayer2-2.0_p20130428-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer2-2.0_p20130428-r1.ebuild 4 Mar 2014 20:46:56 -0000 1.8
+++ mplayer2-2.0_p20130428-r1.ebuild 1 May 2014 20:17:09 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -9,7 +9,7 @@
EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-inherit toolchain-funcs flag-o-matic multilib base python-any-r1
+inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
[[ ${PV} == *9999* ]] && inherit git-2
NAMESUF="${PN/mplayer/}"
@@ -39,6 +39,7 @@
dvdnav? ( dvd )
enca? ( iconv )
lcms? ( opengl )
+ libass? ( iconv )
opengl? ( || ( aqua X ) )
portaudio? ( threads )
pvr? ( v4l )
@@ -108,7 +109,6 @@
>=virtual/ffmpeg-9[threads?,vdpau?]
symlink? ( !media-video/mplayer )
"
-ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
${PYTHON_DEPS}
@@ -119,21 +119,14 @@
xinerama? ( x11-proto/xineramaproto )
xscreensaver? ( x11-proto/scrnsaverproto )
)
- amd64? ( ${ASM_DEP} )
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
)
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf
etc/codecs.conf )
-PATCHES=(
- "${FILESDIR}/${PN}-py2compat.patch"
-)
-
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
@@ -167,6 +160,9 @@
}
src_prepare() {
+ epatch "${FILESDIR}/${PN}-py2compat.patch"
+ epatch_user
+
# fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" \
configure version.sh || die
@@ -181,8 +177,6 @@
sed -e "s/mplayer/${PN}/" \
-i TOOLS/midentify.sh || die
fi
-
- base_src_prepare
}
src_configure() {
@@ -354,12 +348,12 @@
}
src_compile() {
- base_src_compile
+ default
use doc && emake -C DOCS/xml html-chunked
}
src_install() {
- base_src_install
+ default
if use doc; then
rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
1.119 media-video/mplayer2/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.119&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.119&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.118&r2=1.119
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog 4 Mar 2014 20:46:56 -0000 1.118
+++ ChangeLog 1 May 2014 20:17:09 -0000 1.119
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.118
2014/03/04 20:46:56 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.119
2014/05/01 20:17:09 maksbotan Exp $
+
+ 01 May 2014; Maxim Koltsov <[email protected]>
+ mplayer2-2.0_p20130428-r1.ebuild, mplayer2-9999.ebuild:
+ Drop usage of base.eclass, bug #508128. Thanks to Nikoli.
04 Mar 2014; Vicente Olivert Riera <[email protected]>
mplayer2-2.0_p20130428-r1.ebuild:
