1 |
commit: 5fa81d5f19553dd6488275402988d2856c58932b |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 23 16:23:20 2020 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 16:24:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa81d5f |
7 |
|
8 |
dev-perl/Alien-SDL: -r bump for EAPI7 |
9 |
|
10 |
Also has to fix bug #719074 as EAPI7-ification adds .packlist to |
11 |
the install, which breaks subsequent reinstalls due to misguided "nuke |
12 |
existing share dir" logic targeted at CPAN. |
13 |
|
14 |
And although this issue is fixed for -r1, attempts to downgrade to -r0 |
15 |
will rexperience this bug, even though -r0 didn't typically have the |
16 |
problem on self-reinstallation ... due to not shipping the .packlist |
17 |
due to EAPI < 6 |
18 |
|
19 |
A true downgrade requires running some kind of emerge -C operation |
20 |
to remove the sharedirs, before installing the older version. |
21 |
|
22 |
Subsequently, this issue can *only* be considered fixed once -r0 is |
23 |
removed. |
24 |
|
25 |
Bug: https://bugs.gentoo.org/719074 |
26 |
Package-Manager: Portage-2.3.97, Repoman-2.3.22 |
27 |
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org> |
28 |
|
29 |
dev-perl/Alien-SDL/Alien-SDL-1.446.0-r1.ebuild | 50 ++++++++++++++++++++++ |
30 |
.../files/Alien-SDL-1.444.0-no-sysclean.patch | 33 ++++++++++++++ |
31 |
2 files changed, 83 insertions(+) |
32 |
|
33 |
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.446.0-r1.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.446.0-r1.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000000..57808c7b491 |
36 |
--- /dev/null |
37 |
+++ b/dev-perl/Alien-SDL/Alien-SDL-1.446.0-r1.ebuild |
38 |
@@ -0,0 +1,50 @@ |
39 |
+# Copyright 1999-2020 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=7 |
43 |
+ |
44 |
+DIST_AUTHOR=FROGGS |
45 |
+DIST_VERSION=1.446 |
46 |
+inherit perl-module toolchain-funcs |
47 |
+ |
48 |
+DESCRIPTION="building, finding and using SDL binaries" |
49 |
+ |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~hppa ~x86" |
52 |
+ |
53 |
+# File::Fetch, File::Find, Test::More -> dev-lang/perl |
54 |
+RDEPEND=" |
55 |
+ dev-perl/Archive-Extract |
56 |
+ dev-perl/Archive-Zip |
57 |
+ dev-perl/Capture-Tiny |
58 |
+ dev-perl/File-ShareDir |
59 |
+ dev-perl/File-Which |
60 |
+ dev-perl/Text-Patch |
61 |
+ media-libs/libsdl |
62 |
+ virtual/perl-Archive-Tar |
63 |
+ virtual/perl-Digest-SHA |
64 |
+ virtual/perl-ExtUtils-CBuilder |
65 |
+ virtual/perl-ExtUtils-MakeMaker |
66 |
+ dev-perl/Module-Build |
67 |
+ virtual/perl-File-Spec |
68 |
+ virtual/perl-File-Temp |
69 |
+" |
70 |
+DEPEND=" |
71 |
+ dev-perl/Module-Build |
72 |
+ media-libs/libsdl |
73 |
+" |
74 |
+BDEPEND="${RDEPEND}" |
75 |
+ |
76 |
+PERL_RM_FILES=( |
77 |
+ t/release-pod-{syntax,coverage}.t |
78 |
+) |
79 |
+PATCHES=( |
80 |
+ "${FILESDIR}"/${PN}-1.444.0-fix-build-option.patch |
81 |
+ "${FILESDIR}"/${PN}-1.444.0-no-sysclean.patch |
82 |
+) |
83 |
+src_prepare() { |
84 |
+ tc-export CC |
85 |
+ perl-module_src_prepare |
86 |
+} |
87 |
+ |
88 |
+myconf='--with-sdl-config' |
89 |
|
90 |
diff --git a/dev-perl/Alien-SDL/files/Alien-SDL-1.444.0-no-sysclean.patch b/dev-perl/Alien-SDL/files/Alien-SDL-1.444.0-no-sysclean.patch |
91 |
new file mode 100644 |
92 |
index 00000000000..5c4153f3a66 |
93 |
--- /dev/null |
94 |
+++ b/dev-perl/Alien-SDL/files/Alien-SDL-1.444.0-no-sysclean.patch |
95 |
@@ -0,0 +1,33 @@ |
96 |
+From 8d36c877d2528cb8634219949730767b0e6e5150 Mon Sep 17 00:00:00 2001 |
97 |
+From: Kent Fredric <kentnl@g.o> |
98 |
+Date: Fri, 24 Apr 2020 03:44:51 +1200 |
99 |
+Subject: Remove sharedir nuking logic. |
100 |
+ |
101 |
+This breaks install on Gentoo, as it tries to remove the *system* |
102 |
+share_dir *before* Gentoo gets around to things. |
103 |
+ |
104 |
+And this code is basically redundant because Gentoo assurces cruft |
105 |
+entries in share will get removed, which is not something people using |
106 |
+CPAN clients can expect. |
107 |
+ |
108 |
+https://bugs.gentoo.org/719074 |
109 |
+--- |
110 |
+ inc/My/Builder.pm | 2 +- |
111 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
112 |
+ |
113 |
+diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm |
114 |
+index 6f5a97e..f101beb 100644 |
115 |
+--- a/inc/My/Builder.pm |
116 |
++++ b/inc/My/Builder.pm |
117 |
+@@ -47,7 +47,7 @@ sub ACTION_install |
118 |
+ |
119 |
+ $sharedir = eval {File::ShareDir::dist_dir('Alien-SDL')} || ''; |
120 |
+ |
121 |
+- if ( -d $sharedir ) |
122 |
++ if ( 0 ) |
123 |
+ { |
124 |
+ print "Removing the old $sharedir \n"; |
125 |
+ remove_tree($sharedir); |
126 |
+-- |
127 |
+2.26.2 |
128 |
+ |