diff options
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/Manifest.gz | bin | 9164 -> 9165 bytes | |||
-rw-r--r-- | sys-devel/automake/Manifest | 5 | ||||
-rw-r--r-- | sys-devel/automake/automake-1.16.1-r2.ebuild | 3 | ||||
-rw-r--r-- | sys-devel/automake/automake-9999.ebuild | 7 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch | 192 | ||||
-rw-r--r-- | sys-devel/bc/Manifest | 6 | ||||
-rw-r--r-- | sys-devel/bc/bc-1.07.1-r1.ebuild | 51 | ||||
-rw-r--r-- | sys-devel/bc/bc-1.07.1-r3.ebuild (renamed from sys-devel/bc/bc-1.07.1-r2.ebuild) | 11 | ||||
-rw-r--r-- | sys-devel/bc/files/bc-1.07.1-sandbox.patch | 121 | ||||
-rw-r--r-- | sys-devel/bc/metadata.xml | 3 | ||||
-rw-r--r-- | sys-devel/gettext/Manifest | 5 | ||||
-rw-r--r-- | sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch | 22 | ||||
-rw-r--r-- | sys-devel/gettext/gettext-0.20.1.ebuild | 4 | ||||
-rw-r--r-- | sys-devel/gettext/gettext-0.21_rc1.ebuild | 156 | ||||
-rw-r--r-- | sys-devel/libtool/Manifest | 2 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.4.6-r6.ebuild | 2 | ||||
-rw-r--r-- | sys-devel/make/Manifest | 2 | ||||
-rw-r--r-- | sys-devel/make/make-4.2.93.ebuild | 55 |
18 files changed, 450 insertions, 197 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 00b47d459c8b..b9f799226022 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz 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 diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest index 92630dc9b379..3f0d50919887 100644 --- a/sys-devel/bc/Manifest +++ b/sys-devel/bc/Manifest @@ -1,11 +1,9 @@ AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb678d6759f9ac3a695d2e01d38b942a426a024f2e3023d4c67b3c7b40f1c968a9b066573da99823c0bccbcfbf6e SHA512 3a1f354b8979586b39e6e3f93f2df7d38c2f221fb00ceef7db6cb6b51712c0fc27dbbd75635a8e4e9e2f8f100c5a39cdc1d4c1cfc32bd6c406af94edef37e40d AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae AUX bc-1.07.1-no-ed-its-sed.patch 441 BLAKE2B 52a6b47ea4d4847ca53e731a1ddc5ba4d5c9e41ab46e50f874247dd4e4f4ad039fd4e9631d1eab5cad03947ea570298f031f106d0474d776e80275a46ba12e54 SHA512 43c8e2e30def9f35174559bc8fa4dd3bc9ea4794e716f3405399f8d36a690303832f9d3fe762beb6d4632df66d0d8fa6153e1c10994239289af915bf493e0e75 -AUX bc-1.07.1-sandbox.patch 3669 BLAKE2B 9ea9a75dd3534b1fea0ea1053bf95f06a78e921b4cb8b08ae26133baa4e9cca766840d5896ea7ffc38d243b9f3d8327c6664d2911ddb66b020960bad4cab54d3 SHA512 6ec7d0169fbb537c2d35e1125c69caf67a061b5ca0ee394cc2d01bbee2d13ff54a29302135557b3846bb3dfcc18e1599f8ba0115350d54caea39e0344155fa5b AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34 EBUILD bc-1.06.95-r2.ebuild 1591 BLAKE2B 4aca8552b195e20f3103573297f4921f37ddd3c5cee9490ef22dcac56a9be42204ded0547b63dd5ad8958c733597e29fc43081b3d621a7789f53a89704cbaf05 SHA512 2daf462dabce1052a19e3e334acdc188165716e011db776c18309e9c90391509c3ea2379077d61eeeef6a7da05271ef4f91e87b28ba2ccc1776e1214af786e67 -EBUILD bc-1.07.1-r1.ebuild 1239 BLAKE2B a4794290859366b9ad2c9a164488dfd725c4f659f175645f563836408c0a50ac71f2c3f07cf5803fd278e7451fa24d4b1355d75aa87f0967dd5883cbb03fce16 SHA512 cd45a1f58eaca2aa9802f8260304fa20c143ade2aa7bd16ca03bb513c40a7861011b47334abe448b597bced6e812acb9c3c0c7635a66efe1d2d85d5cfc7c435b -EBUILD bc-1.07.1-r2.ebuild 1747 BLAKE2B 8ae7f0f150adcb6b21fd9e96ad82dc45c6f9137164ca363387f7f5cdf104b3306b6764e051fb3f4439db36f358aa077c73ab31098cc0c7f53ea2aa0be95483f9 SHA512 d7faf63f9d4684d0d8d106a54e5b61a935c1f795d0fc21d772287cb09d398ca8df1653f507cb5fccbaba740bcd9b210315a5c32820e2f623d048a7dd690774c1 -MISC metadata.xml 389 BLAKE2B 39234be070bd1ff9ad6fbb7dc76420b9f030e336ca94f64784f45de9f92fd260328a8367763151c95d429a7b5ffcae9db5cbddd692ded7cd83b9d25c24b573c5 SHA512 96b8257188ecefe1dc05cd7f2c14b0df052b14a2920fec12caf9b28e5f54dd4cce1e228d68507ee8391e85ff68c39435d7d2d9339efaf06d6b089a89347a0d18 +EBUILD bc-1.07.1-r3.ebuild 1462 BLAKE2B 8b3868f319e2291ec7d57e0b76c0e8c6bf05f37bf95f8c500f9c338ffd51e034ee21e88ae942c02be7924a847c3a3036b658cccfc429c454f41b6fdcde344b62 SHA512 b4237f24d1528f7f8d1ec1f848ac86eb720e1ebaad90ddbd220706f35e21591ed037a6122b522d34092aa0fda78a2281d17da0d3dc148ec8c9946ec856b4b591 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild deleted file mode 100644 index 14f6c1f69115..000000000000 --- a/sys-devel/bc/bc-1.07.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Handy console-based calculator utility" -HOMEPAGE="https://www.gnu.org/software/bc/bc.html" -SRC_URI="mirror://gnu/bc/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libedit readline static" - -RDEPEND=" - !readline? ( libedit? ( dev-libs/libedit:= ) ) - readline? ( - >=sys-libs/readline-4.1:0= - >=sys-libs/ncurses-5.2:= - ) -" -DEPEND=" - ${RDEPEND} - sys-apps/ed - sys-devel/flex - virtual/yacc -" - -src_configure() { - local myconf=( - $(use_with readline) - ) - if use readline ; then - myconf+=( --without-libedit ) - else - myconf+=( $(use_with libedit) ) - fi - use static && append-ldflags -static - - econf "${myconf[@]}" - - # Do not regen docs -- configure produces a small fragment that includes - # the version info which causes all pages to regen (newer file). #554774 - touch -r doc doc/* -} - -src_compile() { - emake AR="$(tc-getAR)" -} diff --git a/sys-devel/bc/bc-1.07.1-r2.ebuild b/sys-devel/bc/bc-1.07.1-r3.ebuild index 14782c7a3975..33e7244ef027 100644 --- a/sys-devel/bc/bc-1.07.1-r2.ebuild +++ b/sys-devel/bc/bc-1.07.1-r3.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="6" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="forced-sandbox libedit readline static" +IUSE="libedit readline static" RDEPEND=" !readline? ( libedit? ( dev-libs/libedit:= ) ) @@ -28,7 +28,6 @@ DEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-1.07.1-sandbox.patch" "${FILESDIR}/${PN}-1.07.1-no-ed-its-sed.patch" ) @@ -37,12 +36,6 @@ src_prepare() { # Avoid bad build tool usage when cross-compiling. #627126 tc-is-cross-compiler && eapply "${FILESDIR}/${PN}-1.07.1-use-system-bc.patch" - - # A patch to make this into a configure option has been sent upstream, - # but lets avoid regenerating all the autotools just for this. - if use forced-sandbox ; then - sed -i '/dc_sandbox_enabled = 0/s:0:1:' dc/dc.c || die - fi } src_configure() { diff --git a/sys-devel/bc/files/bc-1.07.1-sandbox.patch b/sys-devel/bc/files/bc-1.07.1-sandbox.patch deleted file mode 100644 index ec5c406645b2..000000000000 --- a/sys-devel/bc/files/bc-1.07.1-sandbox.patch +++ /dev/null @@ -1,121 +0,0 @@ -this has been sent upstream, but they don't have a mailing list or project site -to link to. oh well. - -From e641584767c3c7cc1ff544805acc2562fc56cda9 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Mon, 17 Sep 2018 18:57:57 -0400 -Subject: [PATCH 1/2] dc: add a --sandbox option - -Other GNU projects (like sed & gawk) have a --sandbox flag whereby -access to files and system() are disabled. This allows people to -run arbitrary scripts without worrying about them "escaping" and -executing arbitrary commands on the system. ---- - dc/dc.c | 9 ++++++++- - dc/dc.h | 3 +++ - dc/misc.c | 6 ++++++ - doc/dc.1 | 5 +++++ - doc/dc.texi | 4 ++++ - 5 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/dc/dc.c b/dc/dc.c -index 6a2bb2639235..592a76be71da 100644 ---- a/dc/dc.c -+++ b/dc/dc.c -@@ -54,6 +54,7 @@ - #endif - - const char *progname; /* basename of program invocation */ -+int dc_sandbox_enabled; /* whether sandbox mode is enabled */ - - static void - bug_report_info DC_DECLVOID() -@@ -80,6 +81,7 @@ usage DC_DECLARG((f)) - Usage: %s [OPTION] [file ...]\n\ - -e, --expression=EXPR evaluate expression\n\ - -f, --file=FILE evaluate contents of file\n\ -+ -S, --sandbox disable the ! (system) command\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ - \n\ -@@ -252,6 +254,7 @@ main DC_DECLARG((argc, argv)) - static struct option const long_opts[] = { - {"expression", required_argument, NULL, 'e'}, - {"file", required_argument, NULL, 'f'}, -+ {"sandbox", no_argument, NULL, 'S'}, - {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, - {NULL, 0, NULL, 0} -@@ -260,12 +263,13 @@ main DC_DECLARG((argc, argv)) - int c; - - progname = r1bindex(*argv, '/'); -+ dc_sandbox_enabled = 0; - dc_math_init(); - dc_string_init(); - dc_register_init(); - dc_array_init(); - -- while ((c = getopt_long(argc, argv, "hVe:f:", long_opts, (int *)0)) != EOF) { -+ while ((c = getopt_long(argc, argv, "hVe:f:S", long_opts, (int *)0)) != EOF) { - switch (c) { - case 'e': - { dc_data string = dc_makestring(optarg, strlen(optarg)); -@@ -279,6 +283,9 @@ main DC_DECLARG((argc, argv)) - try_file(optarg); - did_eval = 1; - break; -+ case 'S': -+ dc_sandbox_enabled = 1; -+ break; - case 'h': - usage(stdout); - return flush_okay(); -diff --git a/dc/dc.h b/dc/dc.h -index 6a871ad612a5..a148df467a92 100644 ---- a/dc/dc.h -+++ b/dc/dc.h -@@ -76,4 +76,7 @@ typedef struct { - /* This is dc's only global variable: */ - extern const char *progname; /* basename of program invocation */ - -+/* Whether to run in sandbox mode. */ -+extern int dc_sandbox_enabled; -+ - #endif /* not DC_DEFS_H */ -diff --git a/dc/misc.c b/dc/misc.c -index cd23602fce32..115be90b03bf 100644 ---- a/dc/misc.c -+++ b/dc/misc.c -@@ -131,6 +131,12 @@ dc_system DC_DECLARG((s)) - char *tmpstr; - size_t len; - -+ if (dc_sandbox_enabled) { -+ fprintf(stderr, "%s: ! command disabled in sandbox mode\n", -+ progname); -+ exit(EXIT_FAILURE); -+ } -+ - p = strchr(s, '\n'); - if (p != NULL) { - len = (size_t) (p - s); -diff --git a/doc/dc.1 b/doc/dc.1 -index 1c666493e00a..7c4b6fffd616 100644 ---- a/doc/dc.1 -+++ b/doc/dc.1 -@@ -84,6 +84,11 @@ to the set of commands to be run while processing the input. - Add the commands contained in the file - .I script-file - to the set of commands to be run while processing the input. -+.TP -+.B -S -+.TP -+.B --sandbox -+Run in sandbox mode where access to \fB!\fR for the system function. - .PP - If any command-line parameters remain after processing the above, - these parameters are interpreted as the names of input files to --- -2.17.1 - diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml index 5bdfef6846f9..56c124413057 100644 --- a/sys-devel/bc/metadata.xml +++ b/sys-devel/bc/metadata.xml @@ -5,7 +5,4 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> -<use> - <flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables the ! command in dc)</flag> -</use> </pkgmetadata> diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index c5fa7c33a3eb..ced938f82440 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -2,8 +2,11 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5 AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8 AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64a29d32ea37b60d87b6a62b90176f64c34fd2a6a2549a47c42d4409cfb26de1b42136d740794d7059f7fce1cf67067104980 SHA512 9f765f34e68b887242d1b727ac36dc8f91ee50a6a0920c2f0697fd3c0d2369cc470e728612441f6cf4b9274ad737d985e3e69aa006adcae21a61a664eea2af38 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942 +AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06 +DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909 EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79 -EBUILD gettext-0.20.1.ebuild 4057 BLAKE2B 8d8dc78dd911f0d7881d4903b488adf265796ec980c30c24e66479dc867119e2ab78f3eda2636621e7eef84adad2bb41a884937b7fc956663b8093dcfb12e42e SHA512 45ecf89cbbf98d72e4fa82859fbf36c588505acf1b5ab67f262486226d4001d74d46e5356e1f5ad0afea5a815803f45bef25af1060379c38e286887f17d21afb +EBUILD gettext-0.20.1.ebuild 4060 BLAKE2B 0c10e36f77f0c6746ed86d663a8211dcaa59aee0227d5a243248990ae269768ae97a45cc6d6dffc648c513d574e42392138d617fa6d71ea452e5a0909524fb3d SHA512 47cd205896fed3ae9abe47c160cf0b26e20140e2a0ea1505042c9764bbaa23976c871ad6d588f939deeabbe4e285c64915b9548f849659427d8168c7326da3fb +EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507 diff --git a/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch new file mode 100644 index 000000000000..8adae5d5484a --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch @@ -0,0 +1,22 @@ +--- gettext-0.21-rc1/gettext-tools/src/Makefile.in ++++ gettext-0.21-rc1/gettext-tools/src/Makefile.in +@@ -4106,9 +4106,16 @@ + + # How to get the include files of libtextstyle. + @USE_INSTALLED_LIBTEXTSTYLE_FALSE@textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: +-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ here=`pwd`; \ +-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd ../../libtextstyle/lib && \ +-@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ else \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ fi; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$(abs_builddir)/$@"; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ target_dir="$${target_dir%/*}"; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MKDIR_P) "$${target_dir}"; \ ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(INSTALL_HEADER) "$$file" $@ + + # No need to install libgettextsrc.a, except on AIX. + install-exec-hook: install-exec-clean diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild index fb8b5c7d444d..81ad0c6242a1 100644 --- a/sys-devel/gettext/gettext-0.20.1.ebuild +++ b/sys-devel/gettext/gettext-0.20.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" # so put that license behind USE=cxx. LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc ~x86" IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs" # only runtime goes multilib @@ -132,7 +132,7 @@ multilib_src_install_all() { rm "${ED}"/usr/share/${PN}/*.jar || die rm "${ED}"/usr/share/${PN}/*.class || die if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2 + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 fi fi diff --git a/sys-devel/gettext/gettext-0.21_rc1.ebuild b/sys-devel/gettext/gettext-0.21_rc1.ebuild new file mode 100644 index 000000000000..286653708ac9 --- /dev/null +++ b/sys-devel/gettext/gettext-0.21_rc1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with dev-libs/libintl. + +EAPI=7 + +inherit mono-env libtool java-pkg-opt-2 multilib-minimal + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="https://www.gnu.org/software/gettext/" +if [[ "${PV}" == *_rc* ]] ; then + SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.bz2" + S="${WORKDIR}/${P/_/-}" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi +# Only libasprintf is under the LGPL (and libintl is in a sep package), +# so put that license behind USE=cxx. +LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" +SLOT="0" +IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs" + +# only runtime goes multilib +# Note: The version of libxml2 corresponds to the version bundled via gnulib. +# If the build detects too old of a system version, it will end up falling back +# to the bundled copy. #596918 +# Note: expat lacks a subslot because it is dynamically loaded at runtime. We +# would depend on older subslots if they were available (based on the ABIs that +# are explicitly handled), but expat doesn't currently use subslots. +DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.3:= + dev-libs/expat + acl? ( virtual/acl ) + ncurses? ( sys-libs/ncurses:0= ) + java? ( >=virtual/jdk-1.4:= )" +RDEPEND="${DEPEND} + !git? ( cvs? ( dev-vcs/cvs ) ) + git? ( dev-vcs/git ) + java? ( >=virtual/jre-1.4 )" +BDEPEND=" + git? ( dev-vcs/git ) +" +PDEPEND="emacs? ( app-emacs/po-mode )" + +MULTILIB_WRAPPED_HEADERS=( + # only installed for native ABI + /usr/include/gettext-po.h + + /usr/include/autosprintf.h + /usr/include/textstyle.h + /usr/include/textstyle/stdbool.h + /usr/include/textstyle/version.h + /usr/include/textstyle/woe32dll.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 + "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530 + "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch +) + +QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" + +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + default + + elibtoolize +} + +multilib_src_configure() { + local myconf=( + # switches common to runtime and top-level + --cache-file="${BUILD_DIR}"/config.cache + #--docdir="\$(datarootdir)/doc/${PF}" + + # Emacs support is now in a separate package + --without-emacs + --without-lispdir + # glib depends on us so avoid circular deps + --with-included-glib + # libcroco depends on glib which ... ^^^ + --with-included-libcroco + # this will _disable_ libunistring (since it is not bundled), + # see bug #326477 + --with-included-libunistring + # Never build libintl since it's in dev-libs/libintl now. + --without-included-gettext + # Never build bundled copy of libxml2. + --without-included-libxml + + $(use_enable acl) + $(use_enable cxx c++) + $(use_enable cxx libasprintf) + $(use_with git) + $(usex git --without-cvs $(use_with cvs)) + $(use_enable java) + $(use_enable ncurses curses) + $(use_enable nls) + $(use_enable openmp) + $(use_enable static-libs static) + ) + + local ECONF_SOURCE="${S}" + if ! multilib_is_native_abi ; then + # for non-native ABIs, we build runtime only + ECONF_SOURCE+=/gettext-runtime + fi + + econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi ; then + dosym msgfmt /usr/bin/gmsgfmt #43435 + dobin gettext-tools/misc/gettextize + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + if use java ; then + java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar + rm "${ED}"/usr/share/${PN}/*.jar || die + rm "${ED}"/usr/share/${PN}/*.class || die + if use doc ; then + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 + fi + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS + + if use doc ; then + docinto html + dodoc "${ED}"/usr/share/doc/${PF}/*.html + else + rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + rm "${ED}"/usr/share/doc/${PF}/*.html || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index 849058300da9..5dd3ffb7d13f 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -14,6 +14,6 @@ AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c48 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4 EBUILD libtool-2.4.6-r3.ebuild 2564 BLAKE2B 3eaae24785c03a7ad35a5e6ab7d06b5ab553b9fa1e3065aa8b4b8f75b98f76e0449d55f778e9b56a73e988014af2c0c0e9af9dbe7a47efc54ef4cd5d7181858a SHA512 eeba50e6d2bfdf056ba88fda462e8658acd7373d4cb2902470aa57356aad91294ab60b70db4a834de51b6b4346cf7929a3246939af7ce9e4efcbe6324ba87caa -EBUILD libtool-2.4.6-r6.ebuild 3593 BLAKE2B f9a9564f6b1ff6c3f1bed6da7769375f9ec76b12d62a81c8de475bc29f367c634f75dc9d622c91577f28d123a4e7650d26d7d88cd8dfd69fc1a83f5a896693b2 SHA512 532afaccc8540a2e2e6d3bd7f09d18a1b17840d7f6f1c6c701590bb37d274fd7f3d75606d96a6da41a3312d39ad7bed45cbdaab39a1a28f200e0d03468035d64 +EBUILD libtool-2.4.6-r6.ebuild 3591 BLAKE2B e88e4d2a2877c1659c51d429ee202de9d1aec73a113ef2b30a19b28fd8661eb28ac2438658799c5653b52c9e6afd078182b8826757e6df9fecfe0f3f0ec82493 SHA512 cba3e1c2f2253587cefc48bacf38b05b8169a0f009e99f9a10578af91c02a3644f934f11fc465eb5dd1ba918e9a79fd51eade9f295bfda877d4a8f5a578f6d8d EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1 diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild index dbdaecff45b2..caab46b517b4 100644 --- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild +++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi DESCRIPTION="A shared library tool for developers" diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 863915d0efb0..15bb7619d716 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -6,5 +6,7 @@ AUX make-4.2.1-guile-2.2.patch 11401 BLAKE2B 0bd3c4d813d0205eb2a204f4819fcad3f18 AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17e32bd0acd6cb553e34622945b2ea1c7cc6269b0c033fd60a7da19b80b80469e1340f33dfeedb42508e610dd5726c461bdf7d914 SHA512 39c83ee50cc2a5e8d30c77081e3c12e2848ba558bbbb3cc9eade7087a5514aaed13cdbb23caa7d4ab2047e62a65fc638622310b53faa4ff80b20daafb2e33d7c DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 +DIST make-4.2.93.tar.gz 2313489 BLAKE2B d6d52b9e87d4b7855c0c930207e4c539bc6c6f97712e154b0eb967cec299506b267880f76a76df913b5d9cc1ed5db0e4bf4998379ff9b958cff7524b3992e444 SHA512 d47d722eecb32576a5396b6553d48c7db2443477aacec467e08ecfe3971ccdc309267ccb3ebb4cdca9201a60fa3ea6e775a8148dfd4e38aa93edb73632552485 EBUILD make-4.2.1-r4.ebuild 1689 BLAKE2B 26840c55a07b8eb2e9e43fbe4a3079a5f7d393b9fece6e306cf00b2be7768e80c113faa75d24d26047210cc9ea8ca4ed2dd6e1e6d3ed0eee0f6deb7d6819e860 SHA512 cafd92f60b09fd84f5716472eefad50a090cb0d7630c8e145d6d3cccbb1e142efd463a4adbcfb0e0f8a795cc5bf9ccc437a1dab6d61c25dc5dfe5a1d0077a1d0 +EBUILD make-4.2.93.ebuild 1455 BLAKE2B e39f12b3b251f445fc7bdc507e00714d570f4980031ddbfa4da2ae25a41c6aa54cfd9b2213a8fafe2b72b974cf5015253fb296c607a17e5745cec8d596a23970 SHA512 4b551e14b884e14913192145fb66378af0315409ff5756329cab3e94ef58ede65e7854c948a6cb88f25d501bdf4e82eab4b5fc360dc1fd19b2a8a6b6d4e7f4d9 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/make/make-4.2.93.ebuild b/sys-devel/make/make-4.2.93.ebuild new file mode 100644 index 000000000000..e15a331d2423 --- /dev/null +++ b/sys-devel/make/make-4.2.93.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +if [[ "$(ver_cut 3)" -ge 90 ]] ; then + SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" +else + SRC_URI="mirror://gnu//make/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +LICENSE="GPL-3+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +BDEPEND="nls? ( sys-devel/gettext )" +RDEPEND="${DEPEND} + nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2-default-cxx.patch +) + +src_prepare() { + # sources were moved into src directory + cd src || die + default +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --program-prefix=g + $(use_with guile) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README* + if [[ ${USERLAND} == "GNU" ]] ; then + # we install everywhere as 'gmake' but on GNU systems, + # symlink 'make' to 'gmake' + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 + fi +} |