Gentoo Archives: gentoo-commits

From: Torsten Veller <tove@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/perl-overlay:master commit in: perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/, ...
Date: Tue, 28 Feb 2012 12:30:28
Message-Id: 1330432204.b7996dd63ace768daae97686e25079ab0f1cfacc.tove@gentoo
1 commit: b7996dd63ace768daae97686e25079ab0f1cfacc
2 Author: Torsten Veller <tove <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 12:30:04 2012 +0000
4 Commit: Torsten Veller <tove <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 12:30:04 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=b7996dd6
7
8 [remove] perl-core/ExtUtils-MakeMaker
9
10 ---
11 perl-core/ExtUtils-MakeMaker/ChangeLog | 142 --------------------
12 ...d-patch-from-gentoo-as-stolen-from-debian.patch | 84 ------------
13 .../0002-Add-RUNPATH-patch-from-gentoo.patch | 30 ----
14 ...d-patch-from-gentoo-as-stolen-from-debian.patch | 84 ------------
15 .../0002-Add-RUNPATH-patch-from-gentoo.patch | 30 ----
16 ...d-patch-from-gentoo-as-stolen-from-debian.patch | 84 ------------
17 .../0002-Add-RUNPATH-patch-from-gentoo.patch | 30 ----
18 perl-core/ExtUtils-MakeMaker/metadata.xml | 8 -
19 8 files changed, 0 insertions(+), 492 deletions(-)
20
21 diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
22 deleted file mode 100644
23 index bb41e56..0000000
24 --- a/perl-core/ExtUtils-MakeMaker/ChangeLog
25 +++ /dev/null
26 @@ -1,142 +0,0 @@
27 -# ChangeLog for perl-core/ExtUtils-MakeMaker
28 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.21 2010/09/13 14:41:47 josejx Exp $
30 -
31 - 26 Feb 2012; Kent Fredric <kentfredric@×××××.com>
32 - -ExtUtils-MakeMaker-6.570.600_rc.ebuild,
33 - -ExtUtils-MakeMaker-6.571.0_rc.ebuild,
34 - -ExtUtils-MakeMaker-6.571.100_rc.ebuild:
35 - Removing as they dont correspond to a perl version and add maint weigt, and
36 - are now superceded in gentoo by a long time by v6.580.0 and higher
37 -
38 -*ExtUtils-MakeMaker-6.571.100_rc (24 May 2011)
39 -
40 - 24 May 2011; Kent Fredric <kentfredric@×××××.com>
41 - +files/6.571.100_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch,
42 - +files/6.571.100_rc/0002-Add-RUNPATH-patch-from-gentoo.patch,
43 - +ExtUtils-MakeMaker-6.571.100_rc.ebuild:
44 - Version Bump
45 -
46 - 22 Apr 2011; Torsten Veller <tove@g.o>
47 - ExtUtils-MakeMaker-6.571.0_rc.ebuild:
48 - Do not install bundled distributions
49 -
50 -*ExtUtils-MakeMaker-6.571.0_rc (04 Apr 2011)
51 -
52 - 04 Apr 2011; Kent Fredric <kentfredric@×××××.com>
53 - +files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch,
54 - +files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch,
55 - +ExtUtils-MakeMaker-6.571.0_rc.ebuild:
56 - Bump
57 -
58 -*ExtUtils-MakeMaker-6.570.600_rc (10 Jan 2011)
59 -
60 - 10 Jan 2011; Kent Fredric <kentfredric@×××××.com>
61 - +files/6.570.600_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch,
62 - +files/6.570.600_rc/0002-Add-RUNPATH-patch-from-gentoo.patch,
63 - -ExtUtils-MakeMaker-6.57_pre06.ebuild,
64 - +ExtUtils-MakeMaker-6.570.600_rc.ebuild:
65 - Moved to new versioning scheme, modifed to work with source+patches instead
66 - of needing patched-builds.
67 -
68 -*ExtUtils-MakeMaker-6.57_pre06 (18 Nov 2010)
69 -
70 - 18 Nov 2010; Kent Fredric <kentfredric@×××××.com>
71 - -files/6.56-delete_packlist_podlocal.patch, -files/RUNPATH-6.54.patch,
72 - +ExtUtils-MakeMaker-6.57_pre06.ebuild:
73 - Added a hand-prepatched version of 6.57_06 for testing.
74 - Unfortunately, cpanized dists and git have different EOL encoding, so its
75 - hard to have a git-patch for it and still use dists from cpan, so for the sake
76 - of maintenance, there are pre-patched builds in git.
77 -
78 - https://github.com/gentoo-perl/ExtUtils-MakeMaker/tree/gentoo-prepatch-builds
79 -
80 - 18 Nov 2010; Kent Fredric <kentfredric@×××××.com>
81 - +files/6.56-delete_packlist_podlocal.patch, +files/RUNPATH-6.54.patch,
82 - +metadata.xml:
83 - Imported from ::gentoo for adding pre-release versions for testing.
84 - New MYMETA.yml support that may confuse things.
85 -
86 - 13 Sep 2010; Joseph Jezak <josejx@g.o>
87 - ExtUtils-MakeMaker-6.56-r1.ebuild:
88 - Marked ppc stable for bug #330387.
89 -
90 - 28 Aug 2010; Raúl Porcel <armin76@g.o>
91 - ExtUtils-MakeMaker-6.56-r1.ebuild:
92 - alpha/ia64/sparc stable wrt #330387
93 -
94 - 31 Jul 2010; Markos Chandras <hwoarang@g.o>
95 - ExtUtils-MakeMaker-6.56-r1.ebuild:
96 - Stable on amd64 wrt bug #330387
97 -
98 - 30 Jul 2010; Christian Faulhammer <fauli@g.o>
99 - ExtUtils-MakeMaker-6.56-r1.ebuild:
100 - stable x86, bug 330387
101 -
102 - 29 Jul 2010; Jeroen Roovers <jer@g.o>
103 - ExtUtils-MakeMaker-6.56-r1.ebuild:
104 - Stable for HPPA (bug #330387).
105 -
106 -*ExtUtils-MakeMaker-6.56-r1 (16 Jun 2010)
107 -
108 - 16 Jun 2010; Torsten Veller <tove@g.o>
109 - +files/6.56-delete_packlist_podlocal.patch,
110 - +ExtUtils-MakeMaker-6.56-r1.ebuild:
111 - Don't install .packlist or perllocal.pod for perl or vendor
112 -
113 - 14 May 2010; Jeroen Roovers <jer@g.o>
114 - ExtUtils-MakeMaker-6.56.ebuild:
115 - Marked ~hppa (bug #317877).
116 -
117 - 12 May 2010; Joseph Jezak <josejx@g.o>
118 - ExtUtils-MakeMaker-6.56.ebuild:
119 - Marked ~ppc for bug #317877.
120 -
121 - 09 May 2010; Raúl Porcel <armin76@g.o>
122 - ExtUtils-MakeMaker-6.56.ebuild:
123 - Add ~alpha/~ia64/~sparc wrt #317877
124 -
125 - 09 May 2010; Torsten Veller <tove@g.o>
126 - ExtUtils-MakeMaker-6.56.ebuild:
127 - Fix dependencies in RDEPEND
128 -
129 - 30 Apr 2010; Torsten Veller <tove@g.o> +files/RUNPATH-6.54.patch,
130 - +ExtUtils-MakeMaker-6.56.ebuild, +metadata.xml:
131 - Import from perl-experimental
132 -
133 -*ExtUtils-MakeMaker-6.56 (21 Dec 2009)
134 -
135 - 21 Dec 2009; Torsten Veller <tove@g.o>
136 - +ExtUtils-MakeMaker-6.56.ebuild:
137 - Version bump
138 -
139 -*ExtUtils-MakeMaker-6.54-r1 (15 Sep 2009)
140 -
141 - 15 Sep 2009; Torsten Veller <tove@g.o>
142 - -ExtUtils-MakeMaker-6.50-r1.ebuild, -ExtUtils-MakeMaker-6.54.ebuild,
143 - +ExtUtils-MakeMaker-6.54-r1.ebuild, -files/RUNPATH.patch:
144 - Depend on ExtUtils-Command, -Manifest, -Install
145 -
146 - 19 Aug 2009; Kent Fredric <kentfredric@×××××.com>
147 - ExtUtils-MakeMaker-6.54.ebuild, +files/RUNPATH-6.54.patch:
148 - Applied RUNPATH patch
149 -
150 -*ExtUtils-MakeMaker-6.54 (19 Aug 2009)
151 -
152 - 19 Aug 2009; Michele Beltrame <m@××××××××××.info>
153 - +ExtUtils-MakeMaker-6.54.ebuild:
154 - Bump
155 -
156 -*ExtUtils-MakeMaker-6.50-r1 (27 May 2009)
157 -
158 - 27 May 2009; Torsten Veller <tove@g.o>
159 - -ExtUtils-MakeMaker-6.50.ebuild, +ExtUtils-MakeMaker-6.50-r1.ebuild,
160 - +files/RUNPATH.patch:
161 - Add runpath patch from dev-lang/perl
162 -
163 -*ExtUtils-MakeMaker-6.50 (23 May 2009)
164 -
165 - 23 May 2009; Torsten Veller <tove@g.o>
166 - +ExtUtils-MakeMaker-6.50.ebuild, +metadata.xml:
167 - Add perl-core/ExtUtils-MakeMaker-6.50
168 -
169
170 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch b/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
171 deleted file mode 100644
172 index 7290d04..0000000
173 --- a/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
174 +++ /dev/null
175 @@ -1,84 +0,0 @@
176 -From af42678f775138c9c3cfb7d5a0141b0f1bb727bf Mon Sep 17 00:00:00 2001
177 -From: Kent Fredric <kentfredric@×××××.com>
178 -Date: Thu, 18 Nov 2010 15:30:36 +1300
179 -Subject: [PATCH 1/2] Add patch from ::gentoo as stolen from debian.
180 -
181 -Don't install .packlist or perllocal.pod for perl or vendor.
182 -Extracted from the debian patchset.
183 -See also bug #241834
184 ----
185 - lib/ExtUtils/MM_Unix.pm | 25 +------------------------
186 - 1 files changed, 1 insertions(+), 24 deletions(-)
187 -
188 -diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
189 -index 10fcdf4..642b677 100644
190 ---- a/lib/ExtUtils/MM_Unix.pm
191 -+++ b/lib/ExtUtils/MM_Unix.pm
192 -@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
193 -
194 - pure_perl_install :: all
195 - $(NOECHO) $(MOD_INSTALL) \
196 -- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
197 -- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
198 - $(INST_LIB) $(DESTINSTALLPRIVLIB) \
199 - $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
200 - $(INST_BIN) $(DESTINSTALLBIN) \
201 -@@ -2074,8 +2072,6 @@ pure_site_install :: all
202 -
203 - pure_vendor_install :: all
204 - $(NOECHO) $(MOD_INSTALL) \
205 -- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
206 -- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
207 - $(INST_LIB) $(DESTINSTALLVENDORLIB) \
208 - $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
209 - $(INST_BIN) $(DESTINSTALLVENDORBIN) \
210 -@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
211 - $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
212 -
213 - doc_perl_install :: all
214 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
215 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
216 -- -$(NOECHO) $(DOC_INSTALL) \
217 -- "Module" "$(NAME)" \
218 -- "installed into" "$(INSTALLPRIVLIB)" \
219 -- LINKTYPE "$(LINKTYPE)" \
220 -- VERSION "$(VERSION)" \
221 -- EXE_FILES "$(EXE_FILES)" \
222 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
223 -
224 - doc_site_install :: all
225 - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
226 -@@ -2106,15 +2093,6 @@ doc_site_install :: all
227 - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
228 -
229 - doc_vendor_install :: all
230 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
231 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
232 -- -$(NOECHO) $(DOC_INSTALL) \
233 -- "Module" "$(NAME)" \
234 -- "installed into" "$(INSTALLVENDORLIB)" \
235 -- LINKTYPE "$(LINKTYPE)" \
236 -- VERSION "$(VERSION)" \
237 -- EXE_FILES "$(EXE_FILES)" \
238 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
239 -
240 - };
241 -
242 -@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
243 - $(NOECHO) $(NOOP)
244 -
245 - uninstall_from_perldirs ::
246 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
247 -
248 - uninstall_from_sitedirs ::
249 - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
250 -
251 - uninstall_from_vendordirs ::
252 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
253 -+
254 - };
255 -
256 - join("",@m);
257 ---
258 -1.7.4.rc1
259 -
260
261 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0002-Add-RUNPATH-patch-from-gentoo.patch b/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
262 deleted file mode 100644
263 index 30feaa8..0000000
264 --- a/perl-core/ExtUtils-MakeMaker/files/6.570.600_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
265 +++ /dev/null
266 @@ -1,30 +0,0 @@
267 -From a748ae9e83e90244b0d48147085fc223743ebd8a Mon Sep 17 00:00:00 2001
268 -From: Kent Fredric <kentfredric@×××××.com>
269 -Date: Thu, 18 Nov 2010 15:38:06 +1300
270 -Subject: [PATCH 2/2] Add RUNPATH patch from ::gentoo
271 -
272 ----
273 - lib/ExtUtils/MM_Any.pm | 7 +++++++
274 - 1 files changed, 7 insertions(+), 0 deletions(-)
275 -
276 -diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
277 -index 3ea0947..dde1628 100644
278 ---- a/lib/ExtUtils/MM_Any.pm
279 -+++ b/lib/ExtUtils/MM_Any.pm
280 -@@ -1900,6 +1900,13 @@ CODE
281 - # LD_RUN_PATH now computed by ExtUtils::Liblist
282 - ($self->{EXTRALIBS}, $self->{BSLOADLIBS},
283 - $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
284 -+ # We do not want the build root in RPATH
285 -+ if ( exists $ENV{PORTAGE_TMPDIR} ){
286 -+ # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
287 -+ # /usr and /opt might not be sufficient.
288 -+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
289 -+ split /:/, $self->{LD_RUN_PATH};
290 -+ }
291 - last;
292 - }
293 - }
294 ---
295 -1.7.4.rc1
296 -
297
298 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
299 deleted file mode 100644
300 index 7290d04..0000000
301 --- a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
302 +++ /dev/null
303 @@ -1,84 +0,0 @@
304 -From af42678f775138c9c3cfb7d5a0141b0f1bb727bf Mon Sep 17 00:00:00 2001
305 -From: Kent Fredric <kentfredric@×××××.com>
306 -Date: Thu, 18 Nov 2010 15:30:36 +1300
307 -Subject: [PATCH 1/2] Add patch from ::gentoo as stolen from debian.
308 -
309 -Don't install .packlist or perllocal.pod for perl or vendor.
310 -Extracted from the debian patchset.
311 -See also bug #241834
312 ----
313 - lib/ExtUtils/MM_Unix.pm | 25 +------------------------
314 - 1 files changed, 1 insertions(+), 24 deletions(-)
315 -
316 -diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
317 -index 10fcdf4..642b677 100644
318 ---- a/lib/ExtUtils/MM_Unix.pm
319 -+++ b/lib/ExtUtils/MM_Unix.pm
320 -@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
321 -
322 - pure_perl_install :: all
323 - $(NOECHO) $(MOD_INSTALL) \
324 -- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
325 -- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
326 - $(INST_LIB) $(DESTINSTALLPRIVLIB) \
327 - $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
328 - $(INST_BIN) $(DESTINSTALLBIN) \
329 -@@ -2074,8 +2072,6 @@ pure_site_install :: all
330 -
331 - pure_vendor_install :: all
332 - $(NOECHO) $(MOD_INSTALL) \
333 -- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
334 -- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
335 - $(INST_LIB) $(DESTINSTALLVENDORLIB) \
336 - $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
337 - $(INST_BIN) $(DESTINSTALLVENDORBIN) \
338 -@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
339 - $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
340 -
341 - doc_perl_install :: all
342 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
343 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
344 -- -$(NOECHO) $(DOC_INSTALL) \
345 -- "Module" "$(NAME)" \
346 -- "installed into" "$(INSTALLPRIVLIB)" \
347 -- LINKTYPE "$(LINKTYPE)" \
348 -- VERSION "$(VERSION)" \
349 -- EXE_FILES "$(EXE_FILES)" \
350 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
351 -
352 - doc_site_install :: all
353 - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
354 -@@ -2106,15 +2093,6 @@ doc_site_install :: all
355 - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
356 -
357 - doc_vendor_install :: all
358 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
359 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
360 -- -$(NOECHO) $(DOC_INSTALL) \
361 -- "Module" "$(NAME)" \
362 -- "installed into" "$(INSTALLVENDORLIB)" \
363 -- LINKTYPE "$(LINKTYPE)" \
364 -- VERSION "$(VERSION)" \
365 -- EXE_FILES "$(EXE_FILES)" \
366 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
367 -
368 - };
369 -
370 -@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
371 - $(NOECHO) $(NOOP)
372 -
373 - uninstall_from_perldirs ::
374 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
375 -
376 - uninstall_from_sitedirs ::
377 - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
378 -
379 - uninstall_from_vendordirs ::
380 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
381 -+
382 - };
383 -
384 - join("",@m);
385 ---
386 -1.7.4.rc1
387 -
388
389 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
390 deleted file mode 100644
391 index 30feaa8..0000000
392 --- a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
393 +++ /dev/null
394 @@ -1,30 +0,0 @@
395 -From a748ae9e83e90244b0d48147085fc223743ebd8a Mon Sep 17 00:00:00 2001
396 -From: Kent Fredric <kentfredric@×××××.com>
397 -Date: Thu, 18 Nov 2010 15:38:06 +1300
398 -Subject: [PATCH 2/2] Add RUNPATH patch from ::gentoo
399 -
400 ----
401 - lib/ExtUtils/MM_Any.pm | 7 +++++++
402 - 1 files changed, 7 insertions(+), 0 deletions(-)
403 -
404 -diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
405 -index 3ea0947..dde1628 100644
406 ---- a/lib/ExtUtils/MM_Any.pm
407 -+++ b/lib/ExtUtils/MM_Any.pm
408 -@@ -1900,6 +1900,13 @@ CODE
409 - # LD_RUN_PATH now computed by ExtUtils::Liblist
410 - ($self->{EXTRALIBS}, $self->{BSLOADLIBS},
411 - $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
412 -+ # We do not want the build root in RPATH
413 -+ if ( exists $ENV{PORTAGE_TMPDIR} ){
414 -+ # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
415 -+ # /usr and /opt might not be sufficient.
416 -+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
417 -+ split /:/, $self->{LD_RUN_PATH};
418 -+ }
419 - last;
420 - }
421 - }
422 ---
423 -1.7.4.rc1
424 -
425
426 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
427 deleted file mode 100644
428 index 7290d04..0000000
429 --- a/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
430 +++ /dev/null
431 @@ -1,84 +0,0 @@
432 -From af42678f775138c9c3cfb7d5a0141b0f1bb727bf Mon Sep 17 00:00:00 2001
433 -From: Kent Fredric <kentfredric@×××××.com>
434 -Date: Thu, 18 Nov 2010 15:30:36 +1300
435 -Subject: [PATCH 1/2] Add patch from ::gentoo as stolen from debian.
436 -
437 -Don't install .packlist or perllocal.pod for perl or vendor.
438 -Extracted from the debian patchset.
439 -See also bug #241834
440 ----
441 - lib/ExtUtils/MM_Unix.pm | 25 +------------------------
442 - 1 files changed, 1 insertions(+), 24 deletions(-)
443 -
444 -diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
445 -index 10fcdf4..642b677 100644
446 ---- a/lib/ExtUtils/MM_Unix.pm
447 -+++ b/lib/ExtUtils/MM_Unix.pm
448 -@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
449 -
450 - pure_perl_install :: all
451 - $(NOECHO) $(MOD_INSTALL) \
452 -- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
453 -- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
454 - $(INST_LIB) $(DESTINSTALLPRIVLIB) \
455 - $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
456 - $(INST_BIN) $(DESTINSTALLBIN) \
457 -@@ -2074,8 +2072,6 @@ pure_site_install :: all
458 -
459 - pure_vendor_install :: all
460 - $(NOECHO) $(MOD_INSTALL) \
461 -- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
462 -- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
463 - $(INST_LIB) $(DESTINSTALLVENDORLIB) \
464 - $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
465 - $(INST_BIN) $(DESTINSTALLVENDORBIN) \
466 -@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
467 - $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
468 -
469 - doc_perl_install :: all
470 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
471 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
472 -- -$(NOECHO) $(DOC_INSTALL) \
473 -- "Module" "$(NAME)" \
474 -- "installed into" "$(INSTALLPRIVLIB)" \
475 -- LINKTYPE "$(LINKTYPE)" \
476 -- VERSION "$(VERSION)" \
477 -- EXE_FILES "$(EXE_FILES)" \
478 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
479 -
480 - doc_site_install :: all
481 - $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
482 -@@ -2106,15 +2093,6 @@ doc_site_install :: all
483 - >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
484 -
485 - doc_vendor_install :: all
486 -- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
487 -- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
488 -- -$(NOECHO) $(DOC_INSTALL) \
489 -- "Module" "$(NAME)" \
490 -- "installed into" "$(INSTALLVENDORLIB)" \
491 -- LINKTYPE "$(LINKTYPE)" \
492 -- VERSION "$(VERSION)" \
493 -- EXE_FILES "$(EXE_FILES)" \
494 -- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
495 -
496 - };
497 -
498 -@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
499 - $(NOECHO) $(NOOP)
500 -
501 - uninstall_from_perldirs ::
502 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
503 -
504 - uninstall_from_sitedirs ::
505 - $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
506 -
507 - uninstall_from_vendordirs ::
508 -- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
509 -+
510 - };
511 -
512 - join("",@m);
513 ---
514 -1.7.4.rc1
515 -
516
517 diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0002-Add-RUNPATH-patch-from-gentoo.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
518 deleted file mode 100644
519 index 30feaa8..0000000
520 --- a/perl-core/ExtUtils-MakeMaker/files/6.571.100_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
521 +++ /dev/null
522 @@ -1,30 +0,0 @@
523 -From a748ae9e83e90244b0d48147085fc223743ebd8a Mon Sep 17 00:00:00 2001
524 -From: Kent Fredric <kentfredric@×××××.com>
525 -Date: Thu, 18 Nov 2010 15:38:06 +1300
526 -Subject: [PATCH 2/2] Add RUNPATH patch from ::gentoo
527 -
528 ----
529 - lib/ExtUtils/MM_Any.pm | 7 +++++++
530 - 1 files changed, 7 insertions(+), 0 deletions(-)
531 -
532 -diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
533 -index 3ea0947..dde1628 100644
534 ---- a/lib/ExtUtils/MM_Any.pm
535 -+++ b/lib/ExtUtils/MM_Any.pm
536 -@@ -1900,6 +1900,13 @@ CODE
537 - # LD_RUN_PATH now computed by ExtUtils::Liblist
538 - ($self->{EXTRALIBS}, $self->{BSLOADLIBS},
539 - $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
540 -+ # We do not want the build root in RPATH
541 -+ if ( exists $ENV{PORTAGE_TMPDIR} ){
542 -+ # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
543 -+ # /usr and /opt might not be sufficient.
544 -+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
545 -+ split /:/, $self->{LD_RUN_PATH};
546 -+ }
547 - last;
548 - }
549 - }
550 ---
551 -1.7.4.rc1
552 -
553
554 diff --git a/perl-core/ExtUtils-MakeMaker/metadata.xml b/perl-core/ExtUtils-MakeMaker/metadata.xml
555 deleted file mode 100644
556 index a2f68d0..0000000
557 --- a/perl-core/ExtUtils-MakeMaker/metadata.xml
558 +++ /dev/null
559 @@ -1,8 +0,0 @@
560 -<?xml version="1.0" encoding="UTF-8"?>
561 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
562 -<pkgmetadata>
563 - <herd>perl</herd>
564 - <upstream>
565 - <remote-id type="cpan">ExtUtils-MakeMaker</remote-id>
566 - </upstream>
567 -</pkgmetadata>