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/coreutils: coreutils-6.10-r1.ebuild ChangeLog coreutils-6.10-r2.ebuild
Date: Sun, 13 Apr 2008 22:15:02
Message-Id: E1JlATU-0002wr-0T@stork.gentoo.org
1 vapier 08/04/13 22:15:00
2
3 Modified: coreutils-6.10-r1.ebuild ChangeLog
4 coreutils-6.10-r2.ebuild
5 Log:
6 Add support for USE=vanilla.
7 (Portage version: 2.2_pre5)
8
9 Revision Changes Path
10 1.7 sys-apps/coreutils/coreutils-6.10-r1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild?r1=1.6&r2=1.7
15
16 Index: coreutils-6.10-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- coreutils-6.10-r1.ebuild 13 Apr 2008 22:12:12 -0000 1.6
23 +++ coreutils-6.10-r1.ebuild 13 Apr 2008 22:14:59 -0000 1.7
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild,v 1.6 2008/04/13 22:12:12 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild,v 1.7 2008/04/13 22:14:59 vapier Exp $
29
30 inherit eutils flag-o-matic toolchain-funcs autotools
31
32 @@ -16,7 +16,7 @@
33 LICENSE="GPL-3"
34 SLOT="0"
35 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
36 -IUSE="acl nls selinux static xattr"
37 +IUSE="acl nls selinux static xattr vanilla"
38
39 RDEPEND="selinux? ( sys-libs/libselinux )
40 acl? ( sys-apps/acl )
41 @@ -49,10 +49,12 @@
42 unpack ${A}
43 cd "${S}"
44
45 - EPATCH_SUFFIX="patch" \
46 - PATCHDIR="${WORKDIR}/patch" \
47 - EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
48 - epatch
49 + if ! use vanilla ; then
50 + EPATCH_SUFFIX="patch" \
51 + PATCHDIR="${WORKDIR}/patch" \
52 + EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
53 + epatch
54 + fi
55
56 # Since we've patched many .c files, the make process will try to
57 # re-build the manpages by running `./bin --help`. When doing a
58 @@ -63,7 +65,7 @@
59 # There's no reason for this crap to use the private version
60 sed -i 's:__mempcpy:mempcpy:g' lib/*.c
61
62 - AT_M4DIR="m4" eautoreconf
63 + use vanilla || AT_M4DIR="m4" eautoreconf
64 }
65
66 src_compile() {
67
68
69
70 1.225 sys-apps/coreutils/ChangeLog
71
72 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.225&view=markup
73 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.225&content-type=text/plain
74 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/ChangeLog?r1=1.224&r2=1.225
75
76 Index: ChangeLog
77 ===================================================================
78 RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v
79 retrieving revision 1.224
80 retrieving revision 1.225
81 diff -u -r1.224 -r1.225
82 --- ChangeLog 13 Apr 2008 22:12:12 -0000 1.224
83 +++ ChangeLog 13 Apr 2008 22:14:59 -0000 1.225
84 @@ -1,6 +1,10 @@
85 # ChangeLog for sys-apps/coreutils
86 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
87 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.224 2008/04/13 22:12:12 vapier Exp $
88 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.225 2008/04/13 22:14:59 vapier Exp $
89 +
90 + 13 Apr 2008; Mike Frysinger <vapier@g.o> coreutils-6.10-r1.ebuild,
91 + coreutils-6.10-r2.ebuild:
92 + Add support for USE=vanilla.
93
94 13 Apr 2008; Mike Frysinger <vapier@g.o> coreutils-6.10-r1.ebuild,
95 coreutils-6.10-r2.ebuild:
96
97
98
99 1.4 sys-apps/coreutils/coreutils-6.10-r2.ebuild
100
101 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild?rev=1.4&view=markup
102 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild?rev=1.4&content-type=text/plain
103 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild?r1=1.3&r2=1.4
104
105 Index: coreutils-6.10-r2.ebuild
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v
108 retrieving revision 1.3
109 retrieving revision 1.4
110 diff -u -r1.3 -r1.4
111 --- coreutils-6.10-r2.ebuild 13 Apr 2008 22:12:12 -0000 1.3
112 +++ coreutils-6.10-r2.ebuild 13 Apr 2008 22:14:59 -0000 1.4
113 @@ -1,6 +1,6 @@
114 # Copyright 1999-2008 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v 1.3 2008/04/13 22:12:12 vapier Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v 1.4 2008/04/13 22:14:59 vapier Exp $
118
119 inherit eutils flag-o-matic toolchain-funcs autotools
120
121 @@ -16,7 +16,7 @@
122 LICENSE="GPL-3"
123 SLOT="0"
124 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
125 -IUSE="acl nls selinux static xattr"
126 +IUSE="acl nls selinux static xattr vanilla"
127
128 RDEPEND="selinux? ( sys-libs/libselinux )
129 acl? ( sys-apps/acl )
130 @@ -49,10 +49,12 @@
131 unpack ${A}
132 cd "${S}"
133
134 - EPATCH_SUFFIX="patch" \
135 - PATCHDIR="${WORKDIR}/patch" \
136 - EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
137 - epatch
138 + if ! use vanilla ; then
139 + EPATCH_SUFFIX="patch" \
140 + PATCHDIR="${WORKDIR}/patch" \
141 + EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
142 + epatch
143 + fi
144
145 # Since we've patched many .c files, the make process will try to
146 # re-build the manpages by running `./bin --help`. When doing a
147 @@ -63,7 +65,7 @@
148 # There's no reason for this crap to use the private version
149 sed -i 's:__mempcpy:mempcpy:g' lib/*.c
150
151 - AT_M4DIR="m4" eautoreconf
152 + use vanilla || AT_M4DIR="m4" eautoreconf
153 }
154
155 src_compile() {
156
157
158
159 --
160 gentoo-commits@l.g.o mailing list