Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/file: file-9999.ebuild file-5.12-r1.ebuild file-5.15.ebuild ChangeLog
Date: Thu, 28 Nov 2013 19:53:33
Message-Id: 20131128195324.9D5972004B@flycatcher.gentoo.org
1 vapier 13/11/28 19:53:24
2
3 Modified: file-9999.ebuild file-5.12-r1.ebuild
4 file-5.15.ebuild ChangeLog
5 Log:
6 Block dev-python/python-magic when USE=python #492718 by Andrei Slavoiu.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
9
10 Revision Changes Path
11 1.4 sys-apps/file/file-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-9999.ebuild?r1=1.3&r2=1.4
16
17 Index: file-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- file-9999.ebuild 27 Sep 2013 04:50:37 -0000 1.3
24 +++ file-9999.ebuild 28 Nov 2013 19:53:24 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.3 2013/09/27 04:50:37 radhermit Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.4 2013/11/28 19:53:24 vapier Exp $
30
31 EAPI="4"
32 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
33 @@ -24,9 +24,10 @@
34 SLOT="0"
35 IUSE="python static-libs zlib"
36
37 -RDEPEND="python? ( ${PYTHON_DEPS} )
38 +DEPEND="python? ( ${PYTHON_DEPS} )
39 zlib? ( sys-libs/zlib )"
40 -DEPEND="${RDEPEND}"
41 +RDEPEND="${DEPEND}
42 + python? ( !dev-python/python-magic )"
43
44 src_prepare() {
45 [[ ${PV} == "9999" ]] && eautoreconf
46
47
48
49 1.11 sys-apps/file/file-5.12-r1.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild?rev=1.11&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild?rev=1.11&content-type=text/plain
53 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild?r1=1.10&r2=1.11
54
55 Index: file-5.12-r1.ebuild
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v
58 retrieving revision 1.10
59 retrieving revision 1.11
60 diff -u -r1.10 -r1.11
61 --- file-5.12-r1.ebuild 5 Sep 2013 09:51:22 -0000 1.10
62 +++ file-5.12-r1.ebuild 28 Nov 2013 19:53:24 -0000 1.11
63 @@ -1,6 +1,6 @@
64 # Copyright 1999-2013 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.10 2013/09/05 09:51:22 vapier Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.11 2013/11/28 19:53:24 vapier Exp $
68
69 EAPI="2"
70 PYTHON_DEPEND="python? *"
71 @@ -20,8 +20,9 @@
72 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
73 IUSE="python static-libs zlib"
74
75 -RDEPEND="zlib? ( sys-libs/zlib )"
76 -DEPEND="${RDEPEND}"
77 +DEPEND="zlib? ( sys-libs/zlib )"
78 +RDEPEND="${DEPEND}
79 + python? ( !dev-python/python-magic )"
80
81 PYTHON_MODNAME="magic.py"
82
83
84
85
86 1.2 sys-apps/file/file-5.15.ebuild
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.15.ebuild?rev=1.2&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.15.ebuild?rev=1.2&content-type=text/plain
90 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/file-5.15.ebuild?r1=1.1&r2=1.2
91
92 Index: file-5.15.ebuild
93 ===================================================================
94 RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.15.ebuild,v
95 retrieving revision 1.1
96 retrieving revision 1.2
97 diff -u -r1.1 -r1.2
98 --- file-5.15.ebuild 27 Sep 2013 04:50:37 -0000 1.1
99 +++ file-5.15.ebuild 28 Nov 2013 19:53:24 -0000 1.2
100 @@ -1,6 +1,6 @@
101 # Copyright 1999-2013 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.15.ebuild,v 1.1 2013/09/27 04:50:37 radhermit Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.15.ebuild,v 1.2 2013/11/28 19:53:24 vapier Exp $
105
106 EAPI="4"
107 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
108 @@ -24,9 +24,10 @@
109 SLOT="0"
110 IUSE="python static-libs zlib"
111
112 -RDEPEND="python? ( ${PYTHON_DEPS} )
113 +DEPEND="python? ( ${PYTHON_DEPS} )
114 zlib? ( sys-libs/zlib )"
115 -DEPEND="${RDEPEND}"
116 +RDEPEND="${DEPEND}
117 + python? ( !dev-python/python-magic )"
118
119 src_prepare() {
120 [[ ${PV} == "9999" ]] && eautoreconf
121
122
123
124 1.246 sys-apps/file/ChangeLog
125
126 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?rev=1.246&view=markup
127 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?rev=1.246&content-type=text/plain
128 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/file/ChangeLog?r1=1.245&r2=1.246
129
130 Index: ChangeLog
131 ===================================================================
132 RCS file: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v
133 retrieving revision 1.245
134 retrieving revision 1.246
135 diff -u -r1.245 -r1.246
136 --- ChangeLog 27 Sep 2013 04:54:49 -0000 1.245
137 +++ ChangeLog 28 Nov 2013 19:53:24 -0000 1.246
138 @@ -1,6 +1,10 @@
139 # ChangeLog for sys-apps/file
140 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
141 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.245 2013/09/27 04:54:49 radhermit Exp $
142 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.246 2013/11/28 19:53:24 vapier Exp $
143 +
144 + 28 Nov 2013; Mike Frysinger <vapier@g.o> file-5.12-r1.ebuild,
145 + file-5.15.ebuild, file-9999.ebuild:
146 + Block dev-python/python-magic when USE=python #492718 by Andrei Slavoiu.
147
148 27 Sep 2013; Tim Harder <radhermit@g.o> -file-5.05.ebuild,
149 -file-5.06.ebuild, -file-5.07.ebuild, -file-5.07-r1.ebuild,
Report Message
Find on MARC Find on Google Groups