Gentoo Archives: gentoo-commits

From: "Ian Stakenvicius (axs)" <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.310-r1.ebuild ChangeLog
Date: Wed, 02 Oct 2013 18:46:10
Message-Id: 20131002184602.B8CDC2004C@flycatcher.gentoo.org
1 axs 13/10/02 18:46:02
2
3 Modified: adobe-flash-11.2.202.310-r1.ebuild ChangeLog
4 Log:
5 adjusted nspluginwrapper dependency to match previous versions of ebuilds, so that it is only required on amd64 systems when not installing a 64bit flash
6
7 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
8
9 Revision Changes Path
10 1.5 www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild?r1=1.4&r2=1.5
15
16 Index: adobe-flash-11.2.202.310-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- adobe-flash-11.2.202.310-r1.ebuild 28 Sep 2013 15:09:30 -0000 1.4
23 +++ adobe-flash-11.2.202.310-r1.ebuild 2 Oct 2013 18:46:02 -0000 1.5
24 @@ -1,9 +1,9 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild,v 1.4 2013/09/28 15:09:30 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310-r1.ebuild,v 1.5 2013/10/02 18:46:02 axs Exp $
29
30 EAPI=5
31 -inherit nsplugins toolchain-funcs versionator multilib-minimal
32 +inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
33
34 DESCRIPTION="Adobe Flash Player"
35 HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
36 @@ -23,7 +23,10 @@
37 abi_x86_64? ( ${AF_64_URI} )
38 "
39 IUSE="debug kde selinux sse2"
40 -REQUIRED_USE="sse2 debug? ( abi_x86_32 )"
41 +REQUIRED_USE="
42 + sse2 debug? ( abi_x86_32 )
43 + || ( abi_x86_64 abi_x86_32 )
44 +"
45 SLOT="0"
46
47 KEYWORDS="-* ~amd64 ~x86"
48 @@ -66,7 +69,7 @@
49 "
50
51 DEPEND="
52 - amd64? ( abi_x86_32? ( www-plugins/nspluginwrapper ) )
53 + amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
54 selinux? ( sec-policy/selinux-flash )
55 "
56 RDEPEND="
57
58
59
60 1.218 www-plugins/adobe-flash/ChangeLog
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.218&view=markup
63 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.218&content-type=text/plain
64 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.217&r2=1.218
65
66 Index: ChangeLog
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
69 retrieving revision 1.217
70 retrieving revision 1.218
71 diff -u -r1.217 -r1.218
72 --- ChangeLog 28 Sep 2013 15:09:30 -0000 1.217
73 +++ ChangeLog 2 Oct 2013 18:46:02 -0000 1.218
74 @@ -1,6 +1,11 @@
75 # ChangeLog for www-plugins/adobe-flash
76 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
77 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.217 2013/09/28 15:09:30 jer Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.218 2013/10/02 18:46:02 axs Exp $
79 +
80 + 02 Oct 2013; Ian Stakenvicius <axs@g.o>
81 + adobe-flash-11.2.202.310-r1.ebuild:
82 + adjusted nspluginwrapper dependency to match previous versions of ebuilds, so
83 + that it is only required on amd64 systems when not installing a 64bit flash
84
85 28 Sep 2013; Jeroen Roovers <jer@g.o>
86 adobe-flash-11.2.202.310-r1.ebuild: