Browse code

fix mailman sitedir with lib64/lib split

Hanno authored on04/08/2019 09:57:35
Showing3 changed files
... ...
@@ -3,8 +3,9 @@ AUX README.gentoo-r3 6691 BLAKE2B aa740e1936f756f8eeecfb88629adc36c33d43ab283a29
3 3
 AUX mailman-2.1.14_rc1-directory-check.patch 786 BLAKE2B 24cde989fac774ecaea27075ee58c583bf7812cb0b9b4b12a84bba99e144dd060df2f557d952827a5243c1daccd80fdac7353f931e3fc36d903e26aec595e5fe SHA512 510a67915163732ae05ed9f8920f93eb99538a706d85e4fb2c071e01a6d88be8cd32aa5ea0127d36a1dc4f7a735c179bb1169e7358025ee7d3c85b0c8cda44d7
4 4
 AUX mailman-2.1.26-add-recaptcha.diff 1828 BLAKE2B efdd502ca8dc24b3553169bb9802c01ddf475cfa6e5b1ddedbf026e2a7c990233c5e1f6d82a2358204e452a904b2e989d8abb44c9db9ea2d95ec82c8cd3dbd2f SHA512 d2e1ab22fceb1fec9275f7e6a11a15a26df0fc4d0e5d25dd3b3d2f4b4ac72853f3eaac871ee4209f33c636fb05619fa0ff7a6ad674638c38fa384adbe3fee8e6
5 5
 AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68a3809f302f9275eade918135bc231860cf9c2ab798827b9f1e5baf59a74cbaabc3787e95f3001426425ebf6de2 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6
6
+AUX mailman-fix-sitedir.diff 796 BLAKE2B e59e540b424f94959e14d9a67323373c885937c1f717517b93254418c2d6a195b44bfed6a59b74e31f387840331acfb273200c51eecd2f904b20069c6c5df4c3 SHA512 d7c3909eca4cf4161e2a51418b4800203184313260914c7bfe3ea6cffb065a610dffdce9a3c61a0d429cdae9cecc097da491dd56f384273ed13bcd6da9cf75ff
6 7
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
7 8
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
8 9
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
9
-EBUILD mailman-2.1.29-r1.ebuild 6142 BLAKE2B 791cf35102c34138dabeda4581390fda1d1481b42a97afbf97390291b73bf84d654f532db5886bd2659caf082267ecbe60773326dde9b4cf5bce1fbf409d7954 SHA512 4a04f5fdc99f0318a4cfa083cc6ad46c097ee25ed71fafe1f22b4d5b01bb937d0025ebaf8a498e607b0f34276d8d048a2001a2c1d4b2902631b31f37a28187cc
10
+EBUILD mailman-2.1.29-r1.ebuild 6189 BLAKE2B b69f27a4dc85b852312d23e928a823c6c26567df6f3da984dd09f02501b0ad01002b4d2390ce2ca7b4a5b2c3eb19723b75be5aa9a1848dd66f4e48ad90282eee SHA512 65ad45312b5a21e97978e23634edcf158d54360117305d770a5c75fe6dbc1c7e03f85b592dce4683283868dd21481331814715fe43dd55cd705a8b1ce9801ada
10 11
 MISC metadata.xml 398 BLAKE2B 47faf896df7388b5df4d4066764385d64413e8a48d57fee0ca63c98b574a2b219bae96d099f3e0f2f18988ae0aaf6e7c400b07c59bb02f4dbb77b740e1b76adc SHA512 e12fcde6e9360aaab80a5cece049ca20ba8deca00c7051987d0903d1dd9992545d62c10186f05dca6fed28682050efe704cc3ffd92bbcb0ceb9ce5ce972cf62f
11 12
new file mode 100644
... ...
@@ -0,0 +1,24 @@
1
+diff -Naurp a/misc/paths.py.in b/misc/paths.py.in
2
+--- a/misc/paths.py.in	2018-07-25 00:01:28.000000000 +0200
3
+@@ -26,6 +26,7 @@
4
+ 
5
+ import os
6
+ import sys
7
++import site
8
+ 
9
+ # some scripts expect this attribute to be in this module
10
+ prefix = '@prefix@'
11
+@@ -58,9 +59,9 @@ sys.path.insert(0, prefix)
12
+ sys.path.insert(0, os.path.join(prefix, 'pythonlib'))
13
+ 
14
+ # Include Python's site-packages directory.
15
+-sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
16
+-                       'site-packages')
17
+-sys.path.append(sitedir)
18
++sitedirs = site.getsitepackages()
19
++for sitedir in sitedirs:
20
++    sys.path.append(sitedir)
21
+ 
22
+ # Include Python's dist-packages directory.
23
+ distdir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
... ...
@@ -52,6 +52,7 @@ src_prepare() {
52 52
 	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
53 53
 	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
54 54
 	epatch "${FILESDIR}/${PN}-2.1.26-add-recaptcha.diff"
55
+	epatch "${FILESDIR}/mailman-fix-sitedir.diff"
55 56
 	sed -i \
56 57
 	-e 's:<mm-digest-question-end>:<mm-digest-question-end><tr><td>\&nbsp;</td><td><mm-recaptcha-javascript></td></tr>:g' \
57 58
 	-e 's:</TITLE>:</TITLE>\n<MM-Recaptcha-Script>:g' \