1 |
aballier 07/10/10 21:41:32 |
2 |
|
3 |
Modified: vlc-0.9.0_alpha20071009.ebuild ChangeLog |
4 |
Log: |
5 |
get back to only one slot, add a check for older versions instead, bug #195424 |
6 |
(Portage version: 2.1.3.12) |
7 |
|
8 |
Revision Changes Path |
9 |
1.9 media-video/vlc/vlc-0.9.0_alpha20071009.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild?rev=1.9&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild?rev=1.9&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild?r1=1.8&r2=1.9 |
14 |
|
15 |
Index: vlc-0.9.0_alpha20071009.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v |
18 |
retrieving revision 1.8 |
19 |
retrieving revision 1.9 |
20 |
diff -u -r1.8 -r1.9 |
21 |
--- vlc-0.9.0_alpha20071009.ebuild 10 Oct 2007 18:11:26 -0000 1.8 |
22 |
+++ vlc-0.9.0_alpha20071009.ebuild 10 Oct 2007 21:41:32 -0000 1.9 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2007 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.8 2007/10/10 18:11:26 aballier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.9 2007/10/10 21:41:32 aballier Exp $ |
28 |
|
29 |
WANT_AUTOMAKE=latest |
30 |
WANT_AUTOCONF=latest |
31 |
@@ -37,7 +37,7 @@ |
32 |
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" |
33 |
|
34 |
LICENSE="GPL-2" |
35 |
-SLOT="1" |
36 |
+SLOT="0" |
37 |
|
38 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
39 |
IUSE="3dfx a52 aalib alsa altivec arts avahi bidi cdda cddb cdio daap dbus dc1394 |
40 |
@@ -156,21 +156,18 @@ |
41 |
|
42 |
S="${WORKDIR}/${MY_P}" |
43 |
|
44 |
-# Block older versions, we can't upgrade cleanly until bug #157746 gets |
45 |
-# resolved... |
46 |
-RDEPEND="${RDEPEND} |
47 |
- !<media-video/vlc-0.8.8" |
48 |
-DEPEND="${DEPEND} |
49 |
- !<media-video/vlc-0.8.8" |
50 |
- |
51 |
- |
52 |
- |
53 |
# Dispalys a warning if the first use flag is set but not the second |
54 |
vlc_use_needs() { |
55 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
56 |
} |
57 |
|
58 |
pkg_setup() { |
59 |
+ if has_version '<media-video/vlc-0.8.8'; then |
60 |
+ eerror "Upgrading from <0.9 vlc series will give you a broken player" |
61 |
+ eerror "Please unmerge it first" |
62 |
+ eerror "And have a look at https://bugs.gentoo.org/show_bug.cgi?id=157746" |
63 |
+ die "Please unmerge older vlc versions" |
64 |
+ fi |
65 |
if use wxwindows || use skins; then |
66 |
WX_GTK_VER="2.6" |
67 |
need-wxwidgets unicode || die "You need to install wxGTK with unicode support." |
68 |
|
69 |
|
70 |
|
71 |
1.267 media-video/vlc/ChangeLog |
72 |
|
73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.267&view=markup |
74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.267&content-type=text/plain |
75 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.266&r2=1.267 |
76 |
|
77 |
Index: ChangeLog |
78 |
=================================================================== |
79 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
80 |
retrieving revision 1.266 |
81 |
retrieving revision 1.267 |
82 |
diff -u -r1.266 -r1.267 |
83 |
--- ChangeLog 10 Oct 2007 18:11:26 -0000 1.266 |
84 |
+++ ChangeLog 10 Oct 2007 21:41:32 -0000 1.267 |
85 |
@@ -1,6 +1,10 @@ |
86 |
# ChangeLog for media-video/vlc |
87 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
88 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.266 2007/10/10 18:11:26 aballier Exp $ |
89 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.267 2007/10/10 21:41:32 aballier Exp $ |
90 |
+ |
91 |
+ 10 Oct 2007; Alexis Ballier <aballier@g.o> |
92 |
+ vlc-0.9.0_alpha20071009.ebuild: |
93 |
+ get back to only one slot, add a check for older versions instead, bug #195424 |
94 |
|
95 |
10 Oct 2007; Alexis Ballier <aballier@g.o> |
96 |
vlc-0.9.0_alpha20071009.ebuild: |
97 |
|
98 |
|
99 |
|
100 |
-- |
101 |
gentoo-commits@g.o mailing list |