root
2 years ago
parent
41f06bbd23
commit
cdbefe789e
Binary file not shown.
Binary file not shown.
@ -0,0 +1,8 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-group
|
||||
|
||||
ACCT_GROUP_ID=510
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>williamh@gentoo.org</email>
|
||||
<name>William Hubbs</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
Binary file not shown.
@ -0,0 +1,16 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="Dedicated user for gitlab-runner"
|
||||
|
||||
ACCT_USER_ID=510
|
||||
ACCT_USER_GROUPS=( gitlab-runner )
|
||||
|
||||
ACCT_USER_HOME=/var/lib/gitlab-runner
|
||||
ACCT_USER_HOME_PERMS=0770
|
||||
|
||||
acct-user_add_deps
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>williamh@gentoo.org</email>
|
||||
<name>William Hubbs</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
Binary file not shown.
@ -1,10 +1,7 @@
|
||||
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
|
||||
DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800
|
||||
DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092
|
||||
DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c
|
||||
DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013
|
||||
DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
|
||||
DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938
|
||||
DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f
|
||||
DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
|
||||
DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
|
||||
|
||||
@ -0,0 +1,155 @@
|
||||
https://github.com/saltstack/salt/issues/61848
|
||||
https://patch-diff.githubusercontent.com/raw/saltstack/salt/pull/61856.patch
|
||||
|
||||
Dropped a bunch of irrelevant hunks (CI files and a test not in 3003.3)
|
||||
|
||||
From 03c2a607a0722ad5e55b6c8f8eda630be7c7fee5 Mon Sep 17 00:00:00 2001
|
||||
From: jonyhy96 <hy352144278@gmail.com>
|
||||
Date: Thu, 10 Mar 2022 10:41:48 +0800
|
||||
Subject: [PATCH 1/5] fix: jinja2 contextfuntion base on version
|
||||
|
||||
---
|
||||
salt/utils/jinja.py | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 4c430b5ccf32..9a1938c2d69b 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
|
||||
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
|
||||
|
||||
|
||||
-@jinja2.contextfunction
|
||||
+if jinja2.__version__ < '3.0.0' :
|
||||
+ contextfunction = jinja2.contextfunction
|
||||
+else:
|
||||
+ contextfunction = jinja2.pass_context
|
||||
+@contextfunction
|
||||
def show_full_context(ctx):
|
||||
return salt.utils.data.simple_types_filter(
|
||||
{key: value for key, value in ctx.items()}
|
||||
|
||||
From 1aba938021b86732a211a899dc4c2a46afa488a2 Mon Sep 17 00:00:00 2001
|
||||
From: jonyhy96 <hy352144278@gmail.com>
|
||||
Date: Thu, 3 Mar 2022 16:21:17 +0800
|
||||
Subject: [PATCH 2/5] fix: jinja2 DeprecationWarning
|
||||
|
||||
---
|
||||
salt/utils/jinja.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 9a1938c2d69b..207a2cb77035 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -710,7 +710,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
|
||||
if jinja2.__version__ < '3.0.0' :
|
||||
contextfunction = jinja2.contextfunction
|
||||
else:
|
||||
- contextfunction = jinja2.pass_context
|
||||
+ contextfunction = jinja2.pass_context
|
||||
@contextfunction
|
||||
def show_full_context(ctx):
|
||||
return salt.utils.data.simple_types_filter(
|
||||
|
||||
From 7f281bbfc8efda40cfe7d607c0ddebb2fb00bd5d Mon Sep 17 00:00:00 2001
|
||||
From: Megan Wilhite <mwilhite@vmware.com>
|
||||
Date: Fri, 25 Mar 2022 08:31:24 -0600
|
||||
Subject: [PATCH 3/5] Use the correct Markup from jinja for each version
|
||||
|
||||
---
|
||||
salt/utils/jinja.py | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 207a2cb77035..558f063d7206 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -26,7 +26,7 @@
|
||||
import salt.utils.stringutils
|
||||
import salt.utils.url
|
||||
import salt.utils.yaml
|
||||
-from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
|
||||
+from jinja2 import BaseLoader, TemplateNotFound, nodes
|
||||
from jinja2.environment import TemplateModule
|
||||
from jinja2.exceptions import TemplateRuntimeError
|
||||
from jinja2.ext import Extension
|
||||
@@ -35,6 +35,12 @@
|
||||
from salt.utils.odict import OrderedDict
|
||||
from salt.utils.versions import LooseVersion
|
||||
|
||||
+try:
|
||||
+ from jinja2 import Markup
|
||||
+except ImportError:
|
||||
+ # Markup moved to markupsafe in jinja>= 3.1
|
||||
+ from markupsafe import Markup
|
||||
+
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
__all__ = ["SaltCacheLoader", "SerializerExtension"]
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 558f063d7206..5d00b134e25f 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -713,10 +713,12 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
|
||||
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
|
||||
|
||||
|
||||
-if jinja2.__version__ < '3.0.0' :
|
||||
+if jinja2.__version__ < "3.0.0":
|
||||
contextfunction = jinja2.contextfunction
|
||||
else:
|
||||
contextfunction = jinja2.pass_context
|
||||
+
|
||||
+
|
||||
@contextfunction
|
||||
def show_full_context(ctx):
|
||||
return salt.utils.data.simple_types_filter(
|
||||
|
||||
From 9056e636beaea7de2e3a61876ba0345e5d390973 Mon Sep 17 00:00:00 2001
|
||||
From: Megan Wilhite <mwilhite@vmware.com>
|
||||
Date: Fri, 25 Mar 2022 11:14:01 -0600
|
||||
Subject: [PATCH 5/5] Fix requested feedback
|
||||
|
||||
---
|
||||
requirements/static/ci/docs.in | 1 +
|
||||
requirements/static/ci/py3.10/docs.txt | 3 ++-
|
||||
requirements/static/ci/py3.6/docs.txt | 1 +
|
||||
requirements/static/ci/py3.7/docs.txt | 3 ++-
|
||||
requirements/static/ci/py3.8/docs.txt | 3 ++-
|
||||
requirements/static/ci/py3.9/docs.txt | 3 ++-
|
||||
salt/utils/jinja.py | 10 +++++-----
|
||||
8 files changed, 21 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
|
||||
index 5d00b134e25f..aa8ebe90546c 100644
|
||||
--- a/salt/utils/jinja.py
|
||||
+++ b/salt/utils/jinja.py
|
||||
@@ -36,10 +36,10 @@
|
||||
from salt.utils.versions import LooseVersion
|
||||
|
||||
try:
|
||||
- from jinja2 import Markup
|
||||
-except ImportError:
|
||||
- # Markup moved to markupsafe in jinja>= 3.1
|
||||
from markupsafe import Markup
|
||||
+except ImportError:
|
||||
+ # jinja < 3.1
|
||||
+ from jinja2 import Markup
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -713,9 +713,9 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
|
||||
return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
|
||||
|
||||
|
||||
-if jinja2.__version__ < "3.0.0":
|
||||
+try:
|
||||
contextfunction = jinja2.contextfunction
|
||||
-else:
|
||||
+except AttributeError:
|
||||
contextfunction = jinja2.pass_context
|
||||
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..8} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
inherit systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="https://www.saltstack.com/resources/community/
|
||||
https://github.com/saltstack"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
dev-python/distro[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toml[${PYTHON_USEDEP}]
|
||||
dev-python/watchdog[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
nova? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
neutron? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )
|
||||
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3001.1-tests.patch"
|
||||
"${FILESDIR}/salt-3001.6-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# remove tests with external dependencies that may not be available, and
|
||||
# tests that don't work in sandbox
|
||||
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
|
||||
|
||||
# tests that require network access
|
||||
rm tests/unit/{states,modules}/test_zcbuildout.py || die
|
||||
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
|
||||
# pycryptodome rather than pycryptodomex
|
||||
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
einfo "Fixing collections.abc warnings for ${EPYTHON}"
|
||||
local abc
|
||||
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
|
||||
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose \
|
||||
|| die "testing failed with ${EPYTHON}"
|
||||
)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use python_targets_python3_8; then
|
||||
if use nova; then
|
||||
ewarn "Salt's nova functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-novaclient does not support it yet"
|
||||
fi
|
||||
if use neutron; then
|
||||
ewarn "Salt's neutron functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-neutronclient does not support it yet"
|
||||
fi
|
||||
if use libvirt; then
|
||||
ewarn "Salt's libvirt functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/libvirt-python does not support it yet"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -1,187 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
inherit systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="https://www.saltstack.com/resources/community/
|
||||
https://github.com/saltstack"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toml[${PYTHON_USEDEP}]
|
||||
dev-python/watchdog[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
nova? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
neutron? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )
|
||||
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
|
||||
"${FILESDIR}/salt-3002-tests.patch"
|
||||
"${FILESDIR}/salt-3002.5-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# remove tests with external dependencies that may not be available, and
|
||||
# tests that don't work in sandbox
|
||||
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
|
||||
|
||||
# tests that require network access
|
||||
rm tests/unit/{states,modules}/test_zcbuildout.py || die
|
||||
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
|
||||
# pycryptodome rather than pycryptodomex
|
||||
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
einfo "Fixing collections.abc warnings for ${EPYTHON}"
|
||||
local abc
|
||||
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
|
||||
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose \
|
||||
|| die "testing failed with ${EPYTHON}"
|
||||
)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use python_targets_python3_8; then
|
||||
if use nova; then
|
||||
ewarn "Salt's nova functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-novaclient does not support it yet"
|
||||
fi
|
||||
if use neutron; then
|
||||
ewarn "Salt's neutron functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-neutronclient does not support it yet"
|
||||
fi
|
||||
if use libvirt; then
|
||||
ewarn "Salt's libvirt functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/libvirt-python does not support it yet"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070
|
||||
DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1
|
||||
DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
|
||||
DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
|
||||
DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
|
||||
DIST devmanual-0_pre20220326.tar.xz 183228 BLAKE2B 67ab1a24e8f1043f2d7938a76f4d819ecfaffaf3516cf5ce9eff20ac0e481c60be06c83c4adc3835e6ee66c44def290aa682567662dbf7a7a7057b0d168e1677 SHA512 364fe3504ba424201b450e08fe2043e55d1067c3603c4d3248112117461a4ab667d50f82deac9daaf50e28ea5d996c1ae08668d55b7379915cc175f66edddf9b
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,376 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp-common flag-o-matic readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="26"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
|
||||
|
||||
RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
|
||||
sys-libs/ncurses:0=
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
games? ( acct-group/gamestat )
|
||||
gpm? ( sys-libs/gpm )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
mailutils? ( net-mail/mailutils[clients] )
|
||||
!mailutils? ( acct-group/mail net-libs/liblockfile )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
zlib? ( sys-libs/zlib )
|
||||
gui? ( !aqua? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libxcb
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/libXrender
|
||||
cairo? ( >=x11-libs/cairo-1.12.18 )
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
xwidgets? (
|
||||
net-libs/webkit-gtk:4=
|
||||
x11-libs/libXcomposite
|
||||
)
|
||||
)
|
||||
!gtk? (
|
||||
motif? (
|
||||
>=x11-libs/motif-2.3:0
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
) )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
gui? ( !aqua? ( x11-base/xorg-proto ) )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
|
||||
IDEPEND="app-eselect/eselect-emacs"
|
||||
|
||||
RDEPEND+=" ${IDEPEND}"
|
||||
|
||||
EMACS_SUFFIX="emacs-${SLOT}"
|
||||
SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
PATCHES=("${WORKDIR}/patch")
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
|
||||
|
||||
#AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
if use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if ! use gui; then
|
||||
einfo "Configuring to build without window system support"
|
||||
myconf+=" --without-x --without-ns"
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with cairo)"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-cairo"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use cairo && ewarn \
|
||||
"USE flag \"cairo\" has no effect if \"xft\" is not set."
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
|
||||
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
! use gtk && use xwidgets && ewarn \
|
||||
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--without-compress-install \
|
||||
--without-hesiod \
|
||||
--without-pop \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with dynamic-loading modules) \
|
||||
$(use_with games gameuser ":gamestat") \
|
||||
$(use_with gpm) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with lcms lcms2) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with mailutils) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with systemd libsystemd) \
|
||||
$(use_with threads) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
|
||||
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# movemail must be setgid mail
|
||||
if ! use mailutils; then
|
||||
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
|
||||
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
|
||||
fi
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
|
||||
rm -rf "${ED}"/usr/share/{applications,icons} || die
|
||||
rm -rf "${ED}/usr/$(get_libdir)" || die
|
||||
rm -rf "${ED}"/var || die
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
|
||||
|
||||
if use systemd; then
|
||||
insinto /usr/lib/systemd/user
|
||||
sed -e "/^##/d" \
|
||||
-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
|
||||
-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
|
||||
etc/emacs.service | newins - ${EMACS_SUFFIX}.service
|
||||
assert
|
||||
fi
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
|
||||
X
|
||||
;;; ${EMACS_SUFFIX} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
X (let ((path (getenv "INFOPATH"))
|
||||
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
|
||||
X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
|
||||
X (and path
|
||||
X ;; move Emacs Info dir before anything else in /usr/share
|
||||
X (let* ((p (cons nil (split-string path ":" t))) (q p))
|
||||
X (while (and (cdr q) (not (string-match re (cadr q))))
|
||||
X (setq q (cdr q)))
|
||||
X (setcdr q (cons dir (delete dir (cdr q))))
|
||||
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
|
||||
EOF
|
||||
elisp-site-file-install "${T}/${SITEFILE}" || die
|
||||
|
||||
dodoc README BUGS CONTRIBUTE
|
||||
|
||||
if use gui && use aqua; then
|
||||
dodir /Applications/Gentoo
|
||||
rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
|
||||
mv nextstep/Emacs.app \
|
||||
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
|
||||
fi
|
||||
|
||||
local DOC_CONTENTS="You can set the version to be started by
|
||||
/usr/bin/emacs through the Emacs eselect module, which also
|
||||
redirects man and info pages. Therefore, several Emacs versions can
|
||||
be installed at the same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from a previous major version of Emacs, then
|
||||
it is strongly recommended that you use app-admin/emacs-updater
|
||||
to rebuild all byte-compiled elisp files of the installed Emacs
|
||||
packages."
|
||||
if use gui; then
|
||||
DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
|
||||
symlink it into /Applications by yourself."
|
||||
fi
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# move Info dir file to correct name
|
||||
if [[ -d ${ED}/usr/share/info ]]; then
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elisp-site-regen
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST ghub-3.5.4.tar.gz 58088 BLAKE2B 5ee6fe56455e8f12e7be8c1ae705a426677fab0b9a5da8f42c4b331bdd635120a2f5475055c9e98c8df01b259f76aa2dd4cad6e8b4562481d261bb7802b826f6 SHA512 df8ba56195ae3773c0c8c8a8f555e562b04de59ce3fb1c17c24ca3b10418299555326f0a9360eb47725310890e31f73221eece3ca1ff83e47d52941e224fc562
|
||||
DIST ghub-3.5.6.tar.gz 59474 BLAKE2B c27610f24526a40b5f36d2f5154c0eeb9f86e9da676baa82b2866a0bb58de8a78736d56a5d6454666b539774abbf5dfcd260880aa07499616f44a3e2c8315999 SHA512 6c6724978f0809a4977cc7965de4c33eaf29537c13507aabffecae4a7d2b3710074179d819aee1a54fce8f12e20db46b18466c3f1012d3b9c41eae3c2fade58a
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
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="docs/ghub.texi"
|
||||
DOCS="README.md"
|
||||
|
||||
RDEPEND="
|
||||
>=app-emacs/treepy-0.1.1
|
||||
"
|
||||
BDEPEND="${RDEPEND}
|
||||
sys-apps/texinfo"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
mv lisp/*.el . || die
|
||||
rm ghub-pkg.el || die
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
|
||||
DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
|
||||
DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60b50ccaaa3b9f6731285a667da919da7fec80d77a4fd11bc83d9f4ae4c0910e31423b58afbdf00d51b070295 SHA512 af727553c29c9fa0ba6eb6a73b25d62855ea4413eebc57baf3ed94be6a0240e4c558193c898430dc21132ba5e32ead584514910bf98b3b8d82adf7828f953652
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 2019-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Emacs incremental completion and selection narrowing framework"
|
||||
HOMEPAGE="https://emacs-helm.github.io/helm/"
|
||||
SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="app-emacs/async
|
||||
app-emacs/popup"
|
||||
BDEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES="${FILESDIR}/${PN}-3.8.0-no-autoload-check.patch"
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_compile() {
|
||||
elisp-compile *.el
|
||||
elisp-make-autoload-file
|
||||
}
|
||||
|
||||
src_install() {
|
||||
elisp_src_install
|
||||
dobin emacs-helm.sh
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST hl-todo-3.3.0.tar.gz 5688 BLAKE2B 3e644ab68707ff7fb3f846d07ccec9631f0c84eaabe453efe3f36658cb09024fce3bcb299cbfbb911ff3a2e93a0134bb84cf2e9486881c656b0344b28a3dda82 SHA512 361ea9f36abd2a43731252cdcda420da1661b3f60f9673cf9975eff3846367f7f29c787de515c75fb61fd14c1849b5d24a0f91d813ca00d09512d2218a45ffd1
|
||||
DIST hl-todo-3.4.1.tar.gz 5762 BLAKE2B fbc3e2d1c9e6492f55487e6ffc306588e1d27b758e97a538de77f56743f7717a3596bda072aa6cfb249c67e76f32263e07ca299e20fc635e585af32caef120ff SHA512 4cbde1f5c0697cb6906d355aff879f8a8b2ae1fbcb1a16016c1d6663ad520ba4bbc625d038975501b9deee827e52ac84cf0e8ca38ad538395ca1c9f7f82cba57
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
NEED_EMACS=25
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Highlight TODO and similar keywords in comments and strings"
|
||||
HOMEPAGE="https://github.com/tarsius/hl-todo"
|
||||
SRC_URI="https://github.com/tarsius/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
DOCS="README.md"
|
||||
@ -1 +1,2 @@
|
||||
DIST marginalia-0.12.tar.gz 28459 BLAKE2B f18dc11368f181bbf0bd92ba5abefd065181d2f3f2d7c27adab12e0b7baae69e8bf4d74e7e75687805773024fbc06eb0da49de2a14271cda125ffc2d6b01f049 SHA512 c6650f94e45fd82ddbbe0a58a4e816ebe55837ef8102c6a4871952b0c84ee44ab868bde41a864a06d03428a00cabf3a8a5e37addaa8bb81e3ea45271b8ad53ef
|
||||
DIST marginalia-0.13.tar.gz 28803 BLAKE2B 396656d93ee85d0b4ad216c2b27de5f2415ae0b54198eacf327eb035f4753a74389734353dd19913f6778d4cf9bfd82b1ee359105d7527d95fe9675afa368655 SHA512 08c6fd3ff744c3112e76a44786d5422b04d0fdf3e08342b1903578b80922df28b2fadd8f0af612f32dfd9c607786c12b6508b6996acbc671ba4d542c9a67d52b
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
NEED_EMACS=26
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Marginalia in the minibuffer"
|
||||
HOMEPAGE="https://github.com/minad/marginalia"
|
||||
SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
Binary file not shown.
Binary file not shown.
@ -1,26 +0,0 @@
|
||||
# /etc/conf.d/mysqld_exporter
|
||||
|
||||
# PID file
|
||||
#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
|
||||
|
||||
# The termination timeout (start-stop-daemon parameter "retry") ensures
|
||||
# that the service will be terminated within a given time (60 + 5 seconds
|
||||
# per default) when you are stopping the service.
|
||||
#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
|
||||
|
||||
# User to run exporter as
|
||||
#EXPORTER_USER="mysqld_exporter"
|
||||
|
||||
# User group to run exporter as
|
||||
#EXPORTER_GROUP="mysqld_exporter"
|
||||
|
||||
# You can use this configuration option to pass additional options to the
|
||||
# start-stop-daemon, see start-stop-daemon(8) for more details.
|
||||
# Per default we wait 1000ms after we have started the service to ensure
|
||||
# that the daemon is really up and running.
|
||||
#EXPORTER_SSDARGS="--wait 1000"
|
||||
|
||||
# Exporter flags
|
||||
# See `mysqld_exporter --help` for more details
|
||||
EXPORTER_FLAGS="-log.level=info"
|
||||
#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag"
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
|
||||
DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
|
||||
|
||||
@ -0,0 +1,124 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
|
||||
|
||||
DESCRIPTION="GNU Midnight Commander is a text based file manager"
|
||||
HOMEPAGE="https://midnight-commander.org"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="+edit gpm nls sftp +slang spell test unicode X"
|
||||
|
||||
REQUIRED_USE="spell? ( edit )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.30.0:2
|
||||
gpm? ( sys-libs/gpm )
|
||||
kernel_linux? ( sys-fs/e2fsprogs )
|
||||
sftp? ( net-libs/libssh2 )
|
||||
slang? ( >=sys-libs/slang-2 )
|
||||
!slang? ( sys-libs/ncurses:=[unicode(+)?] )
|
||||
spell? ( app-text/aspell )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libICE
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libSM
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( dev-libs/check )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
if use slang && use unicode ; then
|
||||
ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# patch touches configure.ac
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
|
||||
|
||||
local myeconfargs=(
|
||||
--enable-charset
|
||||
--enable-vfs
|
||||
--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
|
||||
$(use_enable kernel_linux vfs-undelfs)
|
||||
# Today mclib does not expose any headers and is linked to
|
||||
# single 'mc' binary. Thus there is no advantage of having
|
||||
# a library. Let's avoid shared library altogether
|
||||
# as it also conflicts with sci-libs/mc: bug #685938
|
||||
--disable-mclib
|
||||
$(use_enable nls)
|
||||
$(use_enable sftp vfs-sftp)
|
||||
$(use_enable spell aspell)
|
||||
$(use_enable test tests)
|
||||
$(use_with gpm gpm-mouse)
|
||||
$(use_with X x)
|
||||
$(use_with edit internal-edit)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Bug #759466
|
||||
if [[ ${EUID} == 0 ]] ; then
|
||||
ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
|
||||
ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
|
||||
fi
|
||||
|
||||
# CK_FORK=no to avoid using fork() in check library
|
||||
# as mc mocks fork() itself: bug #644462.
|
||||
#
|
||||
# VERBOSE=1 to make test failures contain detailed
|
||||
# information.
|
||||
CK_FORK=no emake check VERBOSE=1
|
||||
}
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc AUTHORS NEWS README
|
||||
|
||||
# fix bug #334383
|
||||
if use kernel_linux && [[ ${EUID} == 0 ]] ; then
|
||||
fowners root:tty /usr/libexec/mc/cons.saver
|
||||
fperms g+s /usr/libexec/mc/cons.saver
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use spell && ! has_version app-dicts/aspell-en ; then
|
||||
elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
|
||||
elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
|
||||
elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
|
||||
elog
|
||||
fi
|
||||
elog "To enable exiting to latest working directory,"
|
||||
elog "put this into your ~/.bashrc:"
|
||||
elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
|
||||
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
--- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200
|
||||
+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200
|
||||
@@ -1069,7 +1069,9 @@
|
||||
${SCRIBUS_GMAGICK_SRC}
|
||||
)
|
||||
|
||||
-if(NOT HAVE_HYPHEN)
|
||||
+if(HAVE_HYPHEN)
|
||||
+ include_directories(${HYPHEN_INCLUDE_DIR})
|
||||
+else()
|
||||
include_directories(third_party/hyphen)
|
||||
set(SCRIBUS_SOURCES
|
||||
${SCRIBUS_SOURCES}
|
||||
@@ -1180,13 +1182,6 @@
|
||||
|
||||
endif()
|
||||
|
||||
-if(HAVE_HYPHEN)
|
||||
- target_link_libraries(${EXE_NAME}
|
||||
- ${HYPHEN_LIBRARY}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-
|
||||
if(GESTURE_FRAME_PREVIEW)
|
||||
message(STATUS "Enable gesture frame preview [experimental]")
|
||||
set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
|
||||
@@ -1234,6 +1229,12 @@
|
||||
)
|
||||
endif ()
|
||||
|
||||
+if(HAVE_HYPHEN)
|
||||
+ target_link_libraries(${EXE_NAME}
|
||||
+ ${HYPHEN_LIBRARY}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
if(WIN32)
|
||||
set_target_properties(${EXE_NAME}
|
||||
PROPERTIES
|
||||
--- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200
|
||||
+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <QSet>
|
||||
|
||||
#include "scribusapi.h"
|
||||
-#include "third_party/hyphen/hyphen.h"
|
||||
+#include <hyphen.h>
|
||||
|
||||
class ScribusDoc;
|
||||
class ScribusMainWindow;
|
||||
@ -1,219 +0,0 @@
|
||||
https://bugs.gentoo.org/831161
|
||||
Backport of https://github.com/scribusproject/scribus/commit/80405ce
|
||||
|
||||
From: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Mon, 10 Jan 2022 20:38:51 +0000
|
||||
Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
|
||||
conflict with std::byte in c++17 mode
|
||||
--- a/scribus/third_party/prc/oPRCFile.cc
|
||||
+++ b/scribus/third_party/prc/oPRCFile.cc
|
||||
@@ -76,3 +76,3 @@
|
||||
// Map [0,1] to [0,255]
|
||||
-inline uint8_t byte(double r)
|
||||
+inline uint8_t to_byte(double r)
|
||||
{
|
||||
@@ -451,5 +451,5 @@
|
||||
{
|
||||
- tess->rgba_vertices.push_back(byte(lit->color.red));
|
||||
- tess->rgba_vertices.push_back(byte(lit->color.green));
|
||||
- tess->rgba_vertices.push_back(byte(lit->color.blue));
|
||||
+ tess->rgba_vertices.push_back(to_byte(lit->color.red));
|
||||
+ tess->rgba_vertices.push_back(to_byte(lit->color.green));
|
||||
+ tess->rgba_vertices.push_back(to_byte(lit->color.blue));
|
||||
}
|
||||
@@ -595,19 +595,19 @@
|
||||
{
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
|
||||
}
|
||||
@@ -622,19 +622,19 @@
|
||||
{
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[2].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
|
||||
}
|
||||
@@ -646,19 +646,19 @@
|
||||
{
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[3].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[1].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
|
||||
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[0].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
|
||||
}
|
||||
@@ -1650,17 +1650,17 @@
|
||||
{
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
|
||||
}
|
||||
@@ -1794,33 +1794,33 @@
|
||||
// first triangle
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
|
||||
// second triangle
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
|
||||
if(tessFace->is_rgba)
|
||||
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
|
||||
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
|
||||
}
|
||||
@@ -1912,7 +1912,7 @@
|
||||
{
|
||||
- tess->rgba_vertices.push_back(byte(C[CI[i]].R));
|
||||
- tess->rgba_vertices.push_back(byte(C[CI[i]].G));
|
||||
- tess->rgba_vertices.push_back(byte(C[CI[i]].B));
|
||||
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R));
|
||||
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G));
|
||||
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B));
|
||||
if(tess->is_rgba)
|
||||
- tess->rgba_vertices.push_back(byte(C[CI[i]].A));
|
||||
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A));
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch
|
||||
https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
|
||||
https://bugs.scribus.net/view.php?id=16635
|
||||
https://bugs.gentoo.org/817281
|
||||
https://bugs.gentoo.org/813711
|
||||
|
||||
From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
|
||||
From: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Sat, 21 Aug 2021 20:05:43 +0000
|
||||
Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
|
||||
prepeare for removal of legacy API in 3.0
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
|
||||
---
|
||||
scribus/fonts/sfnt.cpp | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
|
||||
index 50777f66e3..fca8b39158 100644
|
||||
--- a/scribus/fonts/sfnt.cpp
|
||||
+++ b/scribus/fonts/sfnt.cpp
|
||||
@@ -1256,11 +1256,19 @@ namespace sfnt {
|
||||
|
||||
for (int i = 0; i < cids.count(); ++i)
|
||||
hb_set_add(glyphSet, cids.at(i));
|
||||
-
|
||||
+
|
||||
+#if HB_VERSION_ATLEAST(2, 9, 0)
|
||||
+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
|
||||
+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
|
||||
+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
|
||||
+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
|
||||
+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
|
||||
+#else
|
||||
hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
|
||||
hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
|
||||
#if HB_VERSION_ATLEAST(2, 6, 5)
|
||||
hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
|
||||
|
||||
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
|
||||
From: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Sun, 19 Sep 2021 11:59:50 +0000
|
||||
Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
|
||||
hb_subset_or_fail
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
|
||||
--- a/scribus/fonts/sfnt.cpp
|
||||
+++ b/scribus/fonts/sfnt.cpp
|
||||
@@ -1271,9 +1271,15 @@ namespace sfnt {
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if HB_VERSION_ATLEAST(2, 9, 0)
|
||||
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
|
||||
+ if (hbSubsetFace.isNull())
|
||||
+ return QByteArray();
|
||||
+#else
|
||||
QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
|
||||
if (hbSubsetFace.isNull())
|
||||
return QByteArray();
|
||||
+#endif
|
||||
|
||||
QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
|
||||
if (hbSubsetBlob.isNull())
|
||||
@ -1,162 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE="tk?"
|
||||
inherit cmake desktop flag-o-matic python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Desktop publishing (DTP) and layout program"
|
||||
HOMEPAGE="https://www.scribus.net/"
|
||||
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ppc64 x86"
|
||||
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
tk? ( scripts )"
|
||||
|
||||
# osg
|
||||
# couple of third_party libs bundled
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
app-text/libmspub
|
||||
app-text/libqxp
|
||||
app-text/poppler:=
|
||||
dev-libs/hyphen
|
||||
dev-libs/icu:0=
|
||||
dev-libs/librevenge
|
||||
dev-libs/libxml2
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5[-gles2-only]
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtopengl:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtxml:5
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype:2
|
||||
media-libs/harfbuzz:0=[icu]
|
||||
media-libs/lcms:2
|
||||
media-libs/libcdr
|
||||
media-libs/libfreehand
|
||||
media-libs/libpagemaker
|
||||
media-libs/libpng:0=
|
||||
media-libs/libvisio
|
||||
media-libs/libzmf
|
||||
media-libs/tiff:0
|
||||
net-print/cups
|
||||
sys-libs/zlib[minizip]
|
||||
virtual/jpeg:0=
|
||||
x11-libs/cairo[X,svg]
|
||||
boost? ( dev-libs/boost:= )
|
||||
graphicsmagick? ( media-gfx/graphicsmagick:= )
|
||||
hunspell? ( app-text/hunspell:= )
|
||||
osg? ( dev-games/openscenegraph:= )
|
||||
pdf? ( app-text/podofo:0= )
|
||||
scripts? (
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/pillow[tk?,${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
app-text/ghostscript-gpl
|
||||
"
|
||||
BDEPEND="
|
||||
dev-qt/linguist-tools:5
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# non(?)-upstreamable
|
||||
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
|
||||
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
|
||||
"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
|
||||
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
|
||||
# upstream
|
||||
"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
|
||||
"${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch
|
||||
)
|
||||
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
|
||||
S="${WORKDIR}/${P}"
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
rm -r codegen/cheetah scribus/third_party/hyphen || die
|
||||
|
||||
sed \
|
||||
-e "/^\s*unzip\.[ch]/d" \
|
||||
-e "/^\s*ioapi\.[ch]/d" \
|
||||
-i scribus/CMakeLists.txt Scribus.pro || die
|
||||
rm scribus/ioapi.[ch] || die
|
||||
|
||||
sed \
|
||||
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
|
||||
-i resources/templates/CMakeLists.txt || die
|
||||
|
||||
sed \
|
||||
-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
|
||||
-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug #550818
|
||||
append-cppflags -DHAVE_MEMRCHR
|
||||
|
||||
local mycmakeargs=(
|
||||
-DHAVE_PYTHON=ON
|
||||
-DWANT_DISTROBUILD=ON
|
||||
-DWANT_CPP17=ON
|
||||
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
|
||||
-DPython3_EXECUTABLE="${PYTHON}"
|
||||
-DWITH_BOOST=$(usex boost)
|
||||
-DWANT_DEBUG=$(usex debug)
|
||||
-DWANT_NOEXAMPLES=$(usex !examples)
|
||||
-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
|
||||
-DWANT_HUNSPELL=$(usex hunspell)
|
||||
-DWANT_HEADERINSTALL=$(usex !minimal)
|
||||
-DWANT_NOOSG=$(usex !osg)
|
||||
-DWITH_PODOFO=$(usex pdf)
|
||||
-DWANT_NOTEMPLATES=$(usex !templates)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if ! use tk; then
|
||||
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
|
||||
fi
|
||||
if use scripts; then
|
||||
python_fix_shebang "${ED}"/usr/share/scribus/scripts
|
||||
python_optimize "${ED}"/usr/share/scribus/scripts
|
||||
else
|
||||
rm "${ED}"/usr/share/scribus/scripts/*.py || die
|
||||
fi
|
||||
|
||||
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
|
||||
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
|
||||
|
||||
# These files are parsed to populate the help/about window.
|
||||
cat >> "${T}"/COPYING <<- EOF || die
|
||||
${PN} is licensed under the "${LICENSE}".
|
||||
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
|
||||
EOF
|
||||
dodoc "${T}"/COPYING
|
||||
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
|
||||
|
||||
local size
|
||||
for size in 16 32 128 256 512; do
|
||||
newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
|
||||
done
|
||||
newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
|
||||
doicon resources/iconsets/*/scribus.png
|
||||
domenu scribus.desktop
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,26 +0,0 @@
|
||||
Avoid calling libjxr's JxrDecApp as we currently don't package it.
|
||||
--- a/src/calibre/utils/img.py
|
||||
+++ b/src/calibre/utils/img.py
|
||||
@@ -119,8 +119,6 @@ def image_from_data(data):
|
||||
i = QImage()
|
||||
if not i.loadFromData(data):
|
||||
q = what(None, data)
|
||||
- if q == 'jxr':
|
||||
- return load_jxr_data(data)
|
||||
raise NotImage('Not a valid image (detected type: {})'.format(q))
|
||||
return i
|
||||
|
||||
--- a/src/calibre/utils/img.py
|
||||
+++ b/src/calibre/utils/img.py
|
||||
@@ -644,11 +644,6 @@ def test(): # {{{
|
||||
despeckle_image(img)
|
||||
remove_borders_from_image(img)
|
||||
image_to_data(img, fmt='GIF')
|
||||
- raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
|
||||
- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
|
||||
- stdout=subprocess.PIPE).stdout.read()
|
||||
- if b'JPEG XR Decoder Utility' not in raw:
|
||||
- raise SystemExit('Failed to run JxrDecApp')
|
||||
# }}}
|
||||
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
|
||||
DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
|
||||
inherit meson plocale xdg-utils gnome2-utils
|
||||
SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
DESCRIPTION="gtk ebook reader built with gjs"
|
||||
HOMEPAGE="https://github.com/johnfactotum/foliate/"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="handy spell"
|
||||
|
||||
BDEPEND="${MESON_DEPEND}
|
||||
sys-devel/gettext"
|
||||
RDEPEND="dev-libs/gjs
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
x11-libs/gdk-pixbuf:2[introspection]
|
||||
net-libs/webkit-gtk:4[introspection]
|
||||
handy? ( gui-libs/libhandy:=[introspection] )
|
||||
spell? ( app-text/gspell[introspection] )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_find_changes "${S}"/po '' '.po'
|
||||
|
||||
rm_po() {
|
||||
rm po/${1}.po
|
||||
sed -e "/^${1}/d" -i po/LINGUAS
|
||||
}
|
||||
|
||||
plocale_for_each_disabled_locale rm_po
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
|
||||
DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
|
||||
DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
|
||||
DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
|
||||
DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
|
||||
DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit meson virtualx
|
||||
|
||||
DESCRIPTION="A highly customizable and functional document viewer"
|
||||
HOMEPAGE="https://pwmt.org/projects/zathura/"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
else
|
||||
SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
|
||||
KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
IUSE="doc +magic seccomp sqlite synctex test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND=">=dev-libs/girara-0.3.2
|
||||
>=dev-libs/glib-2.50:2
|
||||
>=sys-devel/gettext-0.19.8
|
||||
x11-libs/cairo[X]
|
||||
>=x11-libs/gtk+-3.22:3
|
||||
magic? ( sys-apps/file )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
sqlite? ( >=dev-db/sqlite-3.5.9:3 )
|
||||
synctex? ( app-text/texlive-core )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
BDEPEND="doc? ( dev-python/sphinx )
|
||||
test? ( dev-libs/appstream-glib
|
||||
dev-libs/check )
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dconvert-icon=disabled
|
||||
-Dmagic=$(usex magic enabled disabled)
|
||||
-Dmanpages=$(usex doc enabled disabled)
|
||||
-Dseccomp=$(usex seccomp enabled disabled)
|
||||
-Dsqlite=$(usex sqlite enabled disabled)
|
||||
-Dsynctex=$(usex synctex enabled disabled)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx meson_src_test
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit meson virtualx
|
||||
|
||||
DESCRIPTION="A highly customizable and functional document viewer"
|
||||
HOMEPAGE="https://pwmt.org/projects/zathura/"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
else
|
||||
SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
IUSE="doc +magic seccomp sqlite synctex test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND=">=dev-libs/girara-0.3.3
|
||||
>=dev-libs/glib-2.50:2
|
||||
>=sys-devel/gettext-0.19.8
|
||||
x11-libs/cairo[X]
|
||||
>=x11-libs/gtk+-3.22:3
|
||||
magic? ( sys-apps/file )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
sqlite? ( >=dev-db/sqlite-3.5.9:3 )
|
||||
synctex? ( app-text/texlive-core )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
BDEPEND="doc? ( dev-python/sphinx )
|
||||
test? ( dev-libs/appstream-glib
|
||||
dev-libs/check )
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dconvert-icon=disabled
|
||||
-Dmagic=$(usex magic enabled disabled)
|
||||
-Dmanpages=$(usex doc enabled disabled)
|
||||
-Dseccomp=$(usex seccomp enabled disabled)
|
||||
-Dsqlite=$(usex sqlite enabled disabled)
|
||||
-Dsynctex=$(usex synctex enabled disabled)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx meson_src_test
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1,4 @@
|
||||
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
|
||||
DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
|
||||
DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
|
||||
DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
|
||||
+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
|
||||
@@ -5,6 +5,35 @@
|
||||
|
||||
#include <libbuild2/script/regex.hxx>
|
||||
|
||||
+#if defined(_LIBCPP_VERSION)
|
||||
+template <>
|
||||
+void
|
||||
+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
|
||||
+{
|
||||
+ if (__s.__current_ != __s.__last_)
|
||||
+ {
|
||||
+ switch (*__s.__current_)
|
||||
+ {
|
||||
+ case '\r':
|
||||
+ case '\n':
|
||||
+ __s.__do_ = __state::__reject;
|
||||
+ __s.__node_ = nullptr;
|
||||
+ break;
|
||||
+ default:
|
||||
+ __s.__do_ = __state::__accept_and_consume;
|
||||
+ ++__s.__current_;
|
||||
+ __s.__node_ = this->first();
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ __s.__do_ = __state::__reject;
|
||||
+ __s.__node_ = nullptr;
|
||||
+ }
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
namespace build2
|
||||
@ -0,0 +1,117 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
|
||||
|
||||
BUILD2_PN=build2-toolchain
|
||||
BUILD2_PV="0.14.0"
|
||||
BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
|
||||
|
||||
inherit toolchain-funcs multiprocessing
|
||||
SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
|
||||
https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
DESCRIPTION="Common ODB runtime library"
|
||||
HOMEPAGE="https://codesynthesis.com/products/odb/"
|
||||
|
||||
LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
dev-cpp/libodb
|
||||
dev-db/sqlite:3
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
RDEPEND="${DEPEND}
|
||||
!<dev-util/build2-0.14.0
|
||||
"
|
||||
|
||||
BS="${WORKDIR}/${BUILD2_P}"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
b() {
|
||||
local myargs=(
|
||||
--jobs $(makeopts_jobs)
|
||||
--verbose 3
|
||||
)
|
||||
export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
|
||||
set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
|
||||
echo "${@}"
|
||||
"${@}" || die "${@} failed"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd "${WORKDIR}" || die
|
||||
for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
|
||||
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
|
||||
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
|
||||
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
|
||||
${i} \
|
||||
|| die
|
||||
done
|
||||
|
||||
cd "${BS}" || die
|
||||
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
|
||||
sed \
|
||||
-e 's:libsqlite3[/]\?::' \
|
||||
-i buildfile build/bootstrap.build \
|
||||
|| die
|
||||
|
||||
if has_version dev-util/pkgconf; then
|
||||
for i in build2/build2/buildfile build2/libbuild2/buildfile; do
|
||||
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
|
||||
"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
|
||||
"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
|
||||
"${i}" \
|
||||
|| die
|
||||
done
|
||||
sed \
|
||||
-e 's:libpkgconf[/]\?::' \
|
||||
-i buildfile build/bootstrap.build \
|
||||
|| die
|
||||
fi
|
||||
|
||||
cd "${S}" || die
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
pushd ${BS} || die
|
||||
emake -C build2 -f bootstrap.gmake \
|
||||
CXX=$(tc-getCXX) \
|
||||
CXXFLAGS="${CXXFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}"
|
||||
popd || die
|
||||
|
||||
b configure \
|
||||
config.cxx="$(tc-getCXX)" \
|
||||
config.cxx.coptions="${CXXFLAGS}" \
|
||||
config.cxx.loptions="${LDFLAGS}" \
|
||||
config.c="$(tc-getCC)" \
|
||||
config.cc.coptions="${CFLAGS}" \
|
||||
config.cc.loptions="${LDFLAGS}" \
|
||||
config.bin.ar="$(tc-getAR)" \
|
||||
config.bin.ranlib="$(tc-getRANLIB)" \
|
||||
config.bin.lib=shared \
|
||||
config.install.root="${EPREFIX}"/usr \
|
||||
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
|
||||
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
b update-for-install
|
||||
use test && b update-for-test
|
||||
}
|
||||
|
||||
src_test() {
|
||||
b test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
b install \
|
||||
config.install.chroot="${D}"
|
||||
}
|
||||
@ -1,2 +1,4 @@
|
||||
DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
|
||||
DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c SHA512 d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
|
||||
DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb SHA512 0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
|
||||
DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941 SHA512 68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 2020-06-10 19:25:37.000000000 +1000
|
||||
+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000
|
||||
@@ -5,6 +5,35 @@
|
||||
|
||||
#include <libbuild2/script/regex.hxx>
|
||||
|
||||
+#if defined(_LIBCPP_VERSION)
|
||||
+template <>
|
||||
+void
|
||||
+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state& __s) const
|
||||
+{
|
||||
+ if (__s.__current_ != __s.__last_)
|
||||
+ {
|
||||
+ switch (*__s.__current_)
|
||||
+ {
|
||||
+ case '\r':
|
||||
+ case '\n':
|
||||
+ __s.__do_ = __state::__reject;
|
||||
+ __s.__node_ = nullptr;
|
||||
+ break;
|
||||
+ default:
|
||||
+ __s.__do_ = __state::__accept_and_consume;
|
||||
+ ++__s.__current_;
|
||||
+ __s.__node_ = this->first();
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ __s.__do_ = __state::__reject;
|
||||
+ __s.__node_ = nullptr;
|
||||
+ }
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
namespace build2
|
||||
@ -0,0 +1,111 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
|
||||
|
||||
BUILD2_PN=build2-toolchain
|
||||
BUILD2_PV="0.14.0"
|
||||
BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
|
||||
|
||||
inherit toolchain-funcs multiprocessing
|
||||
SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
|
||||
https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
DESCRIPTION="Common ODB runtime library"
|
||||
HOMEPAGE="https://codesynthesis.com/products/odb/"
|
||||
|
||||
LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
RDEPEND="${DEPEND}
|
||||
!<dev-util/build2-0.14.0
|
||||
"
|
||||
|
||||
BS="${WORKDIR}/${BUILD2_P}"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
b() {
|
||||
local myargs=(
|
||||
--jobs $(makeopts_jobs)
|
||||
--verbose 3
|
||||
)
|
||||
export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
|
||||
set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
|
||||
echo "${@}"
|
||||
"${@}" || die "${@} failed"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
pushd "${BS}" || die
|
||||
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
|
||||
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
|
||||
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
|
||||
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
|
||||
libodb-sqlite/buildfile \
|
||||
|| die
|
||||
sed \
|
||||
-e 's:libsqlite3[/]\?::' \
|
||||
-i buildfile build/bootstrap.build \
|
||||
|| die
|
||||
|
||||
if has_version dev-util/pkgconf; then
|
||||
for i in build2/build2/buildfile build2/libbuild2/buildfile; do
|
||||
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
|
||||
"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
|
||||
"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
|
||||
"${i}" \
|
||||
|| die
|
||||
done
|
||||
sed \
|
||||
-e 's:libpkgconf[/]\?::' \
|
||||
-i buildfile build/bootstrap.build \
|
||||
|| die
|
||||
fi
|
||||
popd || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
pushd "${BS}" || die
|
||||
emake -C build2 -f bootstrap.gmake \
|
||||
CXX=$(tc-getCXX) \
|
||||
CXXFLAGS="${CXXFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}"
|
||||
popd || die
|
||||
|
||||
b configure \
|
||||
config.cxx="$(tc-getCXX)" \
|
||||
config.cxx.coptions="${CXXFLAGS}" \
|
||||
config.cxx.loptions="${LDFLAGS}" \
|
||||
config.c="$(tc-getCC)" \
|
||||
config.cc.coptions="${CFLAGS}" \
|
||||
config.cc.loptions="${LDFLAGS}" \
|
||||
config.bin.ar="$(tc-getAR)" \
|
||||
config.bin.ranlib="$(tc-getRANLIB)" \
|
||||
config.bin.lib=shared \
|
||||
config.install.root="${EPREFIX}"/usr \
|
||||
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
|
||||
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
b update-for-install
|
||||
use test && b update-for-test
|
||||
}
|
||||
|
||||
src_test() {
|
||||
b test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
b install \
|
||||
config.install.chroot="${D}"
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,7 @@
|
||||
DIST citus-10.0.6.tar.gz 5186554 BLAKE2B b7f4c46cf202bcc1a0d62d797056d5dbee625c4d00f6c0507e95201698bd9d0eceddaf2dd524e0a954a75013fcfb5f42531975ae157d1aa015a27f8adc8d9f25 SHA512 2a839eb2cc907a8294b974ec4f698042546e84757d209ce5e7c52d122f3f2af5036b3a1147d26b50170192649a19cf38d3c2bccfa445e213f604bb21ef84d478
|
||||
DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff8d40e48d4751799d4268618afe9b7dcd72bfbd5b01dc073f6f4af55e8dc338071e3be224d15ded423885bbebd SHA512 2ad9665c5de3214a5ebc08d5df663caa634912dd9db433a43bea96d3932213786d1650a695531a4d00ab8dff7d53078848466d7a6e803bff3ab26f4df3990c91
|
||||
DIST citus-10.1.4.tar.gz 5283715 BLAKE2B e19b35734b32541678538b963f1c03a259fa404f373b759a4c08e867325e106689ff711a5db9ba9231e1f9b42e303a49e6d58c8fb18b5ab7d75e19aea4741a0e SHA512 36a19b30d63ea53a8be6a77946d54558f7fd92f2e91b356395f9273e907f24444500c31d77e9693186fc2bd8df7c7e5f62a11ddfbc8795fbde8d700ebe7a9e76
|
||||
DIST citus-10.2.3.tar.gz 5531853 BLAKE2B ed8804f699203ab3e9e6f7f03213b38e3477cdb989338dcc364e079c830bcbcb05d3fbbfa5507a306a9433ec0aa783f150cb0c8ea038265efc40f7a37fd33410 SHA512 544d47093878c4ba02502f52dd4ac23cecd67c75635d825ad43f24ef19aa5de97b1d34e1e4e86f2f23028de363cb4979244ea3639caa8f142891d247d0187322
|
||||
DIST citus-10.2.4.tar.gz 5535944 BLAKE2B 3820622ec7f60aad5989536fe6dd53b8db75c51dc31ae3a0d023058afaa369f2de29fe49369d7846ad3bd17242fb6ce7784f2832263ba79ca045c75e558e14d7 SHA512 f9d6853333984c23b3f6aaeec156719c8564958e4d446781506f95fd56e48b8df27f1ddfa1cddb085791dccd6a17c07f3df87d84a89e137ba5a6972a656222f2
|
||||
DIST citus-10.2.5.tar.gz 5538309 BLAKE2B c8e06b356728a68a948ffd3dd6d3c56c2972ad094922ce03e049999c450cac0c62ebe45f4ecc489d2cb521530b9f1bf566ac9732227646247a7eebd03f3f88cb SHA512 95ee1225c850bc986025f6960cb5784b02f2ac5af8f312f5dd4a270c4ebf46dd60388ba604a9cd4cf2e22f8b7a855bd18654cbe9f701ba7cd35c1576414d185f
|
||||
DIST citus-11.0.0_beta0.tar.gz 5785689 BLAKE2B 249a396ec8171d12ae33234e5044d2ee75a2f3bf41bddfc528609fadc23b8d7da20049a8a2aaf3841db08f5343ccdf6f4206377bcfa4c1f2466c1b6677e398c0 SHA512 7dc15db0126b809c6dfb80e62a16b9009a248e4fefb0bd8a55b9b3d860426644238970cc2bdf4b27c0a09c30acb2ecf19d07b5ffcafb65d6da1215482876a2ba
|
||||
DIST citus-9.5.10.tar.gz 4744848 BLAKE2B e6d9595fe30cb93508007cb4f39933ae57b6f0f1c5ee084ac83b0f5edea0d32dc0e8fd71737e396eb9b77fd5601ae647e29dea5b13e2e7a53a59f96365773466 SHA512 24683c7607de115d1d7fc355b56ff732e5e5f2adcdbebac7ee0d71b8878de3f335f3824be9e02ae9554850c68d7e21bc6d95d581e02ba4fef9da27b2f67f2987
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
POSTGRES_COMPAT=( 13 14 )
|
||||
|
||||
inherit postgres-multi
|
||||
|
||||
DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
|
||||
HOMEPAGE="https://www.citusdata.com/"
|
||||
|
||||
MY_PV="${PV/beta0/beta}"
|
||||
SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
IUSE=""
|
||||
LICENSE="POSTGRESQL AGPL-3"
|
||||
|
||||
KEYWORDS=""
|
||||
|
||||
SLOT=0
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="${POSTGRES_DEP}
|
||||
app-arch/lz4
|
||||
app-arch/zstd
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
postgres-multi_foreach econf
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
https://github.com/mariadb-corporation/mariadb-connector-c/pull/158
|
||||
|
||||
--- a/cmake/ConnectorName.cmake
|
||||
+++ b/cmake/ConnectorName.cmake
|
||||
@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
SET(MACHINE_NAME "x64")
|
||||
ELSE()
|
||||
SET(MACHINE_NAME "32")
|
||||
- END()
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
|
||||
SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST pgAgent-4.0.0-Source.tar.gz 63561 BLAKE2B 1731e748a6a5e76cd8b177162eb5b82ae633d1b507739e3193a8857a0eee0fe775fdaadb871eb5d708c0f7e80558680b5d7d246f4cb5d2bc1c10955bdf9cc09e SHA512 df2d6f5817d83d4cf60f0f1106718225870bcfd2f5b882765e5fd459e1614208225f90b29de492bec5284f3727f3d4be9f724b92ef503fea08029fab22a8fbb4
|
||||
DIST pgAgent-4.2.1-Source.tar.gz 65583 BLAKE2B ee75803475dfbb751f1a81da5c3a6bec82aee80e9ce7d0413f94395069b5c0cbb6ff8770083078ce0e3a571a4c1b6d2e6adf6af8f0bfa9e8adfc862fff38d0d3 SHA512 778ca020ec23b3d042760cdcf84d3c2da8da48c8a648a9999812c2e79edfcc8912ab23cc1a1c29f379d6a56960cdd876164397b8fe6b21dd386a917a80eaa71c
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 5b79460bdda286ca988b39e93e446176e8a781d1 Mon Sep 17 00:00:00 2001
|
||||
From: Neel Patel <neel.patel@enterprisedb.com>
|
||||
Date: Fri, 20 Jul 2018 13:35:35 +0100
|
||||
Subject: [PATCH] Link with pthreads on non-Windows and non-macOS platforms.
|
||||
|
||||
Patch based on feedback and initial work by Christoph Berg.
|
||||
---
|
||||
CMakeLists.txt | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1be24da..6f1eaa0 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -134,9 +134,15 @@ IF(WIN32)
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_EXECUTABLE(pgagent ${_srcs})
|
||||
+IF(UNIX AND NOT APPLE)
|
||||
+TARGET_LINK_LIBRARIES(
|
||||
+ pgagent ${PG_LIBRARIES} ${Boost_LIBRARIES} -pthread
|
||||
+)
|
||||
+ELSE()
|
||||
TARGET_LINK_LIBRARIES(
|
||||
pgagent ${PG_LIBRARIES} ${Boost_LIBRARIES}
|
||||
)
|
||||
+ENDIF()
|
||||
|
||||
# Installation
|
||||
IF (WIN32)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
CMAKE_IN_SOURCE_BUILD=1
|
||||
|
||||
inherit cmake-utils user
|
||||
|
||||
MY_PN=${PN/a/A}
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
|
||||
HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
|
||||
SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/${MY_PN}-${PV}-Source.tar.gz"
|
||||
|
||||
LICENSE="POSTGRESQL GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="dev-db/postgresql:*
|
||||
dev-libs/boost
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}-Source"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/pgagent-4.0.0-pthreads-linking.patch )
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
sed -e "s:share):share/${P}):" \
|
||||
-i CMakeLists.txt || die "failed to patch CMakeLists.txt"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
mycmakeargs=( "-DSTATIC_BUILD:BOOLEAN=FALSE"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
newinitd "${FILESDIR}/pgagent.initd-r1" "${PN}"
|
||||
newconfd "${FILESDIR}/pgagent.confd" "${PN}"
|
||||
|
||||
rm "${ED}"/usr/{LICENSE,README} || die "failed to remove useless docs"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# This user needs a real shell, and the daemon will use the
|
||||
# ~/.pgpass file from its home directory.
|
||||
enewuser pgagent -1 /bin/bash /home/pgagent
|
||||
}
|
||||
Binary file not shown.
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# doc USE flag is not in IUSE as the docs does not compile because of errors
|
||||
JAVA_PKG_IUSE="examples source test"
|
||||
MAVEN_ID="cglib:cglib:3.3.0"
|
||||
JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
MY_PV=RELEASE_${PV//./_}
|
||||
MY_P=cglib-${MY_PV}
|
||||
|
||||
DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
|
||||
HOMEPAGE="https://github.com/cglib/cglib"
|
||||
SRC_URI="https://github.com/cglib/cglib/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
|
||||
|
||||
CDEPEND="dev-java/ant-core:0
|
||||
dev-java/asm:9
|
||||
"
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.8:*
|
||||
${CDEPEND}
|
||||
"
|
||||
RDEPEND="
|
||||
>=virtual/jre-1.8:*
|
||||
${CDEPEND}
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
|
||||
JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
|
||||
JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
|
||||
JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
|
||||
JAVA_TEST_EXCLUDES=(
|
||||
"net.sf.cglib.CodeGenTestCase" # not a test class
|
||||
"net.sf.cglib.TestAll"
|
||||
"net.sf.cglib.TestGenerator" # not a test class
|
||||
"net.sf.cglib.proxy.TestEnhancer" # broken tests
|
||||
"net.sf.cglib.proxy.TestInterceptor" # not a test class
|
||||
"net.sf.cglib.reflect.TestFastClass" # broken tests
|
||||
)
|
||||
|
||||
src_install() {
|
||||
java-pkg-simple_src_install
|
||||
|
||||
use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
|
||||
}
|
||||
Binary file not shown.
@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit elisp-common java-pkg-opt-2 systemd wxwidgets
|
||||
|
||||
# NOTE: If you need symlinks for binaries please tell maintainers or
|
||||
# open up a bug to let it be created.
|
||||
|
||||
UPSTREAM_V="$(ver_cut 1-2)"
|
||||
|
||||
DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
|
||||
HOMEPAGE="https://www.erlang.org/"
|
||||
SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
|
||||
http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
|
||||
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
# We use this subslot because Compiled HiPE Code can be loaded on the exact
|
||||
# same build of ERTS that was used when compiling the code. See
|
||||
# http://erlang.org/doc/system_principles/misc.html for more information.
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
|
||||
|
||||
RDEPEND="
|
||||
acct-group/epmd
|
||||
acct-user/epmd
|
||||
sys-libs/ncurses:0
|
||||
sys-libs/zlib
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
java? ( >=virtual/jdk-1.8:* )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
sctp? ( net-misc/lksctp-tools )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7d:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
"
|
||||
|
||||
S="${WORKDIR}/otp-OTP-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/18.2.1-wx3.0.patch
|
||||
"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
|
||||
)
|
||||
|
||||
SITEFILE=50"${PN}"-gentoo.el
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
./otp_build autoconf || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use wxwidgets && setup-wxwidgets
|
||||
|
||||
local myconf=(
|
||||
--disable-builtin-zlib
|
||||
$(use_enable hipe)
|
||||
$(use_enable kpoll kernel-poll)
|
||||
$(use_with java javac)
|
||||
$(use_enable sctp)
|
||||
$(use_with ssl ssl "${EPREFIX}"/usr)
|
||||
$(use_enable ssl dynamic-ssl-lib)
|
||||
$(use_enable systemd)
|
||||
$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use emacs ; then
|
||||
pushd lib/tools/emacs &>/dev/null || die
|
||||
elisp-compile *.el
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
extract_version() {
|
||||
local path="$1"
|
||||
local var_name="$2"
|
||||
sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local erl_libdir_rel="$(get_libdir)/erlang"
|
||||
local erl_libdir="/usr/${erl_libdir_rel}"
|
||||
local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
|
||||
local erl_erts_ver="$(extract_version erts VSN)"
|
||||
local my_manpath="/usr/share/${PN}/man"
|
||||
|
||||
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
|
||||
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
|
||||
|
||||
emake INSTALL_PREFIX="${D}" install
|
||||
|
||||
if use doc ; then
|
||||
# Note: we explicitly install docs into:
|
||||
# /usr/share/doc/${PF}/{doc,lib,erts-*}
|
||||
# To maintain that layout we gather everything in 'html-docs'.
|
||||
# See bug #684376.
|
||||
mkdir html-docs || die
|
||||
mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
|
||||
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
|
||||
docompress -x /usr/share/doc/${PF}
|
||||
else
|
||||
local DOCS=("README.md")
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
|
||||
dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
|
||||
dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
|
||||
dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
|
||||
dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
|
||||
dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
|
||||
|
||||
## Clean up the no longer needed files
|
||||
rm "${ED}/${erl_libdir}/Install" || die
|
||||
|
||||
insinto "${my_manpath}"
|
||||
doins -r "${WORKDIR}"/man/*
|
||||
# extend MANPATH, so the normal man command can find it
|
||||
# see bug 189639
|
||||
newenvd - "90erlang" <<-_EOF_
|
||||
MANPATH="${my_manpath}"
|
||||
_EOF_
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install erlang lib/tools/emacs/*.{el,elc}
|
||||
sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
|
||||
"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
|
||||
elisp-site-file-install "${T}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/epmd.init-r2 epmd
|
||||
newconfd "${FILESDIR}"/epmd.confd-r2 epmd
|
||||
use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,162 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
|
||||
|
||||
# NOTE: If you need symlinks for binaries please tell maintainers or
|
||||
# open up a bug to let it be created.
|
||||
|
||||
UPSTREAM_V="$(ver_cut 1-2)"
|
||||
|
||||
DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
|
||||
HOMEPAGE="https://www.erlang.org/"
|
||||
SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
|
||||
http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
|
||||
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
# We use this subslot because Compiled HiPE Code can be loaded on the exact
|
||||
# same build of ERTS that was used when compiling the code. See
|
||||
# http://erlang.org/doc/system_principles/misc.html for more information.
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
|
||||
|
||||
RDEPEND="
|
||||
acct-group/epmd
|
||||
acct-user/epmd
|
||||
sys-libs/ncurses:0
|
||||
sys-libs/zlib
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
java? ( >=virtual/jdk-1.8:* )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
sctp? ( net-misc/lksctp-tools )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7d:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
"
|
||||
|
||||
S="${WORKDIR}/otp-OTP-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
|
||||
"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
|
||||
)
|
||||
|
||||
SITEFILE=50"${PN}"-gentoo.el
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
tc-export AR CPP CXX LD
|
||||
|
||||
# bug #797886: erlang's VM does unsafe casts for ints
|
||||
# to pointers and back. This breaks on gcc-11 -flto.
|
||||
append-flags -fno-strict-aliasing
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use wxwidgets && setup-wxwidgets
|
||||
|
||||
local myconf=(
|
||||
--disable-builtin-zlib
|
||||
|
||||
# don't search for static zlib
|
||||
--with-ssl-zlib=no
|
||||
|
||||
$(use_enable kpoll kernel-poll)
|
||||
$(use_with java javac)
|
||||
$(use_enable sctp)
|
||||
$(use_with ssl ssl)
|
||||
$(use_enable ssl dynamic-ssl-lib)
|
||||
$(use_enable systemd)
|
||||
$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use emacs ; then
|
||||
pushd lib/tools/emacs &>/dev/null || die
|
||||
elisp-compile *.el
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
extract_version() {
|
||||
local path="$1"
|
||||
local var_name="$2"
|
||||
sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local erl_libdir_rel="$(get_libdir)/erlang"
|
||||
local erl_libdir="/usr/${erl_libdir_rel}"
|
||||
local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
|
||||
local erl_erts_ver="$(extract_version erts VSN)"
|
||||
local my_manpath="/usr/share/${PN}/man"
|
||||
|
||||
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
|
||||
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
|
||||
|
||||
emake INSTALL_PREFIX="${D}" install
|
||||
|
||||
if use doc ; then
|
||||
# Note: we explicitly install docs into:
|
||||
# /usr/share/doc/${PF}/{doc,lib,erts-*}
|
||||
# To maintain that layout we gather everything in 'html-docs'.
|
||||
# See bug #684376.
|
||||
mkdir html-docs || die
|
||||
mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
|
||||
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
|
||||
docompress -x /usr/share/doc/${PF}
|
||||
else
|
||||
local DOCS=("README.md")
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
|
||||
dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
|
||||
dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
|
||||
dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
|
||||
dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
|
||||
dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
|
||||
|
||||
## Clean up the no longer needed files
|
||||
rm "${ED}/${erl_libdir}/Install" || die
|
||||
|
||||
insinto "${my_manpath}"
|
||||
doins -r "${WORKDIR}"/man/*
|
||||
# extend MANPATH, so the normal man command can find it
|
||||
# see bug 189639
|
||||
newenvd - "90erlang" <<-_EOF_
|
||||
MANPATH="${my_manpath}"
|
||||
_EOF_
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install erlang lib/tools/emacs/*.{el,elc}
|
||||
sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
|
||||
"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
|
||||
elisp-site-file-install "${T}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/epmd.init-r2 epmd
|
||||
newconfd "${FILESDIR}"/epmd.confd-r2 epmd
|
||||
use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue