Sync with portage [Wed Jan 22 17:45:04 MSK 2020].

mhiretskiy
root 4 years ago
parent 4617350cf7
commit 630e780339

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878 SHA512 79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a

@ -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

Binary file not shown.

@ -3,3 +3,4 @@ DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f
DIST ansible-2.8.8.tar.gz 12703583 BLAKE2B 0352646b495514d5a7a88fcd8e8437ef323f6d754f4704923b357c0f11c47932a2671a342e24f2de88479436f6f36664dbb0b26ee46fa98bc2d53d4f681595d0 SHA512 fb7705f3d0b8c0ee87d2954cccb7d00e12851693bbe995c062316577f66488f48d8180f11c8d87e025f4082a48ec27f25cb877be4c0ce96ed39951360e8679bd
DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
DIST ansible-2.9.3.tar.gz 14170666 BLAKE2B bb27d249e2390888ee3c28fdb48c1ceff346d2903089c70b451f793742238498aed7c33be056cce9790f44f5cdb74b5020b6decf4f1242904bd9c8f7b5077ea0 SHA512 02cfa2c7c43506dc602e92aed66c920243222b82bc4852f1a4d786cd3ff26fe17eda18d35ac7301cd9bf26366df9b18776e2a27e8d54fc92c3128f52ec7f58e8
DIST ansible-2.9.4.tar.gz 14170264 BLAKE2B e230837360d29df460906d118b3c2ebb9a9dc1ac2a4427809a16716e67a79db8e737ed1beca757bd8a75b631c8cb6c26e58b1caeaaeb613731d63031f1e4e34e SHA512 21020548100fc31b59d4ee1b461f2a14359f2f18752d431cd041eb987c8c8b308f1aa1687461a9b3f5a086485b77b3a38c8f006b942cc24cb2157b45e6582822

@ -0,0 +1,68 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{6,7} )
inherit distutils-r1 eutils
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
HOMEPAGE="https://ansible.com/"
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/netaddr[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
)
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
dev-vcs/git
)"
python_compile_all() {
if use doc; then
cd docs/docsite || die
export CPUS=4
emake -f Makefile.sphinx html
fi
}
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
dodoc -r examples
}

@ -1,3 +1,5 @@
DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
DIST glance-18.0.1.tar.gz 1994751 BLAKE2B d04928cefaebb5370e050f0908b5058e63d7430c8834cb4b4c2b72eb35c7d48234d620a9fa6db31603c8310888249039b569f37399829047f90b60950df09274 SHA512 c50d3ccafe96dc4839362f1b94ac7e6e9e5aeeb7254718114bbce1ae6a52d9ad0b5c8a296f2e75c20cf030bbe75f9e397103d43536d413a258f3788f90532bde
DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4

@ -0,0 +1,140 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
HOMEPAGE="https://launchpad.net/glance"
if [[ ${PV} == *9999 ]];then
inherit git-r3
EGIT_REPO_URI="https://github.com/openstack/glance.git"
EGIT_BRANCH="stable/stein"
else
SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc mysql postgres +sqlite +swift"
REQUIRED_USE="|| ( mysql postgres sqlite )"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}"
#note to self, wsgiref is a python builtin, no need to package it
#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
RDEPEND="
${CDEPEND}
>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
sqlite? (
>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
)
mysql? (
>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
)
postgres? (
>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
)
>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
>=dev-python/glance_store-0.26.1[${PYTHON_USEDEP}]
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
acct-user/glance
acct-group/glance
"
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
use doc && "${PYTHON}" setup.py build_sphinx
}
python_install_all() {
distutils-r1_python_install_all
newinitd "${FILESDIR}/glance.initd" glance-api
diropts -m 0750 -o glance -g glance
dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
keepdir /etc/glance
keepdir /var/log/glance
keepdir /var/lib/glance/images
keepdir /var/lib/glance/scrubber
insinto /etc/glance
insopts -m 0640 -o glance -g glance
doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
rm -r "${ED}"/usr/etc
}

@ -0,0 +1,144 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
HOMEPAGE="https://launchpad.net/glance"
if [[ ${PV} == *9999 ]];then
inherit git-r3
EGIT_REPO_URI="https://github.com/openstack/glance.git"
EGIT_BRANCH="stable/train"
else
SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc mysql postgres +sqlite +swift"
REQUIRED_USE="|| ( mysql postgres sqlite )"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}"
#note to self, wsgiref is a python builtin, no need to package it
#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
RDEPEND="
${CDEPEND}
>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
sqlite? (
>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
)
mysql? (
>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
)
postgres? (
>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
)
>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
>=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
acct-user/glance
acct-group/glance
"
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
if [ ! -z ${EGIT_BRANCH+x} ]; then
use doc && "${PYTHON}" setup.py build_sphinx
fi
}
python_install_all() {
distutils-r1_python_install_all
newinitd "${FILESDIR}/glance.initd" glance-api
diropts -m 0750 -o glance -g glance
dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
keepdir /etc/glance
keepdir /var/log/glance
keepdir /var/lib/glance/images
keepdir /var/lib/glance/scrubber
insinto /etc/glance
insopts -m 0640 -o glance -g glance
doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
rm -r "${ED}"/usr/etc
}

@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 user
inherit distutils-r1
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
HOMEPAGE="https://launchpad.net/glance"
@ -101,16 +101,13 @@ RDEPEND="
>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
acct-user/glance
acct-group/glance
"
#PATCHES=(
#)
pkg_setup() {
enewgroup glance
enewuser glance -1 -1 /var/lib/glance glance
}
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die

@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 user
inherit distutils-r1
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
HOMEPAGE="https://launchpad.net/glance"
@ -103,16 +103,10 @@ RDEPEND="
>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
acct-user/glance
acct-group/glance
"
#PATCHES=(
#)
pkg_setup() {
enewgroup glance
enewuser glance -1 -1 /var/lib/glance glance
}
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die
@ -144,5 +138,5 @@ python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
rm -r ${ED}/usr/etc
rm -r "${ED}"/usr/etc
}

@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 user
inherit distutils-r1
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
HOMEPAGE="https://launchpad.net/glance"
@ -105,16 +105,10 @@ RDEPEND="
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
acct-user/glance
acct-group/glance
"
#PATCHES=(
#)
pkg_setup() {
enewgroup glance
enewuser glance -1 -1 /var/lib/glance glance
}
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die
@ -146,5 +140,5 @@ python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
rm -r ${ED}/usr/etc
rm -r "${ED}"/usr/etc
}

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="aot"
COMMON_DEPEND="dev-lang/mono"

Binary file not shown.

@ -1 +1,3 @@
DIST XADMaster-1.10.6.tar.gz 2064628 BLAKE2B 34203e5280a8e450db616849a953eb9f5147c8fe2922fabdcfce8585fd4bbe2c3aad76921368818e546d60d64b9c59de942cb63008edec83efa29ce4f5caae7f SHA512 f6e51943fd3ced9d0a0a2189db0a7a45d7f59e8109e78406b8c434f568fb53d791613e51437996cb1debae7d4490cdfabc9fa1fdfcc621ad97a43770af6b13e8
DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">MacPaw/XADMaster</remote-id>
</upstream>
<maintainer type="person">
<email>robin@hallabro.nu</email>
<name>Robin Hallabro-Kokko</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">MacPaw/XADMaster</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,60 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit bash-completion-r1 toolchain-funcs
DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3"
HOMEPAGE="https://unarchiver.c3.cx/"
SRC_URI="
https://github.com/MacPaw/XADMaster/archive/v${PV}/XADMaster-${PV}.tar.gz
https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz
"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
BDEPEND="
sys-devel/gcc[objc]
"
RDEPEND="
app-arch/bzip2:=
dev-libs/icu:=
gnustep-base/gnustep-base
media-sound/wavpack
sys-libs/zlib
"
DEPEND="${RDEPEND}
${BDEPEND}
gnustep-base/gnustep-make[native-exceptions]
"
S="${WORKDIR}/XADMaster-${PV}"
src_prepare() {
default
# avoid jobserver warning "make[1]: warning: jobserver unavailable: using -j1"
sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
mv "${WORKDIR}/universal-detector-1.1" "${WORKDIR}/UniversalDetector" || die
}
src_compile() {
emake -f Makefile.linux \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
OBJCC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
OBJCFLAGS="${CFLAGS}" \
LD="$(tc-getCXX)" \
LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
}
src_install() {
dobin {ls,un}ar
doman Extra/{ls,un}ar.1
dobashcomp Extra/{ls,un}ar.bash_completion
}

Binary file not shown.

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="amd64 ~ppc ~sparc ~x86"
KEYWORDS="amd64 ppc ~sparc x86"
IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="

Binary file not shown.

@ -11,7 +11,7 @@ SRC_URI="http://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ppc x86"
IUSE="libressl static"
RDEPEND="!libressl? ( dev-libs/openssl:0= )

Binary file not shown.

@ -0,0 +1,36 @@
Backport a subset of upstream c++11 fixes.
--- a/htmacho.cc
+++ b/htmacho.cc
@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group
break;
case MACHO_CPU_TYPE_I386:
switch (c->flavor) {
- case -1:
+ default:
createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess);
break;
}
--- a/htmachohd.cc
+++ b/htmachohd.cc
@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group
switch (macho_shared->header.cputype) {
case MACHO_CPU_TYPE_I386:
switch (c->flavor) {
- case -1:
+ default:
m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian);
break;
}
--- a/io/types.h
+++ b/io/types.h
@@ -87,8 +87,8 @@ union htmsg_param {
};
struct htmsg {
- int msg;
- int type;
+ unsigned int msg;
+ unsigned int type;
htmsg_param data1;
htmsg_param data2;
};

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${P}-gcc-6-uchar.patch
"${FILESDIR}"/${P}-format-security.patch
"${FILESDIR}"/${P}-gcc-10.patch
)
src_prepare() {

Binary file not shown.

@ -1,2 +1,3 @@
DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
DIST ghub-3.2.0.tar.gz 65346 BLAKE2B c3aa5195a574de870fcd757bf4efb4aaca6fd83fc06ede375e76915972686fe50fc8a7fa2ebf6f0e2b8f98b60857d36a7f99997c255dee30db49505ca3e90a30 SHA512 dc5a2807d17c2bf65e55f33ad2d00b459acb0e0033caacd5ac8ab9b15deae607c2c25d83c61626a62f50a09d45dbeb91c66299d725b8c3663a1767fd30c7c1c6
DIST ghub-3.3.0.tar.gz 67861 BLAKE2B 60006417d24110bdf99eae860b0a639e5757afe0da94b8bb5186d54ee14b360c473acebf667a7a262a1edd581da99f4896814b6ec2c49f8c9dc23b5c5e89d63c SHA512 7071f50d66ffd580d0cbbcdd7a3776fae70f090bb4d970a3b7767b9add3893c8cf286996f70baf4c214a7957fab5504596120305be23dd300c0c4c0fd2f660d6

@ -0,0 +1,25 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
NEED_EMACS=25
inherit elisp
DESCRIPTION="Minuscule client library for the Git forge APIs"
HOMEPAGE="https://magit.vc/manual/ghub"
SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
DOCS="README.md"
RDEPEND="
>=app-emacs/treepy-0.1.1
"
BDEPEND="${RDEPEND}
sys-apps/texinfo"

Binary file not shown.

@ -1,10 +1,10 @@
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
DIST wine-staging-4.18.tar.gz 9917480 BLAKE2B 477da02f5177e7efad33ca30267b2a8755c493972c2ff4ebec32275b699a4c08fd9d4b72181f8ad87c58b1c120b7a7b47951057db36963bcd161afe10b1a89aa SHA512 e5ddb7ac09322b5f2c8e8facff9639699a6a3e72a96f4028e88e23e81f73c766bde1479e54a9a80bd7f33c7747a8220e2699f4dcfe55117b9832ff4cdba60a04
DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
DIST wine-staging-4.19.tar.gz 9908545 BLAKE2B 36674228de808ac9d1f3f66e9274fd9de68173a6a1acca405eb08836a8a787e4e78465442ef6769c02f8fd2e20c3f059d59a1408ed3a8add8a91a68efd07b7bc SHA512 a47ae16dd39797b54011f942fe7e722897af7ddc0bed2bf2e39c46aecf60a02769f7287609c63b4c0c3f1c8e40172e0cdf3bdb53562a07d7a2b7ac53e570dbdc
DIST wine-staging-4.20.tar.gz 9899451 BLAKE2B a90a71f8f68874822c7326eb13cd26e66dfce8afc6d8fc60f1cf86a20c1a8074178bbc618b540a4bac5168fb0242a0fe46c9167bab3e587462d78b706eaad15c SHA512 2ce4f6fa83fc275c83bc7f7bbd4b1a4ca65f7e55e16af40958635b8b2efc2b174baa79ed576ed09c4c13b572756fb6262f19281e5b72797c7e0f1f6c4dd1a4ee
DIST wine-staging-4.21.tar.gz 9904765 BLAKE2B 43f15cd96c7f5ca9cf5aad120c73a3aa534dce33797a4a4e707bea668cfc93e077ad112055dc428263775a30c6447620eed8650a9828ac487bf36c6490a7b73d SHA512 0c6c32f86d252f827ebb8d5df2b046c4f0a49aa7c0ca47939b33844786e561d5f676db1e199ec3cd9969757985f66b865099061f5e77234c3aabd4fd29d3a063
DIST wine-staging-5.0.tar.gz 9942644 BLAKE2B e5d040ae903c6e982c961db1c7c30cfbf7245f00cd0df7c10ceb182c5227f5a555f1a41b24eca982a12b4981edee937cfa5079e6c6fec378d475fca3057cbb7c SHA512 36849fc2c848db9949982619c4544b56468012a1f086cc92eb3e2027377c58c3c24daf508149e0e34a70e6b283edfd80833dc2f346c75f0be69f1fb2c5999cd6

@ -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
@ -19,14 +19,14 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
GWP_V="20190511"
GWP_V="20191222"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@ -128,7 +128,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:4.9.3 )
mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@ -162,9 +162,9 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
PATCHES_BIN=()

@ -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
@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"

@ -5,7 +5,7 @@ DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855f
DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83

@ -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
@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
GWP_V="20190511"
GWP_V="20191222"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:4.9.3 )
mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@ -139,9 +139,9 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
PATCHES_BIN=()

@ -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
@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"

Binary file not shown.

@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
<name>PHP</name>
</maintainer>
<longdescription lang="en">PHP eselect module
</longdescription>
<use>
<flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
</use>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
<name>PHP</name>
</maintainer>
<maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
<longdescription lang="en">
PHP eselect module
</longdescription>
<use>
<flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
</use>
</pkgmetadata>

Binary file not shown.

@ -1,2 +1 @@
DIST ibus-handwrite-2.1.4.tar.bz2 237980 BLAKE2B 7f8fae383a779b2893e5e014b5dcbdcb48a7f541f04e6b829dffd008fa95b73eb3e1af395c29e68a9c80e7cfdc95928f0a360f84df62c1dc06a9431d1dcf4eec SHA512 fca7129edb7433e7ea6df1ce67b3f27285fe102cc029a7a1bdb8ba0402407bd81724d1b14667d342ef41491acff03e9c152b748e4fee5387f315d4673c2964e6
DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1

@ -1,11 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,8 @@
AM_CONDITIONAL(WITH_ZINNIA,[false])
])
+AC_CHECK_LIB([m],[atan2])
+
# check ibus
PKG_CHECK_MODULES(IBUS, [
ibus-1.0 >= 1.3

@ -1,44 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit autotools
DESCRIPTION="Hand write recognition/input for IBus"
HOMEPAGE="https://github.com/microcai/ibus-handwrite"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="nls +zinnia"
RDEPEND="app-i18n/ibus
x11-libs/gtk+:2
x11-libs/gtkglext
nls? ( virtual/libintl )
zinnia? (
app-i18n/zinnia
app-i18n/zinnia-tomoe
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-link.patch
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
$(use_enable nls) \
$(use_enable zinnia) \
$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
}

Binary file not shown.

@ -16,7 +16,7 @@ SRC_URI="
LICENSE="Flightradar24"
SLOT="0"
KEYWORDS="-* amd64 ~x86"
KEYWORDS="-* amd64 x86"
RDEPEND="
net-wireless/dump1090

@ -12,7 +12,7 @@ SRC_URI="
x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
"
KEYWORDS="-* amd64 ~x86"
KEYWORDS="-* amd64 x86"
LICENSE="prog-express"
SLOT="0"

@ -11,7 +11,7 @@ SRC_URI="https://github.com/hjelmn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc x86"
RDEPEND="virtual/libusb:1"
DEPEND="${RDEPEND}"

Binary file not shown.

@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
S="${WORKDIR}/${P}/repoman"
else
SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
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"
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
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"

Binary file not shown.

@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
else
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
https://www.zsh.org/pub/old/${P}.tar.xz
mirror://sourceforge/${PN}/${P}.tar.xz

Binary file not shown.

@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc64 x86"
IUSE="qt5"
RDEPEND="

@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
inherit eutils toolchain-funcs
inherit toolchain-funcs
DESCRIPTION="Expander is a utility that acts as a filter for text editors"
HOMEPAGE="http://www.nedit.org"
@ -12,35 +12,25 @@ SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PN}
S="${WORKDIR}/${PN}"
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
emake -C src CC=$(tc-getCC)
}
src_install() {
cd src
dobin expander boxcomment align_columns align_comments where_is
dobin src/{expander,boxcomment,align_columns,align_comments,where_is}
dosym boxcomment /usr/bin/unboxcomment
insinto /usr/share/${P}
doins "${S}"/service
for x in defs macros misc templates ; do
insinto /usr/share/${P}/${x}
doins "${S}"/${x}/*
done
cd "${S}"/docs
doman *.1
einstalldocs
dodoc USAGE
doman docs/*.1
cd "${S}"
dodoc ChangeLog INSTALL README USAGE
insinto /usr/share/${P}
doins -r service defs macros misc templates
}
pkg_postinst() {

@ -1,3 +1 @@
DIST flpsed-0.7.0.tar.gz 119159 BLAKE2B 1a051651d3d4835abea7ef3237340140feba465d9d42009b10fa18ac5aa927efeced7418477e096a9a5722f0e9217ba0546e324402ef5b84892adbba3f258c32 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e
DIST flpsed-0.7.2.tar.gz 146678 BLAKE2B 0e42f1e5653e9b372047216119fb7fdaab98ad3710c0ef717352ce23443e38fb23bd86e4c39663cb0fa51f80393d2f956658f825f3926dd12b28521bc2d1a7ba SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d
DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321

@ -1,21 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
DESCRIPTION="Pseudo PostScript editor"
HOMEPAGE="http://flpsed.org/flpsed.html"
SRC_URI="http://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
>=x11-libs/fltk-1.3.0:1
app-text/ghostscript-gpl[X]"
DEPEND="${RDEPEND}"

@ -1,34 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils
DESCRIPTION="Pseudo PostScript editor"
HOMEPAGE="http://flpsed.org/flpsed.html"
SRC_URI="http://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
>=x11-libs/fltk-1.3.0:1
app-text/ghostscript-gpl[X]"
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-desktop.patch
}
src_install() {
default
doicon ${PN}.png
doicon -s scalable ${PN}.svg
domenu ${PN}.desktop
}

@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
inherit eutils
inherit desktop
DESCRIPTION="Pseudo PostScript editor"
HOMEPAGE="http://flpsed.org/flpsed.html"
@ -11,19 +11,17 @@ SRC_URI="http://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
KEYWORDS="amd64 x86"
RDEPEND="x11-libs/libX11
RDEPEND="
x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
>=x11-libs/fltk-1.3.0:1
app-text/ghostscript-gpl[X]"
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.7.2-desktop.patch
}
PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch )
src_install() {
default

@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
DESCRIPTION="An OCR (Optical Character Recognition) reader"
HOMEPAGE="http://jocr.sourceforge.net"
@ -12,8 +12,12 @@ SLOT="0"
KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc scanner tk"
DEPEND=">=media-libs/netpbm-9.12
doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
DEPEND="
>=media-libs/netpbm-9.12
doc? (
>=media-gfx/transfig-3.2
app-text/ghostscript-gpl
)
tk? ( dev-lang/tk )"
RDEPEND="${DEPEND}
tk? (
@ -22,24 +26,28 @@ RDEPEND="${DEPEND}
)"
src_compile() {
local mymakes="src man"
local targets=( src man )
use doc && targets+=( doc examples )
use doc && mymakes="${mymakes} doc examples"
emake ${mymakes}
emake "${targets[@]}"
}
src_install() {
emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
einstalldocs
dodoc HISTORY REMARK.txt REVIEW
# remove the tk frontend if tk is not selected
use tk || rm "${ED}"/usr/bin/gocr.tcl
if ! use tk; then
rm "${ED}"/usr/bin/gocr.tcl || die
fi
# and install the documentation and examples
if use doc ; then
if use doc; then
dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
insinto /usr/share/doc/${PF}/examples
doins "${S}"/examples/*.{fig,tex,pcx}
docinto examples
dodoc examples/*.{fig,tex,pcx}
docompress -x /usr/share/doc/${PF}/examples
fi
}

@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils
EAPI=7
inherit desktop
DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
HOMEPAGE="https://www.gnu.org/software/gv/"
@ -14,7 +15,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="xinerama"
RDEPEND="app-text/ghostscript-gpl
RDEPEND="
app-text/ghostscript-gpl
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@ -25,10 +27,8 @@ RDEPEND="app-text/ghostscript-gpl
x11-libs/libXt
xinerama? ( x11-libs/libXinerama )"
DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto"
DOCS="AUTHORS ChangeLog NEWS README"
BDEPEND="virtual/pkgconfig"
src_configure() {
export ac_cv_lib_Xinerama_main=$(usex xinerama)
@ -36,7 +36,9 @@ src_configure() {
}
src_install() {
rm README.{I18N,TRANSLATION} || die
default
doicon "${FILESDIR}"/gv_icon.xpm
make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
}

@ -1,9 +1,7 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
inherit eutils
EAPI=7
DESCRIPTION="Dos2Unix like text file converter"
HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
@ -12,13 +10,10 @@ SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
DEPEND="
dev-libs/popt"
RDEPEND="${DEPEND}
!app-text/dos2unix"
src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
}
PATCHES=( "${FILESDIR}"/${P}-build.patch )

@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
inherit eutils autotools
inherit autotools
DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
HOMEPAGE="http://xmlpatch.sourceforge.net/"
@ -12,30 +12,33 @@ SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test static-libs"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-libs/glib:2
RDEPEND="
dev-libs/glib:2
dev-libs/libxml2"
DEPEND="${RDEPEND}
test? ( dev-libs/check )
virtual/pkgconfig"
test? ( dev-libs/check )"
BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
default
mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
econf \
$(use_enable static-libs static) \
--disable-static \
$(use_with test check)
}
DOCS=( LEGAL_NOTICE README TODO ChangeLog )
src_install() {
default
find "${D}" -name '*.la' -delete
# no static archives
find "${D}" -name '*.la' -delete || die
}

@ -0,0 +1,43 @@
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@
# Set this to an ANSI compatible C compiler (preferably gcc)
# See also system specific settings below
#CC=cc
-CC=gcc
############################################################################
#
@@ -107,7 +106,7 @@
# If you are using gcc, you probably don't need to change anything here.
# Linux:
-CFLAGS = -O2 -s $(DEFS) -Wall
+CPPFLAGS += $(DEFS)
# AIX (xlC on aix 4):
#CFLAGS = -O2 -s $(DEFS)
@@ -134,10 +133,6 @@
# END OF CONFIGURATION OPTIONS
#
-# pattern rules. Should we define these?
-%$(O): %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
HEAD = mpage.h
DENC = encoding.h
@@ -150,10 +145,10 @@
@echo Done!
mpage$(E): $(MOBJ)
- $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
msample$(E): $(SOBJ)
- $(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
mpage.1: mpage.1.in
sed 's:PREFIX:${PREFIX}:' < mpage.1.in > mpage.1

@ -1,39 +1,44 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
inherit eutils toolchain-funcs
EAPI=7
inherit toolchain-funcs
DESCRIPTION="Many to one page printing utility"
HOMEPAGE="http://www.mesa.nl/"
SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
SRC_URI="
http://www.mesa.nl/pub/${PN}/${P}.tgz
https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
KEYWORDS="amd64 ppc x86"
LICENSE="freedist"
SLOT="0"
IUSE=""
src_prepare() {
sed -i Makefile \
-e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
-e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
|| die "sed Makefile"
EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
KEYWORDS="amd64 ppc x86"
PATCHES=(
"${FILESDIR}"/${P}-fix-buildsystem.patch
"${WORKDIR}"/${P}-gentoo-patchset/01_previous_changes.patch
"${WORKDIR}"/${P}-gentoo-patchset/10_bts354935_fix_fontdefs.patch
"${WORKDIR}"/${P}-gentoo-patchset/20_bts416573_manpage_fixes.patch
"${WORKDIR}"/${P}-gentoo-patchset/30_bts443280_libdir_manpage.patch
)
src_configure() {
tc-export CC
}
src_compile() {
emake \
CC="$(tc-getCC)" \
PREFIX=/usr \
MANDIR=/usr/share/man/man1
PREFIX="${EPREFIX}"/usr \
MANDIR="${EPREFIX}"/usr/share/man/man1
}
src_install () {
emake \
PREFIX="${D}/usr" \
MANDIR="${D}/usr/share/man/man1" install
dodoc CHANGES Encoding.format FAQ NEWS README TODO
PREFIX="${ED}"/usr \
MANDIR="${ED}"/usr/share/man/man1 install
rm README.{amiga,OS2} || die
einstalldocs
dodoc Encoding.format
}

@ -0,0 +1,80 @@
From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Tue, 21 Jan 2020 22:33:49 +0000
Subject: [PATCH] fg_gl2: fix build failure against gcc-10
On gcc-10 (and gcc-9 -fno-common) build fails as:
```
[ 31%] Linking C executable bin/Lorenz_static
/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
/usr/lib/ccache/bin/cc -Wall -pedantic -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
-o bin/Lorenz_static -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
```
Note: duplicate definition comes here from 'fg_gl2.h'.
The fix is to move declaration to a 'fg_gl2.c' file.
gcc-10 will change the default from -fcommon to fno-common:
https://gcc.gnu.org/PR85678.
The error also happens if CFLAGS=-fno-common passed explicitly.
Bug: https://bugs.gentoo.org/705840
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
freeglut/freeglut/src/fg_gl2.c | 12 ++++++++++++
freeglut/freeglut/src/fg_gl2.h | 14 +++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
--- a/thirdparty/freeglut/src/fg_gl2.c
+++ b/thirdparty/freeglut/src/fg_gl2.c
@@ -27,6 +27,18 @@
#include "fg_internal.h"
#include "fg_gl2.h"
+#ifdef GL_ES_VERSION_2_0
+/* Use existing functions on GLES 2.0 */
+#else
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+#endif
+
void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
if (fgStructure.CurrentWindow != NULL)
fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
--- a/thirdparty/freeglut/src/fg_gl2.h
+++ b/thirdparty/freeglut/src/fg_gl2.h
@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
# endif
--
2.25.0

@ -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,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
# See bugs #662352
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
"${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
)
src_prepare() {

@ -0,0 +1,36 @@
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,6 @@
PACKAGE = o3read
VERSION = 0.0.4
-CC = gcc
-CFLAGS = -Wall -ansi -pedantic -O -g
PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/man/man1
@@ -16,20 +14,13 @@
all: $(BINS)
-utf8tolatin1: utf8tolatin1.o
- $(CC) -o utf8tolatin1 utf8tolatin1.o
+o3totxt: o3read.o
-o3totxt: o3totxt.o o3read.o
- $(CC) -o o3totxt o3totxt.o o3read.o
+o3tohtml: o3read.o
-o3tohtml: o3tohtml.o o3read.o
- $(CC) -o o3tohtml o3tohtml.o o3read.o
+o3tosiag: o3read.o
-o3tosiag: o3tosiag.o o3read.o
- $(CC) -o o3tosiag o3tosiag.o o3read.o
-
-o3read: main.o o3read.o
- $(CC) -o o3read main.o o3read.o
+o3read: main.o
dist:
rm -rf $(PACKAGE)-$(VERSION)

@ -1,7 +1,7 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
inherit toolchain-funcs
@ -12,20 +12,16 @@ SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RESTRICT="test"
RESTRICT=test
PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
src_prepare() {
sed \
-e 's:-o:$(LDFLAGS) -o:g' \
-e '/^CC/d' \
-e '/^CFLAGS/g' \
-i Makefile || die
src_configure() {
tc-export CC
}
src_install() {
dobin o3read o3totxt o3tohtml utf8tolatin1
doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
einstalldocs
doman *.1
}

@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
dev-python/pygobject[${PYTHON_USEDEP},cairo]
dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
dev-python/pycairo[${PYTHON_USEDEP}]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]

@ -1,31 +1,25 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
inherit autotools ${EXTRA_ECLASS}
unset EXTRA_ECLASS
inherit autotools
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
HOMEPAGE="https://sourceforge.net/projects/pspdftool"
[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ "${PV}" == "9999" ]] || \
KEYWORDS="~amd64 ~x86"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="zlib"
DEPEND="zlib? ( sys-libs/zlib ) "
RDEPEND="${DEPEND}"
RDEPEND="zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
src_prepare() {
default
mv configure.{in,ac} || die
eautoreconf
}
@ -35,5 +29,5 @@ src_configure() {
src_install() {
default
rm -rf "${ED}"/usr/share/doc/${PN}*
rm -rf "${ED}"/usr/share/doc/${PN}* || die
}

@ -1,37 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
inherit autotools ${EXTRA_ECLASS}
unset EXTRA_ECLASS
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
HOMEPAGE="https://sourceforge.net/projects/pspdftool"
[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
[[ "${PV}" == "9999" ]] || \
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
IUSE="zlib"
DEPEND="zlib? ( sys-libs/zlib ) "
RDEPEND="${DEPEND}"
src_prepare() {
eautoreconf
}
src_configure() {
econf $(use_with zlib)
}
src_install() {
default
rm -rf "${ED}"/usr/share/doc/${PN}*
}

@ -1,9 +1,7 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
inherit base flag-o-matic
EAPI=7
DESCRIPTION="RTF to HTML converter"
HOMEPAGE="http://rtf2html.sourceforge.net/"
@ -12,23 +10,12 @@ SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND=""
RDEPEND="${DEPEND}"
DOCS=( ChangeLog README )
PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
src_prepare() {
default
# CFLAGS are incorrectly parsed, so handle this here
sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
use !debug && filter-flags "-g*"
base_src_prepare
}
src_configure() {
econf $(use_enable debug)
}

@ -1,5 +1,5 @@
--- break_filelist.old 2013-10-14 17:23:01.523330534 +0800
+++ break_filelist 2004-08-01 12:17:28.000000000 +0800
--- a/break_filelist
+++ b/break_filelist
@@ -177,7 +177,7 @@
"p" => "pascal", "pas" => "pascal", "pp" => "pascal", "dpr" => "pascal",
"py" => "python",
@ -18,3 +18,65 @@
($firstline =~
m~^#!\s*\@_?(SCRIPT_)?(PATH_)?(BA|K)?SH(ELL)?(\d+)?\@?(\s|\Z)~)) {
# Note: wish(1) uses a funny trick; see wish(1) for more info.
--- a/makefile
+++ b/makefile
@@ -37,7 +37,7 @@
# Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
# The "-Wall" option turns on warnings in gcc. gcc users might also want
# to consider using "-Werror", which turns warnings into errors.
-CC=gcc -Wall
+CFLAGS+= -Wall
# Set this to the name of your "install" program. On some systems,
# "install -C" would be useful (so unchanged files won't be modified),
@@ -124,34 +124,34 @@
MANPAGES=sloccount.1.gz
-MYDOCS=sloccount.html README TODO ChangeLog
+MYDOCS=README TODO ChangeLog
all: $(COMPILED_EXECUTABLES)
lexcount1$(EXE_SUFFIX): lexcount1.c
- $(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) lexcount1.c -o lexcount1$(EXE_SUFFIX)
c_count$(EXE_SUFFIX): c_count.c
- $(CC) c_count.c -o c_count$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) c_count.c -o c_count$(EXE_SUFFIX)
php_count$(EXE_SUFFIX): php_count.c
- $(CC) php_count.c -o php_count$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) php_count.c -o php_count$(EXE_SUFFIX)
pascal_count.c: pascal_count.l driver.c driver.h
flex -Cfe -t pascal_count.l > pascal_count.c
pascal_count$(EXE_SUFFIX): pascal_count.c
- $(CC) pascal_count.c -o pascal_count$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) pascal_count.c -o pascal_count$(EXE_SUFFIX)
jsp_count.c: jsp_count.l driver.c driver.h
flex -Cfe -t jsp_count.l > jsp_count.c
jsp_count$(EXE_SUFFIX): jsp_count.c
- $(CC) jsp_count.c -o jsp_count$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) jsp_count.c -o jsp_count$(EXE_SUFFIX)
ml_count$(EXE_SUFFIX): ml_count.c
- $(CC) ml_count.c -o ml_count$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ml_count.c -o ml_count$(EXE_SUFFIX)
sloccount.1.gz: sloccount.1
gzip -c sloccount.1 > sloccount.1.gz
@@ -162,7 +162,7 @@
# This is USC's code counter, not built by default:
c_lines: C_LINES.C
- $(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) C_LINES.C -o c_lines$(EXE_SUFFIX)
install_prefix:
$(INSTALL_A_DIR) $(PREFIX)

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
EAPI=7
inherit eutils toolchain-funcs
inherit toolchain-funcs
DESCRIPTION="Tools for counting Source Lines of Code (SLOC) for a large number of languages"
HOMEPAGE="http://www.dwheeler.com/sloccount/"
@ -12,39 +12,41 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-lang/perl
>=sys-apps/sed-4
app-shells/bash"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-libexec.patch
"${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
# support for
# 1) .ebuild
# 2) #!/sbin/openrc-run
# 3) CFLAGS/CPPFLAGS/LDFLAGS
"${FILESDIR}"/${P}-gentoo.patch
)
src_prepare() {
epatch "${FILESDIR}"/${P}-libexec.patch
epatch "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
# support for .ebuild and #!/sbin/openrc-run:
epatch "${FILESDIR}"/${P}-gentoo.patch
sed -i \
-e 's|^CC=gcc|CFLAGS+=|g' \
-e 's|$(CC)|& $(CFLAGS) $(LDFLAGS)|g' \
-e '/^DOC_DIR/ { s/-$(RPM_VERSION)//g }' \
-e '/^MYDOCS/ { s/[^ =]\+\.html//g }' \
makefile || die "sed makefile failed"
#fixed hard-codes libexec_dir in sloccount
default
# fix hard-coded libexec_dir in sloccount
sed -i "s|libexec_dir=|&\"${EPREFIX}\"|" sloccount || die
}
src_compile() {
emake CC=$(tc-getCC)
src_configure() {
tc-export CC
}
src_test() {
PATH+=":${S}"
emake test
PATH="${PATH}:${S}" emake test
}
src_install() {
emake PREFIX="${ED}/usr" DOC_DIR="${ED}/usr/share/doc/${PF}/" install
dohtml *html
emake PREFIX="${ED}"/usr DOC_DIR="${ED}"/usr/share/doc/${PF}/ install
HTML_DOCS=( *.html )
einstalldocs
# avoid QA warning
gunzip "${ED}"/usr/share/man/man1/sloccount.1.gz || die
}

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
inherit prefix
@ -13,32 +13,34 @@ LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="unicode"
RESTRICT="test" #411523
RDEPEND=">=dev-lang/perl-5.10.1
>=dev-perl/libintl-perl-1.200
RDEPEND="
dev-lang/perl
dev-perl/libintl-perl
unicode? (
dev-perl/Text-Unidecode
dev-perl/Unicode-EastAsianWidth
)"
)"
DEPEND="${RDEPEND}"
DOCS="AUTHORS ChangeLog NEWS README TODO"
RESTRICT="test" #411523
src_prepare() {
default
# On FreeBSD this script is used instead of GNU install but it comes without
# executable pemissions... Fix it!
chmod +x install-sh || die
if use prefix; then
hprefixify $(find . -name '*.pl' | xargs)
local f
while IFS="" read -d $'\0' -r f ; do
hprefixify "${f}"
done < <(find . -name '*.pl' -print0)
fi
}
src_configure() {
local myconf
use unicode && myconf='--with-external-Unicode-EastAsianWidth'
use unicode && local myconf='--with-external-Unicode-EastAsianWidth'
econf \
--with-external-libintl-perl \
@ -48,9 +50,9 @@ src_configure() {
src_install() {
default
rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README}
rm "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README} || die
}
pkg_preinst() {
rm -f "${EROOT}"/usr/bin/${PN}
rm -f "${EROOT}"/usr/bin/${PN} || die
}

@ -1,5 +1,5 @@
--- Makefile.in.orig 2015-11-18 13:52:44.173432349 +0300
+++ Makefile.in 2015-11-18 13:53:39.244429093 +0300
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,22 +183,22 @@
install: $(DOINST)

@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
EAPI=7
inherit eutils autotools
inherit autotools
DESCRIPTION="uu, xx, base64, binhex decoder"
HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
@ -12,28 +12,21 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=""
DEPEND=""
DOCS=( HISTORY INSTALL README )
PATCHES=(
"${FILESDIR}/${P}-bugfixes.patch"
"${FILESDIR}/${P}-CVE-2004-2265.patch"
"${FILESDIR}/${P}-CVE-2008-2266.patch"
"${FILESDIR}/${P}-man.patch"
"${FILESDIR}/${P}-rename.patch"
"${FILESDIR}/${P}-makefile.patch"
"${FILESDIR}"/${P}-bugfixes.patch
"${FILESDIR}"/${P}-CVE-2004-2265.patch
"${FILESDIR}"/${P}-CVE-2008-2266.patch
"${FILESDIR}"/${P}-man.patch
"${FILESDIR}"/${P}-rename.patch
"${FILESDIR}"/${P}-makefile.patch
)
src_prepare() {
epatch "${PATCHES[@]}"
mv configure.in configure.ac || die
DOCS=( HISTORY INSTALL README )
epatch_user
src_prepare() {
default
mv configure.{in,ac} || die
eautoreconf
}

@ -1,7 +1,7 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format"
HOMEPAGE="http://dan.egnor.name/xml2"
@ -10,8 +10,7 @@ SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="dev-libs/libxml2"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"

@ -0,0 +1,18 @@
--- a/src/defs.h
+++ b/src/defs.h
@@ -18,13 +18,13 @@
/* Global vars */
-enum
+enum align
{
ALIGN_RIGHT,
ALIGN_LEFT,
ALIGN_JUSTIFY,
ALIGN_CENTER
-} align;
+};
typedef struct
{

@ -0,0 +1,100 @@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -9,19 +9,16 @@
DEBUG=@DEBUG@
PREFIX=@PREFIX@
-CC=gcc
OBJ=main.o defs.o parse.o parse_include.o parse_info.o parse_img.o parse_t.o parse_page.o parse_default.o parse_bookmark.o parse_add.o parse_list.o parse_sep.o output_t.o output_doc.o output_img.o output_info.o output_page.o output_sep.o output_list.o parm.o
IPATH=-I/usr/pkg/include/libxml2 -I/usr/include/libxml2 -I. -I/usr/pkg/include -I/usr/local/include
LPATH=-L/usr/pkg/lib -L/usr/local/lib
CFLAGS+=-Wall -c $(IPATH) $(I_PDF)\
-DVERSION=\"$(VERSION)\" $(DEBUG)\
- -fno-asm -funroll-all-loops -fstrength-reduce -frerun-loop-opt \
-x c -fshort-enums
LFLAGS=-lxml2 $(L_PDF) $(LPATH)
BIN=xml2doc
-all:
- @printf "\e[32mUse make in the parent directory :)\e[0m\n"
+all: build
install: build
@printf "\e[32mInstalling binaries...\e[0m\n"
@@ -34,75 +31,49 @@
build: $(OBJ)
@printf "\n\e[32mLinking objects...\e[0m\n"
- $(CC) $(LFLAGS) $(OBJ) -o $(BIN)
- @if ( test -z "$(DEBUG)" ); then \
- echo "Stripping symbols..."; \
- strip -s $(BIN); \
- fi
- @printf "\n\n\e[32mCompilation process done.\e[0m\n"
+ $(CC) $(LDFLAGS) $(L_PDF) $^ -lxml2 -o $(BIN)
main.o: main.c main.h
- $(CC) $(CFLAGS) main.c
parm.o: parm.c parm.h
- $(CC) $(CFLAGS) parm.c
output_doc.o: output_doc.c output.h
- $(CC) $(CFLAGS) output_doc.c
output_img.o: output_img.c output.h
- $(CC) $(CFLAGS) output_img.c
output_info.o: output_info.c output.h
- $(CC) $(CFLAGS) output_info.c
output_page.o: output_page.c output.h
- $(CC) $(CFLAGS) output_page.c
output_sep.o: output_sep.c output.h
- $(CC) $(CFLAGS) output_sep.c
output_list.o: output_list.c output.h
- $(CC) $(CFLAGS) output_list.c
output_t.o: output_t.c output.h
- $(CC) $(CFLAGS) output_t.c
parse_add.o: parse_add.c defs.h
- $(CC) $(CFLAGS) parse_add.c
parse_sep.o: parse_sep.c defs.h
- $(CC) $(CFLAGS) parse_sep.c
defs.o: defs.c defs.h
- $(CC) $(CFLAGS) defs.c
parse.o: parse.c defs.h
- $(CC) $(CFLAGS) parse.c
parse_include.o: parse_include.c defs.h
- $(CC) $(CFLAGS) parse_include.c
parse_info.o: parse_info.c defs.h
- $(CC) $(CFLAGS) parse_info.c
parse_img.o: parse_img.c defs.h
- $(CC) $(CFLAGS) parse_img.c
parse_t.o: parse_t.c defs.h
- $(CC) $(CFLAGS) parse_t.c
parse_page.o: parse_page.c defs.h
- $(CC) $(CFLAGS) parse_page.c
parse_default.o: parse_default.c defs.h
- $(CC) $(CFLAGS) parse_default.c
parse_bookmark.o: parse_bookmark.c defs.h
- $(CC) $(CFLAGS) parse_bookmark.c
parse_list.o: parse_list.c defs.h
- $(CC) $(CFLAGS) parse_list.c
clean:
rm -rf $(OBJ) $(BIN) *.o a.out *~ DEADJOE .*.swp *.txt *.pdf *.html *.xml

@ -1,59 +1,50 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
EAPI=7
inherit eutils toolchain-funcs
inherit toolchain-funcs
DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
HOMEPAGE="http://xml2doc.sourceforge.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="GPL-2"
IUSE=""
SLOT="0"
KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
DEPEND=">=dev-libs/libxml2-2.5"
DEPEND="dev-libs/libxml2:2"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}
src_prepare() {
# Fix pointer-related bug detected by a QA notice.
epatch "${FILESDIR}/${PN}-pointer_fix.patch"
S="${WORKDIR}/${PN}"
PATCHES=(
# Fix pointer-related bug detected by a QA notice
"${FILESDIR}"/${PN}-pointer_fix.patch
# Don't strip symbols from binary (bug #152266)
sed -i -e '/^\s*strip/d' \
-e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
-e '/^\t$(CC) $(CFLAGS) /d' \
src/Makefile.in
}
"${FILESDIR}"/${P}-makefile.patch
# fix GCC 10 -fno-common change
"${FILESDIR}"/${P}-gcc10-no-common.patch
)
src_configure() {
tc-export CC
econf --disable-pdf
}
src_compile() {
emake CC="$(tc-getCC)"
default
cd "${S}/doc"
cd doc || die
"${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
}
src_install() {
# xml2doc's make install is unfortunately broken
# binary
dobin src/xml2doc
# documentation
dodoc BUGS README TODO
einstalldocs
docinto examples
dodoc examples/*.{xml,png}
# manpage
doman doc/xml2doc.1
}

@ -1,7 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
EAPI=7
inherit flag-o-matic toolchain-funcs
DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
HOMEPAGE="http://xmlstar.sourceforge.net/"
@ -10,30 +12,28 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.6.27
>=dev-libs/libxslt-1.1.9
dev-libs/libgcrypt:0
RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/libgcrypt:0=
virtual/libiconv"
DEPEND="${RDEPEND}
sys-apps/sed"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
src_configure() {
append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
# NOTE: Fully built documentation is already shipped with the tarball:
# - doc/xmlstarlet-ug.{pdf,ps,html}
# - doc/xmlstarlet.txt
# - doc/xmlstarlet.1
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--disable-build-docs \
--disable-static-libs \
--disable-silent-rules
--disable-static-libs
}
src_install() {
default
dosym xml /usr/bin/xmlstarlet
}

Binary file not shown.

@ -0,0 +1 @@
DIST basement-0.0.11.tar.gz 134032 BLAKE2B 52d9d674841d048b53011589c7a87c7cd7e45655db3c7bc2c99574b8a49bace33f20abf7d4614cf3106e2b87cb67340e5d2f76416889038c2e081c1f62f46bdb SHA512 2396e692fcaa080418eb90c38148dbb2465490ffaa5e35d141573d32729794dffb444bdddd55082878520a22629cfead5fdc1ac98f1d369600cc3165b64730d5

@ -0,0 +1,24 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Foundation scrap box of array & string"
HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
"

@ -2,10 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tcltk@gentoo.org</email>
<name>Gentoo Tcltk Project</name>
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">beepcore-tcl</remote-id>
</upstream>
<longdescription>
Foundation most basic primitives without any dependencies
</longdescription>
</pkgmetadata>

@ -1 +1,2 @@
DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3
DIST cryptonite-0.26.tar.gz 581153 BLAKE2B 2becdd3d0c6f1e037fd4d38143a2a8644e38e9826faa271c971d4feff8a4ab1e4c0a04df338c99a8454cff626f79f3334a0a37b19cc136f33e7c8f53e66bd33a SHA512 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0

@ -0,0 +1,45 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.1.9999
#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu-flags-x86-rdrand
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Cryptography Primitives sink"
HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+cpu-flags-x86-rdrand +cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp"
RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
>=dev-haskell/memory-0.14.18:=[profile?]
>=dev-lang/ghc-7.4.1:=
virtual/libc
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18
test? ( dev-haskell/memory
dev-haskell/tasty
dev-haskell/tasty-hunit
dev-haskell/tasty-kat
dev-haskell/tasty-quickcheck )
"
src_configure() {
haskell-cabal_src_configure \
--flag=-check_alignment \
$(cabal_flag integer-gmp integer-gmp) \
--flag=-old_toolchain_inliner \
$(cabal_flag cpu_flags_x86_aes support_aesni) \
--flag=support_deepseq \
$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
$(cabal_flag cpu-flags-x86-rdrand support_rdrand) \
$(cabal_flag cpu_flags_x86_sse support_sse)
}

@ -0,0 +1 @@
DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60

@ -0,0 +1,40 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.1.9999
#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Alternative prelude with batteries and no dependencies"
HOMEPAGE="https://github.com/haskell-foundation/foundation"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="experimental"
RESTRICT="test" # fails to doctest
RDEPEND="~dev-haskell/basement-0.0.11:=[profile?]
>=dev-lang/ghc-8.0.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
test? ( dev-haskell/basement
>=dev-haskell/doctest-0.9 )
"
src_configure() {
haskell-cabal_src_configure \
--flag=-bench-all \
--flag=-bounds-check \
--flag=doctest \
$(cabal_flag experimental experimental) \
--flag=-linktest \
--flag=-minimal-deps
}

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
<use>
<flag name='experimental'>enable building experimental features, known as highly unstable or without good support cross-platform</flag>
</use>
<longdescription>
A custom prelude with no dependencies apart from base.
This package has the following goals:
* provide a base like sets of modules that provide a consistent set of features and bugfixes across multiple versions of GHC (unlike base).
* provide a better and more efficient prelude than base&#39;s prelude.
* be self-sufficient: no external dependencies apart from base.
* provide better data-types: packed unicode string by default, arrays.
* Better numerical classes that better represent mathematical thing (No more all-in-one Num).
* Better I/O system with less Lazy IO
* Usual partial functions distinguished through type system
</longdescription>
</pkgmetadata>

@ -1,3 +1,4 @@
DIST memory-0.10.tar.gz 35039 BLAKE2B bca8342ebd866c53fa2fe476b11fa3ecb75ac8383a98baf86bb577f99d623828e5656b2a23b9f95f03044fefa97aea5fd1429c1df45e625eabca36b8b54dbbd2 SHA512 e548dddfe168f6094e066b7bbda165e842d1eab429b5d2ea978706acfd4b3a93a84f9ba56cc2830fecddadefe60efcfb474a791a72211f552fb223a6989dd55c
DIST memory-0.14.1.tar.gz 35928 BLAKE2B 6ac85e5f9cd41ea4058abdc168bd094e7632582fb234c00aab9e6a3359a87e0695907e3821a684ca8c1ad6259c7343e8d0dd38a8fc3e4e85dd89efa09fcbabb5 SHA512 12f8d8f3d14dc060b5da9950ddef398ac55464cf79438c501ba8eaa222817d474c191463fd5f97ed460f5ca4af6d3b643363eb2cca278c583cc14e442fe669cf
DIST memory-0.15.0.tar.gz 42299 BLAKE2B fd4cebe132ebc824e88907325d6106ab62d01942f5055481f0ff85248ba1a84211e768e49409b02f45ff224a4149338abb771b1dcad38c31175c340e35063fad SHA512 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
DIST memory-0.7.tar.gz 33072 BLAKE2B e29aac80f99121c2ae588b8b4e2db468a83e19583aabd524384b7aad43a210147746bbad3e05c682a5226dae163d39a9724fcd38b5b813889620ec7c918b9aa4 SHA512 5df9d3ff6ab1fad7760a34d22657af255d7ad57019e8b61bd81dbd09b5df6da83d93e667989c10ebea2910a3399be05ef33d298aca0b09764b0e3a855fba15a8

@ -0,0 +1,35 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.1.9999
#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="memory and related abstraction stuff"
HOMEPAGE="https://github.com/vincenthz/hs-memory"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
>=dev-lang/ghc-8.0.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
test? ( dev-haskell/foundation )
"
src_configure() {
haskell-cabal_src_configure \
--flag=support_basement \
--flag=support_bytestring \
--flag=support_deepseq \
--flag=support_foundation
}

Binary file not shown.

@ -0,0 +1,110 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# Don't depend on itself.
JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
# Rewriting build.xml files for the testcases has no use at the moment.
JAVA_PKG_BSFIX_ALL="no"
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-ant-${PV}"
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
HOMEPAGE="https://ant.apache.org/"
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}"
S="${WORKDIR}/${MY_P}"
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${PV}"-cmdline-args.patch
"${WORKDIR}/${PV}-build.patch"
"${WORKDIR}/${PV}-launch.patch"
)
src_prepare() {
default
eprefixify "${S}/src/script/ant"
# Fixes bug 556008.
java-ant_xml-rewrite -f build.xml \
-c -e javadoc \
-a failonerror \
-v "false"
# See bug #196080 for more details.
java-ant_bsfix_one build.xml
java-pkg-2_src_prepare
# Remove JDK9+ stuff
einfo "Removing JDK9+ classes (Jmod and Link)"
rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
}
src_compile() {
export ANT_HOME=""
# Avoid error message that package ant-core was not found
export ANT_TASKS="none"
local bsyscp
# This ensures that when building ant with bootstrapped ant,
# only the source is used for resolving references, and not
# the classes in bootstrapped ant but jikes in kaffe has issues with this...
if ! java-pkg_current-vm-matches kaffe; then
bsyscp="-Dbuild.sysclasspath=ignore"
fi
CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
$(use_doc javadocs) || die "build failed"
}
src_install() {
dodir /usr/share/ant/lib
for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
java-pkg_dojar build/lib/${jar}
dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
done
dobin src/script/ant
dodir /usr/share/${PN}/bin
for each in antRun antRun.pl runant.pl runant.py ; do
dobin "${S}/src/script/${each}"
dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
done
dosym ../${PN}/bin /usr/share/ant/bin
insinto /usr/share/${PN}
doins -r dist/etc
dosym ../${PN}/etc /usr/share/ant/etc
echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
doenvd "${T}/20ant"
dodoc NOTICE README WHATSNEW KEYS
if use doc; then
dodoc -r manual/*
java-pkg_dojavadoc --symlink manual/api build/javadocs
fi
use source && java-pkg_dosrc src/main/*
}

@ -0,0 +1,135 @@
From 729692d37a72c84998cfc65a6da6e078bbe0910a Mon Sep 17 00:00:00 2001
From: sergiys <sergiys@amazon.com>
Date: Wed, 23 Oct 2019 13:24:19 -0700
Subject: [PATCH] Fix regression introduced by commit "Use commandline argument
file for all options, but -J, for case javac"
---
.../ant/taskdefs/compilers/JavacExternal.java | 35 +++++++++-------
.../taskdefs/compilers/JavacExternalTest.java | 42 +++++++++++++++++++
2 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
index 9569c7fe8f..637e9bdf6c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
@@ -66,7 +66,7 @@ public boolean execute() throws BuildException {
int firstFileName;
if (assumeJava1_2Plus()) {
- firstFileName = moveJOptionsToBeginning(commandLine);
+ firstFileName = moveArgFileEligibleOptionsToEnd(commandLine);
} else {
firstFileName = -1;
}
@@ -77,31 +77,36 @@ public boolean execute() throws BuildException {
}
/**
- * Moves all -J arguments to the beginning
- * So that all command line arguments could be written to file, but -J
+ * Moves all -J and @argfiles arguments to the beginning
+ * So that all command line arguments could be written to file, but -J and @argfile
* As per javac documentation:
* you can specify one or more files that contain arguments to the javac command (except -J options)
* @param commandLine command line to process
- * @return int index of first non -J argument
+ * @return int index of first argument that could be put into argfile
*/
- private int moveJOptionsToBeginning(String[] commandLine) {
- int nonJArgumentIdx = 1; // 0 for javac executable
- while(nonJArgumentIdx < commandLine.length && commandLine[nonJArgumentIdx].startsWith("-J")) {
- nonJArgumentIdx++;
+ private int moveArgFileEligibleOptionsToEnd(String[] commandLine) {
+ int nonArgFileOptionIdx = 1; // 0 for javac executable
+ while(nonArgFileOptionIdx < commandLine.length &&
+ !isArgFileEligible(commandLine[nonArgFileOptionIdx])) {
+ nonArgFileOptionIdx++;
}
- for(int i = nonJArgumentIdx + 1; i < commandLine.length; i++) {
- if (commandLine[i].startsWith("-J")) {
- String jArgument = commandLine[i];
- for(int j = i - 1; j >= nonJArgumentIdx; j--) {
+ for(int i = nonArgFileOptionIdx + 1; i < commandLine.length; i++) {
+ if (!isArgFileEligible(commandLine[i])) {
+ String option = commandLine[i];
+ for(int j = i - 1; j >= nonArgFileOptionIdx; j--) {
commandLine[j + 1] = commandLine[j];
}
- commandLine[nonJArgumentIdx] = jArgument;
- nonJArgumentIdx++;
+ commandLine[nonArgFileOptionIdx] = option;
+ nonArgFileOptionIdx++;
}
}
- return nonJArgumentIdx;
+ return nonArgFileOptionIdx;
+ }
+
+ private static boolean isArgFileEligible(String option) {
+ return !(option.startsWith("-J") || option.startsWith("@"));
}
/**
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
index 53aac6377c..a893fb49c6 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/JavacExternalTest.java
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
+import java.util.stream.Stream;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -131,6 +132,47 @@ public void allJOptionsAreMovedToBeginning() throws Exception {
}
}
+ @Test
+ public void argFileOptionIsMovedToBeginning() throws Exception {
+ final File workDir = createWorkDir("testSMC");
+ try {
+ final File src = new File(workDir, "src");
+ src.mkdir();
+ createFile(src, "org/apache/ant/tests/J1.java");
+ createFile(src, "org/apache/ant/tests/J2.java");
+ final File modules = new File(workDir, "modules");
+ modules.mkdir();
+ final Project prj = new Project();
+ prj.setBaseDir(workDir);
+ final Javac javac = new Javac();
+ javac.setProject(prj);
+ final Commandline[] cmd = new Commandline[1];
+ final TestJavacExternal impl = new TestJavacExternal();
+ final Path srcPath = new Path(prj);
+ srcPath.setLocation(src);
+ javac.setSrcdir(srcPath);
+ javac.createModulepath().setLocation(modules);
+ javac.setSource("9");
+ javac.setTarget("9");
+ javac.setFork(true);
+ javac.setMemoryInitialSize("80m");
+ javac.setExecutable("javacExecutable");
+ javac.add(impl);
+ javac.createCompilerArg().setValue("-g");
+ javac.createCompilerArg().setValue("@/home/my-compiler.args");
+ javac.execute();
+ assertEquals("javacExecutable", impl.getArgs()[0]);
+ assertEquals("-J-Xms80m", impl.getArgs()[1]);
+ assertEquals("@/home/my-compiler.args", impl.getArgs()[2]);
+ assertTrue(Stream.of(impl.getArgs()).anyMatch(x -> x.equals("-g")));
+ assertTrue(impl.getArgs()[impl.getArgs().length - 2].endsWith("J1.java"));
+ assertTrue(impl.getArgs()[impl.getArgs().length - 1].endsWith("J2.java"));
+ assertEquals(3, impl.getFirstFileName());
+ } finally {
+ delete(workDir);
+ }
+ }
+
private File createWorkDir(String testName) {
final File tmp = new File(System.getProperty("java.io.tmpdir")); //NOI18N
final File destDir = new File(tmp, String.format("%s%s%d",

@ -20,5 +20,16 @@ DIST icedtea-3.14-nashorn-13722b4babad.tar.xz 2319268 BLAKE2B 1e9d7f3e300b94f6e1
DIST icedtea-3.14-openjdk-454c6cbb8073.tar.xz 361988 BLAKE2B 900a2ba53d9300ef895b8a17276055c5a776b55db2d2e56e9d56a88e254fa381d9ba554453c426a1ded7e5a9fbb0acfa61aa8b7a9bdcf2dec471f4035fecaa7d SHA512 1e8009155a9ad39405e11704bb1f8b4c51ae0f64563baa7a7ce29a79613339e82b8776193a0076b993f8839b1c5959edff18cdadaa7f2f163fa5d3b7f7d60396
DIST icedtea-3.14-shenandoah-9e52f8d3b511.tar.xz 7061948 BLAKE2B bf26c9684d088dd24d1a7232be2b1e61ad924549a34389042820230cbe6d64cef63f8565dd0b85c5173637c9b1637a46c3213044322e156c62d7a1cdd7e033e7 SHA512 67aea51a3a37ad34ef9f0706ba0a536017be170c6dd0d26b14416fdbaa91206e7d9833c6ccaaaf7037cd242286e1442bd3746c521365fbc32f4bdb811bdf67a4
DIST icedtea-3.14.0.tar.xz 1528612 BLAKE2B 1dd24bda5f461c2d8a354e592f618925b8c027a8aaed3b30697a2bc9b8a5aeb33fd198895985e0564d15a6e65ed6adb703f6018e0ff9fe31613eb7d72a9d6e39 SHA512 6cd366a1adde12b5cc2c0c64c0c353ebf9ad5b0ad79b77c5cca3acc93219752110eb222b74bd62180fe0bf5b063db12df6316c334d5940d1636c9d10824085ed
DIST icedtea-3.15-aarch32-4107aea57664.tar.xz 6851120 BLAKE2B 054310c5ad3b20a7e29d1c8875d266d3c163b51349b4d852ab71ff4c4a7c40f6ee75ed0da20ea83c543d9ebc884273511a012e5199feb99ea10b38870a02ffd4 SHA512 c6400c6c9d5de671c372650839611c4e2e4a96cd6f86526e722b2023cd6f286b4bedaaa5b3c6c9f9f77e695034182d1d26bbb0ece9ecc62f1f67da08dd921a6f
DIST icedtea-3.15-corba-f59374a41938.tar.xz 946964 BLAKE2B 0c71034c9a601bc775c9e4012bbfab07d23ba306c2d7c9d9a056e8c0adb9a323bc4b828034efd3ac16401dff73e9baf4c5971fe8dc8d699b209221393dff86b4 SHA512 b27aaef4839be9a6993d8511e492cf33884738e2fe19cd7d00f244a0f94cd0f3a3ff84c63811cd66ea18cdf7327bb270b7ab21c5b66c220a3bb0a31226bb21b5
DIST icedtea-3.15-hotspot-f76744714698.tar.xz 6905652 BLAKE2B 619ecf93893554ce7cab5c96f4dbfdad359ca3d5d828ad51691377f97dbdb266fa762a3d3d6cbc451dedb197442fb6816a243624610397e592201be8b69c00e4 SHA512 181e9f8d0c083b26a24e6bafe0187e39313a6685f3288d62794c5ec07cb8901b53eba25badc74b367de08b53cd2176df45e184f7a6ccbfab57370e7d3cf388f9
DIST icedtea-3.15-jaxp-f42bdc74d2f5.tar.xz 2293320 BLAKE2B 7b32c1ea1019d92d2f7f0da7f2ab9b0e4b3ee5318c4d4fbf9899c2d92cae5a45c131847442425ec6456f5a2ec59349de8776db6b48d8aa78b710c99a01b81201 SHA512 25e166d208d99360c9ec5deba5075a5268f2fbc3f31ad9dee0dbd33ee37bc78829d12c9ea11faa5d59ec53385f7dc5f0be29512199db2856068cf81b9ec1ca79
DIST icedtea-3.15-jaxws-4dee0def390a.tar.xz 2275928 BLAKE2B ff7af188ea2bd602621963d27d9389ad57d3e368df49ee12595af511dbcb3904f8322ae9e56dbe60e0374eed674d244cee7c522eb0257110bf9d1a436fee23d3 SHA512 cb7a9f80bd33a33f4eb03b091e6c6d3fb6a450695d0231c378d04878fc03e1574f82045c628993e6136188fd2e4144e31c82320b178b21a0aae867e989bfdeeb
DIST icedtea-3.15-jdk-c2f574d16c2f.tar.xz 39564852 BLAKE2B 247368e9b277bd991f9d1f1040ea52e37568b9a2b36fc71269fcfb3cb9a2efa0b9ee3ec9d865b20882ce750f051ab0f3d9d33d58c1878c9d77c8576f57285647 SHA512 306e2c188987de8d1aa233db1c42522249198b4f3eb71919da911289ab2308b4ab9406c6215c5c157868618341cafbc086bb0e5c423bb6650edfedcc05b17475
DIST icedtea-3.15-langtools-9cb3b18d9139.tar.xz 2077016 BLAKE2B 461f3941a81508d8b37ff096aa176bfa1f4bd86dfdb45b49bc431c09caa568f506fd7094b07a1de96138b5b8f2fea37d46137365a67ac1d82f22b85cc461345b SHA512 3fcb7d264ff23de8b049b264213b05ee9e9120089eaea989e881c0cddc73a2ef9d01f89f66e7ff23c88d9bc4864824c77894d0291caaf9a2a134d5fae650cc32
DIST icedtea-3.15-nashorn-04210bbb67cd.tar.xz 2319568 BLAKE2B 1078f8847eefffffbdfb2deb6194d0532c4925f6603c47fecce8523aed520041f7234440be534780b5fa2271d0c87240a50ef20b9601e482074d28709f81ba5a SHA512 6d27137dd80d6363e64ef2c6b3abc60603480e9e7f5b99e06ee546a2cc707b801087ce8cc8d021776f5d2b15b73728f08b2e649c65265ba264655d816921ffe7
DIST icedtea-3.15-openjdk-c0ec72b715dd.tar.xz 362300 BLAKE2B e5bd5766bd9f436f09fb5146ab1c0ee3e82f9d32526fc41e2c9320c2e330a4603883206e0ebcfd076ffeff8ccdd3c289a5018f718223b68852e08bf4822167e0 SHA512 d7dca834fc65b67b1888c4cfbd50e263e58604b70560b4dd4e8e7ca518fcd54a70eaf9e5cff89fa1954beaa3071f5b55ef36fffb36589f5008e4be39e5a1aa38
DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e12683577e0a8fdc18be5b4db6c2ee59d64424200940c18889e6c39567f9471b44f4d7199bc1816ed2f5d2a16bfe06e0b1b1c0d93bc0722202c272115 SHA512 0c229ab3c1a2de6c24715d9713250e35c415f919ee3c4e99b0b101bc3f51fea54814f235da345d0d4954d4f3283c7757091076a7128847c879399fd1c8a6c15d
DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6

@ -353,7 +353,7 @@ src_install() {
rm -v "${ddest}"/src.zip || die
fi
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die

@ -353,7 +353,7 @@ src_install() {
rm -v "${ddest}"/src.zip || die
fi
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die

@ -0,0 +1,375 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="6"
SLOT="8"
inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
CORBA_TARBALL="f59374a41938.tar.xz"
JAXP_TARBALL="f42bdc74d2f5.tar.xz"
JAXWS_TARBALL="4dee0def390a.tar.xz"
JDK_TARBALL="c2f574d16c2f.tar.xz"
LANGTOOLS_TARBALL="9cb3b18d9139.tar.xz"
OPENJDK_TARBALL="c0ec72b715dd.tar.xz"
NASHORN_TARBALL="04210bbb67cd.tar.xz"
HOTSPOT_TARBALL="f76744714698.tar.xz"
SHENANDOAH_TARBALL="9fcff2250bb4.tar.xz"
AARCH32_TARBALL="4107aea57664.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
DROP_URL="https://icedtea.classpath.org/download/drops"
ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="https://icedtea.classpath.org"
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
SRC_URI="
https://icedtea.classpath.org/download/source/${SRC_PKG}
${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+alsa cacao +cups doc examples +gtk headless-awt
jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
RESTRICT="!test? ( test )"
REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0"
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
>=media-libs/giflib-4.1.6:0=
>=media-libs/libpng-1.2:0=
>=x11-libs/libX11-1.1.3
>=x11-libs/libXext-1.1.1
>=x11-libs/libXi-1.1.3
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXtst-1.0.3
x11-libs/libXcomposite"
X_DEPEND="
x11-base/xorg-proto
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXinerama-1.0.2"
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
COMMON_DEP="
>=dev-libs/glib-2.26:2=
>=dev-util/systemtap-1
media-libs/fontconfig:1.0=
>=media-libs/freetype-2.5.3:2=
>=sys-libs/zlib-1.2.3
virtual/jpeg:0=
kerberos? ( virtual/krb5 )
sctp? ( net-misc/lksctp-tools )
smartcard? ( sys-apps/pcsc-lite )
system-lcms? ( >=media-libs/lcms-2.9:2= )"
# Gtk+ will move to COMMON_DEP in time; PR1982
# gsettings-desktop-schemas will be needed for native proxy support; PR1976
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
!dev-java/icedtea-web:7
>=gnome-base/gsettings-desktop-schemas-3.12.2
>=sys-apps/baselayout-java-0.1.0-r1
virtual/ttf-fonts
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )
gtk? (
>=dev-libs/atk-1.30.0
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.8:2
>=x11-libs/pango-1.24.5
)
!headless-awt? ( ${X_COMMON_DEP} )
selinux? ( sec-policy/selinux-java )"
# ca-certificates, perl and openssl are used for the cacerts keystore generation
# perl is needed for running the SystemTap tests and the bootstrap javac
# lsb-release is used to obtain distro information for the version & crash dump output
# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
# Ant is no longer needed under the new build system
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
dev-java/icedtea-bin:8
dev-java/icedtea:8
dev-java/openjdk:8
dev-java/openjdk-bin:8
)
app-arch/cpio
app-arch/unzip
app-arch/zip
app-misc/ca-certificates
dev-lang/perl
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl:0 )
sys-apps/attr
sys-apps/lsb-release
x11-libs/libXt
virtual/pkgconfig
pax_kernel? ( sys-apps/elfix )"
PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
icedtea_check_requirements() {
local CHECKREQS_DISK_BUILD
if use doc; then
CHECKREQS_DISK_BUILD="9000M"
else
CHECKREQS_DISK_BUILD="8500M"
fi
check-reqs_pkg_${EBUILD_PHASE}
}
pkg_pretend() {
icedtea_check_requirements
}
pkg_setup() {
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="
icedtea-8 icedtea-bin-8
openjdk-8 openjdk-bin-8"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${SRC_PKG}
}
src_configure() {
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# gcj-jdk ensures ecj is present.
if use jbootstrap || has "${vm}" gcj-jdk; then
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
config+=" --enable-bootstrap"
else
config+=" --disable-bootstrap"
fi
# Use Zero if requested
if use zero; then
use_zero="yes"
fi
# Use JamVM if requested
if use jamvm; then
use_jamvm="yes"
fi
# Use CACAO if requested
if use cacao; then
use_cacao="yes"
fi
# Are we on a architecture with a HotSpot port?
# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
hotspot_port="yes"
# Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
fi
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use Zero for now until alternate VMs are working
if test "x${hotspot_port}" != "xyes"; then
use_zero="yes"
fi
if use shenandoah; then
if { use amd64 || use arm64; }; then
hs_config="--with-hotspot-build=shenandoah"
hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
else
eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
fi
else
if use arm ; then
hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
else
hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
fi
fi
# Turn on JamVM if needed (non-HS archs) or requested
if test "x${use_jamvm}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-jamvm"'
fi
ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
jamvm_config="--enable-jamvm"
fi
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-cacao"'
fi
ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
cacao_config="--enable-cacao"
fi
# Turn on Zero if needed (non-HS/CACAO archs) or requested
if test "x${use_zero}" = "xyes"; then
if test "x${hotspot_port}" = "xyes"; then
ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
fi
zero_config="--enable-zero"
fi
# PaX breaks pch, bug #601016
if use pch && ! host-is-pax; then
config+=" --enable-precompiled-headers"
else
config+=" --disable-precompiled-headers"
fi
config+=" --with-parallel-jobs=$(makeopts_jobs)"
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--with-pkgversion="Gentoo ${PF}" \
--disable-ccache \
--disable-downloading --disable-Werror --disable-tests \
--disable-systemtap-tests --enable-improved-font-rendering \
--enable-system-jpeg --enable-system-zlib \
$(use_enable headless-awt headless) \
$(use_enable !headless-awt system-gif) \
$(use_enable !headless-awt system-png) \
$(use_enable doc docs) \
$(use_enable kerberos system-kerberos) \
$(use_enable system-lcms) \
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
$(use_enable sctp system-sctp) \
$(use_enable smartcard system-pcsc) \
${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
}
src_compile() {
default
}
src_test() {
default
}
src_install() {
default
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}${dest#/}"
if ! use alsa; then
rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi
if ! use examples; then
rm -r "${ddest}"/demo "${ddest}"/sample || die
fi
if ! use source; then
rm -v "${ddest}"/src.zip || die
fi
dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
java-vm_install-env "${FILESDIR}/icedtea.env.sh"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_postinst() {
xdg_icon_cache_update
java-vm-2_pkg_postinst
}
pkg_postrm() {
xdg_icon_cache_update
java-vm-2_pkg_postrm
}

@ -1,15 +1,17 @@
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz 194920675 BLAKE2B ad509e368aba7b5fce9e6212b296442bcd970f4dfe59e53dd13977da0137674fd85164657fa1abebfdcf58640ba511f1fcd30c46ec02a08edba5b498050bc60b SHA512 7fcd7c4eddcd9e2b6aa5cba69f2926a1131cd8246348f1a0c6575dca9c73b677d245fd8e12b1b41415aaf3dd0660581398f30c29503787e17428839e3fadf5b5
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz 183239547 BLAKE2B 781647daac4ff5ac2e93a01aed93a6729c12611e1de75dafcc018c5222a442a846b9ccf8ec1e5381eb191ae2b8252a9878562843eb675299e96563c65e91f4bc SHA512 b2e2bb63706bfa197bb7ea5560dedb521666c52900c9ffe91ffcff5ddbf4e0cacdb4efddcc03081f06c9686e9451f27a905d731a3bccd8925c952ddde331eee4
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz 181290255 BLAKE2B d8d25d71e790527c572c74f7a53317933b8a0801a8b3779daa9fe92bbe8b11fad74cf7e2e2a2194dc514930fba2c86fcdd630b06cdcd0dafa8fcecd5bac6be42 SHA512 5b50f0585ae09e1d446170b40728ad915b7da2c22341385a8b014ac09ca805acc413c840c6ea8bac4b579d418200208a53f98759b446a28ad3e28b0078190b50
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz 104544830 BLAKE2B 9ccf24a2409da8989e2bf9c9dbca9176036b179a25b0e21df3d4532b7144edbf57dc45b739c6d0891251d2e6caa00f8eab664670602b004549a5c13a1d7dd133 SHA512 3bf3272b19c73652b485df1293f27ce1daa32be690bef053ff7df164f9ac73aa197f4d4ee782aafe410e5e81b1d0db005c4f16d601668b777f49a7d524ab5ef2
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz 99367073 BLAKE2B af507e3c1877a4e895f65fb4f47f8559ac626c78477919f281ff9ce34dcc0c6394f4ca4336d406efed541c3190147188e772922c09d91ba0efaac37ed7214a90 SHA512 1b166e21de8889a1aa7e90591e635c22bf18ccfa1b9d774dd01cbc97f4c0a732ebdebac8f18aed649869e52512fce35ee9a8398e1526c2e06d6109994e3772f9
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz 99245777 BLAKE2B c8f2066cfa3f3fc9add7846ccf6c5d05031ff7adcfc41c9c6220615f80a1fb0168dd9b2faefeb58c9ee3fe2b31223d59c694b2b50635b13161c7f3c56bba7f78 SHA512 86490b52d27c6fb3031243e9f72284e5f77ce2362dce967cc7659263137818bedcaec147492e84bf9a88f066974fb257aecf36c59d91cd5789c57ab5e410ce57
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86abc1708f23fd9e3809824fbe3084dddbf115a5b5d5fac7a4936e16f78033dafea0ee6e6113dc463e33f55907caefed4ae2cb85864ef1d59e7b45e2708a564 SHA512 c304aab812559a5da9b346759533ddb3e1bb6320e959e8dd01a0ae5cb3b85a6282492e7bdfafef40573c3970b79b8bac8e2abff021a43966a4b7e7edf80ae70a
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save