From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Jan 2020 19:28:42 +0000 Subject: gentoo resync : 20.01.2020 --- .../files/automake-1.16.1-py3-pep3147.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch (limited to 'sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch') diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch new file mode 100644 index 000000000000..545544d89feb --- /dev/null +++ b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch @@ -0,0 +1,39 @@ +From: Lukas Fleischer +Subject: python: Properly uninstall __pycache__ in subdirectories +Date: Sun, 20 May 2018 17:28:51 +0200 + +When uninstalling __pycache__ files in a subdirectory "sub", the +Makefile incorrectly removed the files from __pycache__/sub/ instead of +sub/__pycache__/. + +* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when +uninstalling byte-compiled files installed in '__pycache__' +subdirectories. + +Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html +Reviewed-by: Andreas K. Hüttel +--- + lib/am/python.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff -ruN automake-1.16.1.orig/lib/am/python.am automake-1.16.1/lib/am/python.am +--- automake-1.16.1.orig/lib/am/python.am 2018-02-26 21:38:27.000000000 +0100 ++++ automake-1.16.1/lib/am/python.am 2020-01-19 05:35:01.212177206 +0100 +@@ -97,7 +97,7 @@ + if %?INSTALL% + + ?FIRST?am__pep3147_tweak = \ +-?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' ++?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|' + + .PHONY uninstall-am: uninstall-%DIR%PYTHON + uninstall-%DIR%PYTHON: +@@ -116,7 +116,7 @@ + done; \ + ## This is somewhat tricky, because for newer pythons we have to take PEP-3147 + ## into account. Avoid exceeding the command-line length limit. +- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ ++ dir='$(DESTDIR)$(%NDIR%dir)'; \ + echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ + while read files; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ -- cgit v1.2.3