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)

3 files changed, 20 insertions, 29 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index c0cf053e1d00..3f1d1423ebdf 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -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 <maksbotan@gentoo.org>
+  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 <vincent@gentoo.org>
   mplayer2-2.0_p20130428-r1.ebuild:
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
index c2caa1f0d392..a5731ace509e 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
@@ -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 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 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 @@ REQUIRED_USE="
 	dvdnav? ( dvd )
 	enca? ( iconv )
 	lcms? ( opengl )
+	libass? ( iconv )
 	opengl? ( || ( aqua X ) )
 	portaudio? ( threads )
 	pvr? ( v4l )
@@ -108,7 +109,6 @@ RDEPEND+="
 	>=virtual/ffmpeg-9[threads?,vdpau?]
 	symlink? ( !media-video/mplayer )
 "
-ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	${PYTHON_DEPS}
@@ -119,21 +119,14 @@ DEPEND="${RDEPEND}
 		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 @@ pkg_setup() {
 }
 
 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 @@ src_prepare() {
 		sed -e "s/mplayer/${PN}/" \
 			-i TOOLS/midentify.sh || die
 	fi
-
-	base_src_prepare
 }
 
 src_configure() {
@@ -354,12 +348,12 @@ src_configure() {
 }
 
 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
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index f4a912ddd571..d4cf8977190f 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -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 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 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 @@ RDEPEND+="
 	>=virtual/ffmpeg-9[threads?,vdpau?]
 	symlink? ( !media-video/mplayer )
 "
-ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	${PYTHON_DEPS}
@@ -120,21 +119,14 @@ DEPEND="${RDEPEND}
 		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 @@ pkg_setup() {
 }
 
 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 @@ src_prepare() {
 		sed -e "s/mplayer/${PN}/" \
 			-i TOOLS/midentify.sh || die
 	fi
-
-	base_src_prepare
 }
 
 src_configure() {
@@ -355,12 +348,12 @@ src_configure() {
 }
 
 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