From 3a8491e9a13567277860891e076e7386e557cc9e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 3 Jul 2010 04:48:09 +0000 Subject: [PATCH] Bug #326179 - Move vlc blockers to DEPEND and bump to EAPI 3 so that die in pkg_setup is unnecessary. Package-Manager: portage-2.2_rc67_p182/cvs/Linux i686 --- media-video/vlc/ChangeLog | 7 ++++++- media-video/vlc/Manifest | 18 ++++++++++++++---- media-video/vlc/vlc-1.1.0.ebuild | 13 +++---------- media-video/vlc/vlc-1.1.9999.ebuild | 13 +++---------- media-video/vlc/vlc-9999.ebuild | 13 +++---------- 5 files changed, 29 insertions(+), 35 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 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 vlc-1.1.0.ebuild: Re-add ~alpha/~arm/~sparc wrt #325007 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 2ad85316c5ee..4252919a515d 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,11 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842 DIST vlc-1.1.0.tar.bz2 23908512 RMD160 55d9d64ebeda9dcdcec488f17a1aefc4a64b4b16 SHA1 b3545548d9d99942f7a463d2758dcbc7ad250b05 SHA256 a9fb2c5cc400464bbb53ba6feb94f14884f3c76d52eac1ee4c2953a1ce63f1c8 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8 EBUILD vlc-1.0.6.ebuild 12224 RMD160 5a6b842122fb912a688c23e23dd8aaff77d1532c SHA1 2dd9d563450ae53fd833fc4d6de9ddda288d41ec SHA256 a451ef21f95174ee1bbd78526c233d7c414efe64e66dca5b487089921d6f3055 -EBUILD vlc-1.1.0.ebuild 12029 RMD160 88566294ae78e9925c63a1040440bb7ab328877d SHA1 f78483f6af5e6c42de69e0bfb677a1c18861822f SHA256 551e2be916b597d2f85dd1c2a1037bfa4034972d80589ba16593bc332a9a88c7 -EBUILD vlc-1.1.9999.ebuild 11994 RMD160 f5fcf8be7508b982f5ea97e7f2542d44993c2d2e SHA1 f6c1e0d73715bdac81a2013dd60ddecc49340daa SHA256 b56184683427d6a32bfcfcf960971e7dc2a02ef125e0d57aed2ab3382756ecfb -EBUILD vlc-9999.ebuild 11990 RMD160 98c6a7155040f1f597793d0aac039ab616ea71c2 SHA1 d29be8860dcc8efecbda21410df6f078d4183806 SHA256 f76639d1f1dcc73e8628ff52593573c11c220ca7567b3300c50845571c48fa49 -MISC ChangeLog 92941 RMD160 01ea5a3981038b6c33504b3b055216a6c599fe87 SHA1 c590b0d809c03eec2df73000f5bfe7344805e354 SHA256 e58c6ac89e6eb94fd490d4b2a805332beb490bde38caf10c816c911ed7374368 +EBUILD vlc-1.1.0.ebuild 11752 RMD160 616836aa32714977f659c48535fe853516af0c74 SHA1 fc327f31d838b05733b36b9780f7ac94bb7966c3 SHA256 4d76197ede14db58c9e63049c59fa42db01e689cfbc8f92befd7930d66a098c9 +EBUILD vlc-1.1.9999.ebuild 11716 RMD160 476ffeed51fa137887f0641240a056fe9bf9e740 SHA1 5312049597286903e5f5617c8def97b3426e6c9d SHA256 14c272c5724f5e41a485e9b5f3c93eb6f893428eefba1db12ed1d4007431353e +EBUILD vlc-9999.ebuild 11712 RMD160 e41f1ac68dc035a558c04ebcad70046374f4e5c0 SHA1 d87ac0a15b1e04d28ceba5b364270109e020f443 SHA256 900b83af378074a94deedb9d7af843c019de1c8e846e5f37f19d3d35ea321c54 +MISC ChangeLog 93153 RMD160 cdff5ef726ecf3823c6bb31d922a0f7ac34fa199 SHA1 11e99a803611af5b26b9dd455fd05e9f51e03807 SHA256 121800bc5fe3593e9b2b05c501c465ebcb5088d460b96644a545e3a34d7a7f74 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwuwVYACgkQ/ejvha5XGaOowgCgsjyBLbI9NDnAR2lxnhibrti3 +pr8AoITSz0Yq/59lbXAzxXq4IwzlSC3U +=X24e +-----END PGP SIGNATURE----- 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 -- 2.26.2