Bug #326179 - Move vlc blockers to DEPEND and bump to EAPI 3 so that die in pkg_setup is unnecessary.

(Portage version: 2.2_rc67_p182/cvs/Linux i686)

4 files changed, 15 insertions, 31 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fbb503920ae1..220aadc84acc 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.600 2010/06/27 18:06:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.601 2010/07/03 04:48:09 zmedico Exp $
+
+  03 Jul 2010; Zac Medico <zmedico@gentoo.org> vlc-1.1.0.ebuild,
+  vlc-1.1.9999.ebuild, vlc-9999.ebuild:
+  Bug #326179 - Move vlc blockers to DEPEND and bump to EAPI 3 so that die
+  in pkg_setup is unnecessary.
 
   27 Jun 2010; Raúl Porcel <armin76@gentoo.org> vlc-1.1.0.ebuild:
   Re-add ~alpha/~arm/~sparc wrt #325007
diff --git a/media-video/vlc/vlc-1.1.0.ebuild b/media-video/vlc/vlc-1.1.0.ebuild
index e7bb73996d23..781d19a50ca6 100644
--- a/media-video/vlc/vlc-1.1.0.ebuild
+++ b/media-video/vlc/vlc-1.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.7 2010/06/27 18:06:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.8 2010/07/03 04:48:09 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -56,7 +56,6 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
-		!!<=media-video/vlc-1.0.99999
 		sys-libs/zlib
 		>=media-libs/libdvbpsi-0.1.6
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
@@ -144,6 +143,7 @@ RDEPEND="
 		"
 
 DEPEND="${RDEPEND}
+	!!<=media-video/vlc-1.0.99999
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	v4l? ( sys-kernel/linux-headers )
@@ -170,13 +170,6 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
-	if has_version '<=media-video/vlc-1.0.99999'; then
-		eerror "Please unmerge vlc-1.0.x first before installing ${P}"
-		eerror "If you don't do that, some plugins will get linked against"
-		eerror "the old ${PN} version and will not work."
-		die "Unmerge vlc 1.0.x first"
-	fi
-
 	# Useflags we need to forcefuly enable
 	vlc_use_force remoteosd gcrypt
 	vlc_use_force gnutls gcrypt
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index b2c01115b3a4..fd1904c1f26c 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.12 2010/06/25 11:30:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.13 2010/07/03 04:48:09 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -56,7 +56,6 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
-		!!<=media-video/vlc-1.0.99999
 		sys-libs/zlib
 		>=media-libs/libdvbpsi-0.1.6
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
@@ -144,6 +143,7 @@ RDEPEND="
 		"
 
 DEPEND="${RDEPEND}
+	!!<=media-video/vlc-1.0.99999
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	v4l? ( sys-kernel/linux-headers )
@@ -170,13 +170,6 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
-	if has_version '<=media-video/vlc-1.0.99999'; then
-		eerror "Please unmerge vlc-1.0.x first before installing ${P}"
-		eerror "If you don't do that, some plugins will get linked against"
-		eerror "the old ${PN} version and will not work."
-		die "Unmerge vlc 1.0.x first"
-	fi
-
 	# Useflags we need to forcefuly enable
 	vlc_use_force remoteosd gcrypt
 	vlc_use_force gnutls gcrypt
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e60349f4097d..f26466dcb6ac 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.79 2010/06/25 11:30:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.80 2010/07/03 04:48:09 zmedico Exp $
 
-EAPI="2"
+EAPI="3"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -56,7 +56,6 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
-		!!<=media-video/vlc-1.0.99999
 		sys-libs/zlib
 		>=media-libs/libdvbpsi-0.1.6
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
@@ -144,6 +143,7 @@ RDEPEND="
 		"
 
 DEPEND="${RDEPEND}
+	!!<=media-video/vlc-1.0.99999
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	v4l? ( sys-kernel/linux-headers )
@@ -170,13 +170,6 @@ vlc_use_enable_force() {
 }
 
 pkg_setup() {
-	if has_version '<=media-video/vlc-1.0.99999'; then
-		eerror "Please unmerge vlc-1.0.x first before installing ${P}"
-		eerror "If you don't do that, some plugins will get linked against"
-		eerror "the old ${PN} version and will not work."
-		die "Unmerge vlc 1.0.x first"
-	fi
-
 	# Useflags we need to forcefuly enable
 	vlc_use_force remoteosd gcrypt
 	vlc_use_force gnutls gcrypt