gentoo resync : 17.01.2010

4 files changed, 203 insertions, 4 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 57fa558681be..0679aca30360 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -9,6 +9,7 @@ AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7a
 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
 AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164
 AUX automake-1.16.1-py3-compile.patch 2043 BLAKE2B a7bee250f6dfb9281ca6b448b2f9774db724f7bb4eaa24dfac1950ba26cc0ed9ca9fa596fc64fa90b6cabd71ff16d131ebaf0a5c1b622edc10de623bd28485c6 SHA512 52fee603a6c825f7deb1d0759d2ce5a8e45d8d9c73de74beca84e10fb3af6873e4e66670831ed13cfe1c202e7bbe7154d00777e3582bab47cfb22acd6f26145e
+AUX automake-1.16.1-py3-no-pyo-files.patch 6197 BLAKE2B 4de9f40d7bcf77602678ffe72a7c58d41bb0b82e142d2d289f3336623360e2d2565cffffc8f5b344821385fc11094f4a5bd873e3b0194393bcf6a2c8c67e613f SHA512 93a04a654cf3b036b40df72dbf47270b022ca2638a0b9dd8ada7b5f853fcb4f4ff4a22fd34d2d8e4c13c80cb3983813f52a5770de99b9da17a4837059cc56a5a
 AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31
 AUX automake-1.4-ansi2knr-stdlib.patch 249 BLAKE2B bbf77d9aba954d03cfdb896c88bf9fb98695951011f885936b9df29c522d5ea5d46ee1441d37c7e367cd2c7429a2f017edbf4645470f55c55a7c50b0a7b2ae50 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c
 AUX automake-1.4-libtoolize.patch 542 BLAKE2B 25dad3cbd948d1a6825ba800756e1a6f67ce0be86d2e33d345eaecd5e7c6a7a6e6aee213eb89cb9ce83ee6abf550c96f2ab2d17f32bddc62b95abd4003d93417 SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846
@@ -54,12 +55,12 @@ EBUILD automake-1.13.4-r2.ebuild 2684 BLAKE2B 74f549fc4fb0e067d7bc1df646682717ee
 EBUILD automake-1.14.1-r2.ebuild 3103 BLAKE2B ca2d0d49d7711bb4756e16a6cafb846fd8e8d1d2b86867b23082ccf94bb0be349c79c693d7f4c776d87bb6d7b939bf3e7137617f6156468131d36cd18197008f SHA512 b0cf20f4d2903c746927157547706c572f959d873c23a1d51714abaab22296ea5d9ac2e7542003c52045779e1d2bbe230db64585b12faa594bae5f1d5733e640
 EBUILD automake-1.15.1-r2.ebuild 3208 BLAKE2B 72b916c78b223383f839fd4b11ed3af06102aaa9a0d1faee48d7cc2a7c710a6f256e06fa44e31e73e74e60d183a8c1304f1e6aab3392a5b8e737ed90b34a1379 SHA512 e422e9c7ffd50b0c441b5d6166b222a7d675bb1280f3ab0964584276c2d96d98159c6809b6d96e2c4ca955def55b5da4b84706f5a3f124d65b2c19dca7d9620e
 EBUILD automake-1.16.1-r1.ebuild 3133 BLAKE2B 3a722c5a3a8cf286bf1e20eef5625cec14ce4f1b68618fe9915ce898ecf240d7cc305907982a210c0a9768f79d9a6fa892918cd2cb2bfbf6394bf3cbc08d5dfa SHA512 b26f988fac779d2877ad05d4659c4302bff8f7683954fe86c6a1df08b12f411fe4722e3833dd3111c39aa298bae0fecd46960d64f743f532562171f152dbeccd
-EBUILD automake-1.16.1-r2.ebuild 3366 BLAKE2B c52cc48703b3333c4bb57ee61a6813630346d1eb78fc673dbf68c3247a09b09e9da0f87ca72a083f29b81e372a07f7defe6dee3b19c6d34ada5ca64c3d413492 SHA512 7510733257fbbc5ef41dd2def7cf6235057929ac7b350327b61980fecb6ff28b839dc9c34b6849b811e0b2c5091a442dac40b1c69a90421563ff7e924f3f2a42
+EBUILD automake-1.16.1-r2.ebuild 3420 BLAKE2B d362afd79c8695eaf3822d20fb90da58116585b053eeea8536a8c0b418c03ee0b468ab2faf8964a4cd61ef1bed6efb1dc0fd2d36f3e75aa90fb7a339ff0c15ba SHA512 bc5415b34cc75720e152fddc86b3936c5b177a4e2abcc581a829924d84c14fbd97c43ceab5f4842ac834ddb4a8d3620968184663d49677f3cf76f8b30623aca0
 EBUILD automake-1.4_p6-r2.ebuild 2471 BLAKE2B b950f7e76b9a2243f70da8089466fd181c8307f693568103b6a79452c70ebbc6b50110157f2915c29f3e6b9ef7b7ab2a016181784ebcaffb70602ba5cedf73ac SHA512 2a7b657da16fe2e04bf50e8114049b7df2ef4936e36cf79a5155a4e93d7a8d2225b0afdec1b5595ce9df1c1c6a15635d07e314911228a115bb8b0f60b6be775f
 EBUILD automake-1.5-r2.ebuild 2289 BLAKE2B 8c79660b2fb3d9d7fb3bd8cfe6c6adf8111af88f67e024e8d335d0fc13b091749ebca114ef56121a2dd7f2c71608dd8bad4cf56b1ddfb42380c3abb034557def SHA512 c443ac4458dc16c07208f3a93806b90da67338e7229016ae35a5696a7d6f56102c874ddfb990550b5cfbed78b1b567c164851b22c5c9718853c23d97d6a7e591
 EBUILD automake-1.6.3-r2.ebuild 2037 BLAKE2B ce129f375c762152271961ed31a7ce65256c897c90d5c7eee3d7ed2e91cc66f6bcd65e455dbe7b4c597683450f5e62df18ed791a593df6087c27e6e3a0ba140d SHA512 65f8216b4f73f4ef8a21b0908f68cc8ddc41164f9e53a1816f608d2af3d58edc0816bb8e81d46f7d248d911f911cbbba9db66a11b8f7256d54766d88fe08a472
 EBUILD automake-1.7.9-r3.ebuild 2192 BLAKE2B 0bb0d987c675660bd1d5eb69dd6c81cc8d82532380f330df4e7a1c49780a5ebf6cb7cb299cb30dc0b8f368e25d6f5902b32d3099fa115d46668e7fc939139c7a SHA512 bd650f892c870f7be1e406fe37b6e3b2fd503fe18380457529f27cca63bc7b7cd1b8ccdd2745b1ab42039a73166079ce0a2927517649da8d77dc925299478495
 EBUILD automake-1.8.5-r5.ebuild 2219 BLAKE2B f0dfc9668219d32a28b49bc755eadc2c19ab203477ae97bf768d74c406672356e8668806550e0deb62c4585b3f14ca8115678e25f31b49c76bc47ba75b1ba038 SHA512 1f4b3276146848ebebdda9e62bf4d7b365e29832da30736a92cce156b5831e594689d5a5396bf89aacfbf7fb13a0975dd568f654932720f18d3054bc4d1d26a7
 EBUILD automake-1.9.6-r5.ebuild 2567 BLAKE2B cd6c2db1c38a16206399d687bce1ed407496d1374431508a8c99c7be38d590c4e844e168660b01faf951c6bfd4acb8cb3b0418def0797f381969c1fb9cba4cc4 SHA512 42ab8ca19a382aae897c2cb09aad647aa4976b02d31a2a87db67cd575ca1429aa148103769b7371cba2312da3883e69859e530814ed4c9fdcfabba7fec39cff6
-EBUILD automake-9999.ebuild 3304 BLAKE2B bf1395009b4a7b22687dea8c96ada65fc5708ac3a8f0e3bee6c947cc47d0bb8afaa399217fe45ffab5d12a3f8cbfd2a3bc0f2c0764acac572587c546c4478778 SHA512 aec2eb82d96fd622dfe9589682a705b1251ba238903f94f3f0fd3028345e3030cd539d9f1aaa562f69f9bd13a58183bfd6d019ef941b75a2ed7edceef9998fe6
+EBUILD automake-9999.ebuild 3420 BLAKE2B d362afd79c8695eaf3822d20fb90da58116585b053eeea8536a8c0b418c03ee0b468ab2faf8964a4cd61ef1bed6efb1dc0fd2d36f3e75aa90fb7a339ff0c15ba SHA512 bc5415b34cc75720e152fddc86b3936c5b177a4e2abcc581a829924d84c14fbd97c43ceab5f4842ac834ddb4a8d3620968184663d49677f3cf76f8b30623aca0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 7ffb37a81f21..c483767b582d 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/automake-1.16.1-py3-compile.patch
+	"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
 )
 
 pkg_setup() {
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index fdfa761077f6..c483767b582d 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,11 @@ BDEPEND="
 	test? ( ${PYTHON_DEPS} )
 "
 
+PATCHES=(
+	"${FILESDIR}"/automake-1.16.1-py3-compile.patch
+	"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
new file mode 100644
index 000000000000..0d2ff91b620e
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
@@ -0,0 +1,192 @@
+From: Lukas Fleischer
+Subject: python tests: Do not require .pyo files
+Date: Sun, 20 May 2018 17:28:52 +0200
+
+As of Python 3.5, but unoptimized and optimized bytecode are stored
+within .pyc files; .pyo files are no longer generated. Update the Python
+tests such that the test do not fail if .pyo files are missing.
+
+Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00002.html
+Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+
+* t/py-compile-basedir.sh: Remove all .pyo checks.
+* t/py-compile-basic.sh: Likewise.
+* t/py-compile-destdir.sh: Likewise.
+* t/py-compile-option-terminate.sh: Likewise.
+* t/python-virtualenv.sh: Likewise.
+* t/python10.sh: Likewise.
+* t/python12.sh: Likewise.
+* t/python3.sh: Likewise.
+---
+ t/py-compile-basedir.sh          |  2 --
+ t/py-compile-basic.sh            |  3 ---
+ t/py-compile-destdir.sh          | 12 +++++-------
+ t/py-compile-option-terminate.sh |  5 -----
+ t/python-virtualenv.sh           |  4 ----
+ t/python10.sh                    |  6 ------
+ t/python12.sh                    |  3 +--
+ t/python3.sh                     |  1 -
+ 8 files changed, 6 insertions(+), 30 deletions(-)
+
+diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
+index 6921d16d5..9f927d066 100644
+--- a/t/py-compile-basedir.sh
++++ b/t/py-compile-basedir.sh
+@@ -40,9 +40,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
+   ./py-compile --basedir "$d" "$f.py" "sub/$f.py"
+   find "$d2" # For debugging.
+   py_installed "$d2/$f.pyc"
+-  py_installed "$d2/$f.pyo"
+   py_installed "$d2/sub/$f.pyc"
+-  py_installed "$d2/sub/$f.pyo"
+   files=$(find "$d2" | grep '\.py[co]$')
+   test $(echo "$files" | wc -l) -eq 4
+   case $d2 in
+diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
+index 24df600cb..4c5cf57aa 100644
+--- a/t/py-compile-basic.sh
++++ b/t/py-compile-basic.sh
+@@ -61,10 +61,7 @@ mkdir -p 1/_/2/_/3/_
+ 
+ ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py
+ py_installed foo.pyc
+-py_installed foo.pyo
+ py_installed sub/bar.pyc
+-py_installed sub/bar.pyo
+ py_installed 1/_/2/_/3/_/0.pyc
+-py_installed 1/_/2/_/3/_/0.pyo
+ 
+ :
+diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
+index 07aa1f44f..d2ccafee5 100644
+--- a/t/py-compile-destdir.sh
++++ b/t/py-compile-destdir.sh
+@@ -34,13 +34,11 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py
+ 
+ find $destdir # For debugging.
+ st=0
+-for x in c o; do
+-  for b in foo sub/bar; do
+-    f=$(pyc_location -p "$destdir/$b.py$x")
+-    test -f "$f"
+-    strings "$f" || : # For debugging.
+-    $FGREP $destdir $f && { echo BAD: $f; st=1; }
+-  done
++for b in foo sub/bar; do
++  f=$(pyc_location -p "$destdir/$b.pyc")
++  test -f "$f"
++  strings "$f" || : # For debugging.
++  $FGREP $destdir $f && { echo BAD: $f; st=1; }
+ done
+ exit $st
+ 
+diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
+index 1aaeec21b..80ae55a88 100644
+--- a/t/py-compile-option-terminate.sh
++++ b/t/py-compile-option-terminate.sh
+@@ -27,17 +27,12 @@ cp "$am_scriptdir/py-compile" . \
+ : > ./--foo.py
+ ./py-compile -- -o.py --foo.py
+ py_installed ./-o.pyc
+-py_installed ./-o.pyo
+ py_installed ./--foo.pyc
+-py_installed ./--foo.pyo
+ rm -f ./-*.py[co]
+ : > x.py
+ ./py-compile x.py -o.py --foo.py
+ py_installed ./x.pyc
+-py_installed ./x.pyo
+ py_installed ./-o.pyc
+-py_installed ./-o.pyo
+ py_installed ./--foo.pyc
+-py_installed ./--foo.pyo
+ 
+ :
+diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
+index 3bcd6ec76..7f9708866 100644
+--- a/t/python-virtualenv.sh
++++ b/t/python-virtualenv.sh
+@@ -124,10 +124,8 @@ check_install ()
+ 
+   test -f      "$py_site"/am_foo.py
+   py_installed "$py_site"/am_foo.pyc
+-  py_installed "$py_site"/am_foo.pyo
+   py_installed "$py_site"/am_virtenv/__init__.py
+   py_installed "$py_site"/am_virtenv/__init__.pyc
+-  py_installed "$py_site"/am_virtenv/__init__.pyo
+   test -f      "$py_site"/libquux.a
+   test -f      "$py_site"/am_virtenv/libzardoz.a
+ }
+@@ -138,10 +136,8 @@ check_uninstall ()
+ 
+   test ! -e          "$py_site"/am_foo.py
+   py_installed --not "$py_site"/am_foo.pyc
+-  py_installed --not "$py_site"/am_foo.pyo
+   test ! -e          "$py_site"/am_virtenv/__init__.py
+   py_installed --not "$py_site"/am_virtenv/__init__.pyc
+-  py_installed --not "$py_site"/am_virtenv/__init__.pyo
+   test ! -e          "$py_site"/libquux.a
+   test ! -e          "$py_site"/am_virtenv/libzardoz.a
+ }
+diff --git a/t/python10.sh b/t/python10.sh
+index 4def103ff..9c7a46175 100644
+--- a/t/python10.sh
++++ b/t/python10.sh
+@@ -60,27 +60,21 @@ cwd=$(pwd) || fatal_ "getting current working directory"
+ $MAKE install
+ test -f            "$inst/your/two.py"
+ py_installed       "$inst/your/two.pyc"
+-py_installed       "$inst/your/two.pyo"
+ py_installed --not "$inst/my/one.py"
+ py_installed --not "$inst/my/one.pyc"
+-py_installed --not "$inst/my/one.pyo"
+ $MAKE uninstall
+ py_installed --not "$inst/your/two.py"
+ py_installed --not "$inst/your/two.pyc"
+-py_installed --not "$inst/your/two.pyo"
+ 
+ ../configure --prefix=$cwd/"$inst" one=1
+ $MAKE install
+ py_installed --not "$inst/your/two.py"
+ py_installed --not "$inst/your/two.pyc"
+-py_installed --not "$inst/your/two.pyo"
+ test -f            "$inst/my/one.py"
+ py_installed       "$inst/my/one.pyc"
+-py_installed       "$inst/my/one.pyo"
+ $MAKE uninstall
+ py_installed --not "$inst/my/one.py"
+ py_installed --not "$inst/my/one.pyc"
+-py_installed --not "$inst/my/one.pyo"
+ 
+ $MAKE disttest
+ 
+diff --git a/t/python12.sh b/t/python12.sh
+index d998ae8ad..cca057e6d 100644
+--- a/t/python12.sh
++++ b/t/python12.sh
+@@ -44,11 +44,10 @@ $MAKE install DESTDIR=$destdir
+ 
+ # Perfunctory test that the files were created.
+ test -f "$destdir/usr/share/my/my.py"
+-pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo")
+ pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc")
+ 
+ # If DESTDIR has made it into the byte compiled files, fail the test.
+-st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$?
++st=0; $FGREP "$destdir" "$pyc" || st=$?
+ test $st -eq 1
+ 
+ :
+diff --git a/t/python3.sh b/t/python3.sh
+index 0008eadd7..131aeb48d 100644
+--- a/t/python3.sh
++++ b/t/python3.sh
+@@ -42,6 +42,5 @@ cd build
+ $MAKE install
+ py_installed inst/my/one.py
+ py_installed inst/my/one.pyc
+-py_installed inst/my/one.pyo
+ 
+ :
+-- 
+2.17.0