1 |
voyageur 09/06/17 16:14:23 |
2 |
|
3 |
Modified: ChangeLog chromium-bin-9999.ebuild |
4 |
chromium-bin-0_p18366.ebuild |
5 |
Log: |
6 |
Only link to adobe-flash libraries when it is detected on the system |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.9 www-client/chromium-bin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.9&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.9&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?r1=1.8&r2=1.9 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v |
19 |
retrieving revision 1.8 |
20 |
retrieving revision 1.9 |
21 |
diff -u -r1.8 -r1.9 |
22 |
--- ChangeLog 14 Jun 2009 20:49:19 -0000 1.8 |
23 |
+++ ChangeLog 17 Jun 2009 16:14:23 -0000 1.9 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for www-client/chromium-bin |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.8 2009/06/14 20:49:19 voyageur Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.9 2009/06/17 16:14:23 voyageur Exp $ |
29 |
+ |
30 |
+ 17 Jun 2009; Bernard Cafarelli <voyageur@g.o> |
31 |
+ chromium-bin-0_p18366.ebuild, chromium-bin-9999.ebuild: |
32 |
+ Only link to adobe-flash libraries when it is detected on the system |
33 |
|
34 |
*chromium-bin-0_p18366 (14 Jun 2009) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.10 www-client/chromium-bin/chromium-bin-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.10&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.10&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?r1=1.9&r2=1.10 |
44 |
|
45 |
Index: chromium-bin-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v |
48 |
retrieving revision 1.9 |
49 |
retrieving revision 1.10 |
50 |
diff -u -r1.9 -r1.10 |
51 |
--- chromium-bin-9999.ebuild 14 Jun 2009 20:49:19 -0000 1.9 |
52 |
+++ chromium-bin-9999.ebuild 17 Jun 2009 16:14:23 -0000 1.10 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.9 2009/06/14 20:49:19 voyageur Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.10 2009/06/17 16:14:23 voyageur Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
inherit eutils multilib |
61 |
@@ -64,10 +64,12 @@ |
62 |
einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin" |
63 |
NSS_DIR=../../../opt/xulrunner |
64 |
NSPR_DIR=../../../opt/xulrunner |
65 |
- else |
66 |
+ elif has_version www-plugins/adobe-flash; then |
67 |
einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash" |
68 |
NSS_DIR=../../../opt/flash-libcompat |
69 |
NSPR_DIR=../../../opt/flash-libcompat |
70 |
+ else |
71 |
+ die "One of these packages is needed: www-client/mozilla-firefox-bin, net-libs/xulrunner-bin, www-plugins/adobe-flash[32bit]" |
72 |
fi |
73 |
|
74 |
fi |
75 |
|
76 |
|
77 |
|
78 |
1.2 www-client/chromium-bin/chromium-bin-0_p18366.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild?rev=1.2&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild?rev=1.2&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild?r1=1.1&r2=1.2 |
83 |
|
84 |
Index: chromium-bin-0_p18366.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v |
87 |
retrieving revision 1.1 |
88 |
retrieving revision 1.2 |
89 |
diff -u -r1.1 -r1.2 |
90 |
--- chromium-bin-0_p18366.ebuild 14 Jun 2009 20:49:19 -0000 1.1 |
91 |
+++ chromium-bin-0_p18366.ebuild 17 Jun 2009 16:14:23 -0000 1.2 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2009 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v 1.1 2009/06/14 20:49:19 voyageur Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-0_p18366.ebuild,v 1.2 2009/06/17 16:14:23 voyageur Exp $ |
97 |
|
98 |
EAPI="2" |
99 |
inherit eutils multilib |
100 |
@@ -60,10 +60,12 @@ |
101 |
einfo "Using NSS/NSPR libraries from net-libs/xulrunner-bin" |
102 |
NSS_DIR=../../../opt/xulrunner |
103 |
NSPR_DIR=../../../opt/xulrunner |
104 |
- else |
105 |
+ elif has_version www-plugins/adobe-flash; then |
106 |
einfo "Using NSS/NSPR libraries from www-plugins/adobe-flash" |
107 |
NSS_DIR=../../../opt/flash-libcompat |
108 |
NSPR_DIR=../../../opt/flash-libcompat |
109 |
+ else |
110 |
+ die "One of these packages is needed: www-client/mozilla-firefox-bin, net-libs/xulrunner-bin, www-plugins/adobe-flash[32bit]" |
111 |
fi |
112 |
|
113 |
fi |