root
9 years ago
parent
2b60de1169
commit
e4ec7f3d15
@ -0,0 +1,97 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit eutils systemd unpacker user
|
||||
|
||||
DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
|
||||
HOMEPAGE="https://puppetlabs.com/"
|
||||
SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_BASE}_amd64.deb )
|
||||
x86? ( ${SRC_BASE}_i386.deb )
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="puppetdb selinux"
|
||||
RESTRICT="strip"
|
||||
|
||||
CDEPEND="!app-admin/augeas
|
||||
!app-admin/mcollective
|
||||
!app-admin/puppet
|
||||
!dev-ruby/hiera
|
||||
!dev-ruby/facter
|
||||
!app-emulation/virt-what"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}"
|
||||
RDEPEND="${CDEPEND}
|
||||
sys-apps/dmidecode
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
QA_PREBUILT="
|
||||
/opt/puppetlabs/puppet
|
||||
/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
|
||||
/opt/puppetlabs/puppet/lib/engines/*
|
||||
/opt/puppetlabs/puppet/lib/virt-what/*
|
||||
/opt/puppetlabs/puppet/bin/*"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/run/puppet puppet
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# conf.d
|
||||
doconfd etc/default/puppet
|
||||
doconfd etc/default/mcollective
|
||||
# logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
doins etc/logrotate.d/mcollective
|
||||
# puppet itself
|
||||
insinto /etc/puppetlabs
|
||||
doins -r etc/puppetlabs/*
|
||||
# logdir for systemd
|
||||
dodir var/log/puppetlabs/puppet/
|
||||
fperms 0750 var/log/puppetlabs/puppet/
|
||||
# the rest
|
||||
insinto /opt
|
||||
dodir opt/puppetlabs/puppet/cache
|
||||
doins -r opt/*
|
||||
fperms 0750 /opt/puppetlabs/puppet/cache
|
||||
# init
|
||||
newinitd "${FILESDIR}/puppet.initd" puppet
|
||||
newinitd "${FILESDIR}/mcollective.initd" mcollective
|
||||
systemd_dounit "${FILESDIR}/puppet.service"
|
||||
systemd_dounit "${FILESDIR}/mcollective.service"
|
||||
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
|
||||
# symlinks
|
||||
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
|
||||
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
|
||||
dosym /opt/puppetlabs/bin/facter /usr/bin/facter
|
||||
dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
|
||||
dosym /opt/puppetlabs/bin/mco /usr/bin/mco
|
||||
dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
|
||||
dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
|
||||
dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
|
||||
dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
|
||||
dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
|
||||
dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b
|
||||
DIST salt-2015.5.7.tar.gz 5733060 SHA256 132feb4a067470a85a73942a125b2435612ca6798e88de3e4d413e8ac09a850e SHA512 ee552f82b2ffbe5eed608336a6ae6b60515f4ddb1cc5ea5d726f450f60b88f95874ac2686b5eaa39def41a73c447e949a5ee79c3816c5ee1265fca591a5a05a0 WHIRLPOOL eed3c57c43e28df89eddb4c7ff59ed2ddfe39dacb81f7aace9e7a5324a4bc5e399628e4809d4b82a8eb24aafd90847f29a916c06dd74ea777d3dd582119d84af
|
||||
DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0
|
||||
DIST salt-2015.8.2.tar.gz 6724537 SHA256 075ab604cff3acc222904d9299ab6a1f86715bd11b043fd931e1cfe386221d27 SHA512 386d3fa36e4e6aaec069148b16d70c601ac1a805044b28630a671a12a45d813a80e058bba45ee664cce3010ef094c5e48736a50b7ba19c7ea2eb0f828bbf0706 WHIRLPOOL b7ad1ddfdfff1e4c679203be831e96b17c4ded3f3aa1ffc705501ff6bf2ef0256a514db90132d64abe554cd643c5f9065cb0ee202034157d8c55947744de4f39
|
||||
DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
|
||||
index 615e6b5..fbd24aa 100644
|
||||
--- a/tests/unit/modules/qemu_nbd_test.py
|
||||
+++ b/tests/unit/modules/qemu_nbd_test.py
|
||||
@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
|
||||
Test if it mount the named image via qemu-nbd
|
||||
and return the mounted roots
|
||||
'''
|
||||
+ tmpdir = os.environ.get('TMPDIR', '/tmp')
|
||||
mock = MagicMock(return_value=True)
|
||||
with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
|
||||
self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
|
||||
@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
|
||||
'mount.mount': mock,
|
||||
'cmd.retcode': MagicMock(side_effect=[1, 0])}):
|
||||
self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
|
||||
- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
|
||||
+ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
|
||||
|
||||
# 'clear' function tests: 1
|
||||
|
||||
diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
|
||||
index 63e4a53..20b196f 100644
|
||||
--- a/tests/unit/states/archive_test.py
|
||||
+++ b/tests/unit/states/archive_test.py
|
||||
@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui
|
||||
|
||||
# Globals
|
||||
archive.__salt__ = {}
|
||||
-archive.__opts__ = {"cachedir": "/tmp", "test": False}
|
||||
+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
|
||||
archive.__env__ = 'test'
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase):
|
||||
'cmd.run_all': mock_run}):
|
||||
filename = os.path.join(
|
||||
tmp_dir,
|
||||
- 'files/test/_tmp_test_archive_.tar'
|
||||
+ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
|
||||
)
|
||||
for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
|
||||
ret = archive.extracted(tmp_dir,
|
||||
diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
|
||||
index 71e4330..d6f3f30 100644
|
||||
--- a/tests/unit/utils/context_test.py
|
||||
+++ b/tests/unit/utils/context_test.py
|
||||
@@ -18,7 +18,7 @@ import salt.payload
|
||||
import salt.utils
|
||||
|
||||
__context__ = {'a': 'b'}
|
||||
-__opts__ = {'cachedir': '/tmp'}
|
||||
+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
|
||||
|
||||
|
||||
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
||||
@ -0,0 +1,117 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=(python2_7)
|
||||
|
||||
inherit eutils systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="http://saltstack.org/"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
|
||||
IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
|
||||
|
||||
RDEPEND="sys-apps/pciutils
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.3[${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}]
|
||||
>=www-servers/tornado-4.0[${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? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
|
||||
openssl? (
|
||||
dev-libs/openssl:*[-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}]
|
||||
)
|
||||
zeromq? (
|
||||
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
|
||||
dev-python/pycrypto[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
|
||||
nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
|
||||
neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/virtualenv[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/timelib[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
)"
|
||||
|
||||
DOCS=(README.rst AUTHORS)
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare() {
|
||||
# this test fails because it trys to "pip install distribute"
|
||||
rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
|
||||
|| die "Failed to remove broken tests"
|
||||
}
|
||||
|
||||
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-4 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072
|
||||
|
||||
# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
|
||||
USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose || die "testing failed"
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=(python2_7)
|
||||
|
||||
inherit eutils systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="http://saltstack.org/"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
|
||||
IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
|
||||
|
||||
RDEPEND="sys-apps/pciutils
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.3[${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}]
|
||||
>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
|
||||
virtual/python-futures[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
|
||||
libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
|
||||
openssl? (
|
||||
dev-libs/openssl:*[-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}]
|
||||
)
|
||||
zeromq? (
|
||||
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
|
||||
nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
|
||||
neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/virtualenv[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/timelib[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
)"
|
||||
|
||||
DOCS=(README.rst AUTHORS)
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch"
|
||||
"${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
|
||||
"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
|
||||
)
|
||||
|
||||
python_prepare() {
|
||||
# this test fails because it trys to "pip install distribute"
|
||||
rm tests/unit/{modules,states}/zcbuildout_test.py \
|
||||
tests/unit/modules/{rh_ip,win_network,random_org}_test.py
|
||||
}
|
||||
|
||||
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-4 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
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -dup /tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}"; }
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
|
||||
|
||||
USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose
|
||||
|
||||
) || die "testing failed"
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
inherit cmake-utils eutils
|
||||
|
||||
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
|
||||
HOMEPAGE="http://cdrkit.org"
|
||||
SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="debug hfs unicode"
|
||||
|
||||
RDEPEND="app-arch/bzip2
|
||||
!app-cdr/cdrtools
|
||||
media-sound/cdparanoia
|
||||
sys-apps/file
|
||||
sys-libs/zlib
|
||||
unicode? ( virtual/libiconv )
|
||||
kernel_linux? ( sys-libs/libcap )"
|
||||
DEPEND="${RDEPEND}
|
||||
hfs? ( sys-apps/file )"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-paranoiacdda.patch \
|
||||
"${FILESDIR}"/${P}-cmakewarn.patch
|
||||
|
||||
echo '.so wodim.1' > ${T}/cdrecord.1
|
||||
echo '.so genisoimage.1' > ${T}/mkisofs.1
|
||||
echo '.so icedax.1' > ${T}/cdda2wav.1
|
||||
echo '.so readom.1' > ${T}/readcd.1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
dosym wodim /usr/bin/cdrecord
|
||||
dosym genisoimage /usr/bin/mkisofs
|
||||
dosym icedax /usr/bin/cdda2wav
|
||||
dosym readom /usr/bin/readcd
|
||||
|
||||
dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
|
||||
|
||||
local x
|
||||
for x in genisoimage plattforms wodim icedax; do
|
||||
docinto ${x}
|
||||
dodoc doc/${x}/*
|
||||
done
|
||||
|
||||
insinto /etc
|
||||
newins wodim/wodim.dfl wodim.conf
|
||||
newins netscsid/netscsid.dfl netscsid.conf
|
||||
|
||||
insinto /usr/include/scsilib
|
||||
doins include/*.h
|
||||
insinto /usr/include/scsilib/usal
|
||||
doins include/usal/*.h
|
||||
dosym usal /usr/include/scsilib/scg
|
||||
|
||||
doman "${T}"/*.1
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=3
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
|
||||
HOMEPAGE="http://cdrkit.org"
|
||||
SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
|
||||
IUSE="debug hfs unicode"
|
||||
|
||||
RDEPEND="app-arch/bzip2
|
||||
!app-cdr/cdrtools
|
||||
sys-apps/file
|
||||
sys-libs/zlib
|
||||
unicode? ( virtual/libiconv )
|
||||
kernel_linux? ( sys-libs/libcap )"
|
||||
DEPEND="${RDEPEND}
|
||||
hfs? ( sys-apps/file )"
|
||||
|
||||
src_prepare() {
|
||||
echo '.so wodim.1' > ${T}/cdrecord.1
|
||||
echo '.so genisoimage.1' > ${T}/mkisofs.1
|
||||
echo '.so icedax.1' > ${T}/cdda2wav.1
|
||||
echo '.so readom.1' > ${T}/readcd.1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
dosym wodim /usr/bin/cdrecord || die
|
||||
dosym genisoimage /usr/bin/mkisofs || die
|
||||
dosym icedax /usr/bin/cdda2wav || die
|
||||
dosym readom /usr/bin/readcd || die
|
||||
|
||||
dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
|
||||
|
||||
local x
|
||||
for x in genisoimage plattforms wodim icedax; do
|
||||
docinto ${x}
|
||||
dodoc doc/${x}/*
|
||||
done
|
||||
|
||||
insinto /etc
|
||||
newins wodim/wodim.dfl wodim.conf || die
|
||||
newins netscsid/netscsid.dfl netscsid.conf || die
|
||||
|
||||
insinto /usr/include/scsilib
|
||||
doins include/*.h || die
|
||||
insinto /usr/include/scsilib/usal
|
||||
doins include/usal/*.h || die
|
||||
dosym usal /usr/include/scsilib/scg || die
|
||||
|
||||
doman "${T}"/*.1
|
||||
}
|
||||
@ -1,554 +0,0 @@
|
||||
http://bugs.gentoo.org/206939
|
||||
|
||||
http://pkgs.fedoraproject.org/cgit/cdrkit.git/tree/cdrkit-1.1.11-paranoiacdda.patch modified because
|
||||
we install headers to $includedir instead of $includedir/cdda
|
||||
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -1,3 +1,3 @@
|
||||
PROJECT (cdrkit C)
|
||||
-SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
|
||||
+SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
|
||||
|
||||
--- icedax/CMakeLists.txt
|
||||
+++ icedax/CMakeLists.txt
|
||||
@@ -1,8 +1,9 @@
|
||||
PROJECT (icedax C)
|
||||
-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
|
||||
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
|
||||
include(../include/AddScgBits.cmake)
|
||||
include(../include/AddSchilyBits.cmake)
|
||||
include(../include/AddNetworkBits.cmake)
|
||||
+INCLUDE (CheckLibraryExists)
|
||||
|
||||
FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
|
||||
IF(HAVE_SYS_SOUNDCARD_H)
|
||||
@@ -18,12 +19,20 @@ IF(HAVE_LIBOSSAUDIO)
|
||||
LIST(APPEND EXTRA_LIBS "ossaudio")
|
||||
ENDIF(HAVE_LIBOSSAUDIO)
|
||||
|
||||
-LIST(APPEND EXTRA_LIBS paranoia)
|
||||
+CHECK_INCLUDE_FILES(cdda_interface.h HAVE_CDDA_INTERFACE_H)
|
||||
+CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
|
||||
+IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
||||
+ LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
|
||||
+ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
||||
+ MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
|
||||
+ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
|
||||
+
|
||||
+LIST(APPEND EXTRA_LIBS)
|
||||
IF (WIN32)
|
||||
LIST(APPEND EXTRA_LIBS winmm)
|
||||
ENDIF (WIN32)
|
||||
|
||||
-LINK_DIRECTORIES(../librols ../libusal ../libparanoia)
|
||||
+LINK_DIRECTORIES(../librols ../libusal)
|
||||
ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
|
||||
TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
|
||||
SET_TARGET_PROPERTIES(icedax PROPERTIES SKIP_BUILD_RPATH TRUE)
|
||||
--- icedax/global.h
|
||||
+++ icedax/global.h
|
||||
@@ -17,7 +17,8 @@
|
||||
#include "md5.h"
|
||||
#endif
|
||||
#ifdef USE_PARANOIA
|
||||
-#include "cdda_paranoia.h"
|
||||
+#include <cdda_interface.h>
|
||||
+#include <cdda_paranoia.h>
|
||||
#endif
|
||||
|
||||
typedef struct index_list
|
||||
@@ -102,10 +103,10 @@ typedef struct global
|
||||
|
||||
struct paranoia_parms_t
|
||||
{
|
||||
- Ucbit disable_paranoia:1;
|
||||
- Ucbit disable_extra_paranoia:1;
|
||||
- Ucbit disable_scratch_detect:1;
|
||||
- Ucbit disable_scratch_repair:1;
|
||||
+ char disable_paranoia:1;
|
||||
+ char disable_extra_paranoia:1;
|
||||
+ char disable_scratch_detect:1;
|
||||
+ char disable_scratch_repair:1;
|
||||
int retries;
|
||||
int overlap;
|
||||
int mindynoverlap;
|
||||
--- icedax/icedax.c
|
||||
+++ icedax/icedax.c
|
||||
@@ -120,6 +120,10 @@
|
||||
#ifdef USE_LAME
|
||||
#include "mp3.h" /* mp3 file handling */
|
||||
#endif
|
||||
+#ifdef USE_PARANOIA
|
||||
+#include <cdda_interface.h>
|
||||
+#include <cdda_paranoia.h>
|
||||
+#endif
|
||||
#include "interface.h" /* low level cdrom interfacing */
|
||||
#include "icedax.h"
|
||||
#include "resample.h"
|
||||
@@ -128,9 +132,6 @@
|
||||
#include "ringbuff.h"
|
||||
#include "global.h"
|
||||
#include "exitcodes.h"
|
||||
-#ifdef USE_PARANOIA
|
||||
-#include "cdda_paranoia.h"
|
||||
-#endif
|
||||
#include "defaults.h"
|
||||
|
||||
static void RestrictPlaybackRate(long newrate);
|
||||
@@ -800,7 +801,7 @@ static void init_globals()
|
||||
global.useroverlap = -1; /* amount of overlapping sectors user override */
|
||||
global.need_hostorder = 0; /* processing needs samples in host endianess */
|
||||
global.in_lendian = -1; /* input endianess from SetupSCSI() */
|
||||
- global.outputendianess = NONE; /* user specified output endianess */
|
||||
+ global.outputendianess = NONE_EN; /* user specified output endianess */
|
||||
global.findminmax = 0; /* flag find extrem amplitudes */
|
||||
#ifdef HAVE_LIMITS_H
|
||||
global.maxamp[0] = INT_MIN; /* maximum amplitude */
|
||||
@@ -2418,7 +2419,7 @@ Rate Divider Rate Divider
|
||||
if (bulk == -1) bulk = 0;
|
||||
|
||||
global.need_big_endian = global.audio_out->need_big_endian;
|
||||
- if (global.outputendianess != NONE)
|
||||
+ if (global.outputendianess != NONE_EN)
|
||||
global.need_big_endian = global.outputendianess == BIG;
|
||||
|
||||
if (global.no_file) global.fname_base[0] = '\0';
|
||||
@@ -2602,7 +2603,7 @@ Rate Divider Rate Divider
|
||||
fputs( ", soundcard", stderr );
|
||||
#endif
|
||||
#if defined USE_PARANOIA
|
||||
- fputs( ", libparanoia", stderr );
|
||||
+ fputs( ", libcdda_paranoia", stderr );
|
||||
#endif
|
||||
fputs( " support\n", stderr );
|
||||
}
|
||||
@@ -2892,8 +2893,28 @@ Rate Divider Rate Divider
|
||||
#ifdef USE_PARANOIA
|
||||
if (global.paranoia_selected) {
|
||||
long paranoia_mode;
|
||||
+ cdrom_drive *tmpdrive;
|
||||
+ usal_close(get_scsi_p());
|
||||
|
||||
- global.cdp = paranoia_init(get_scsi_p(), global.nsectors);
|
||||
+ tmpdrive = cdda_identify(global.dev_name, 0, NULL);
|
||||
+ if (!tmpdrive)
|
||||
+ {
|
||||
+ fputs("Can't identify disc\n", stderr);
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ if(global.nsectors)
|
||||
+ {
|
||||
+ tmpdrive->nsectors = global.nsectors;
|
||||
+ tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;
|
||||
+ }
|
||||
+ if (cdda_open(tmpdrive) != 0)
|
||||
+ {
|
||||
+ fputs("Can't open disc\n", stderr);
|
||||
+ cdda_close(tmpdrive);
|
||||
+ return 1;
|
||||
+ }
|
||||
+ global.cdp = paranoia_init(tmpdrive);
|
||||
|
||||
if (global.paranoia_parms.overlap >= 0) {
|
||||
int overlap = global.paranoia_parms.overlap;
|
||||
@@ -2902,17 +2923,7 @@ Rate Divider Rate Divider
|
||||
overlap = global.nsectors - 1;
|
||||
paranoia_overlapset(global.cdp, overlap);
|
||||
}
|
||||
- /*
|
||||
- * Default to a minimum of dynamic overlapping == 0.5 sectors.
|
||||
- * If we don't do this, we get the default from libparanoia
|
||||
- * which is approx. 0.1.
|
||||
- */
|
||||
- if (global.paranoia_parms.mindynoverlap < 0)
|
||||
- paranoia_dynoverlapset(global.cdp, CD_FRAMEWORDS/2, -1);
|
||||
- paranoia_dynoverlapset(global.cdp,
|
||||
- global.paranoia_parms.mindynoverlap * CD_FRAMEWORDS,
|
||||
- global.paranoia_parms.maxdynoverlap * CD_FRAMEWORDS);
|
||||
-
|
||||
+
|
||||
paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP;
|
||||
|
||||
if (global.paranoia_parms.disable_paranoia) {
|
||||
--- icedax/icedax.h
|
||||
+++ icedax/icedax.h
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
/* Endianess */
|
||||
#define GUESS (-2)
|
||||
-#define NONE (-1)
|
||||
+#define NONE_EN (-1)
|
||||
#define LITTLE 0
|
||||
#define BIG 1
|
||||
|
||||
--- icedax/interface.c
|
||||
+++ icedax/interface.c
|
||||
@@ -116,7 +116,7 @@ int (*Play_at)(SCSI *usalp, unsigned in
|
||||
int (*StopPlay)(SCSI *usalp);
|
||||
void (*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
|
||||
|
||||
-#if defined USE_PARANOIA
|
||||
+#if 0 //defined USE_PARANOIA
|
||||
long cdda_read(void *d, void *buffer, long beginsector, long sectors);
|
||||
|
||||
long cdda_read(void *d, void *buffer, long beginsector, long sectors)
|
||||
--- icedax/toc.c
|
||||
+++ icedax/toc.c
|
||||
@@ -379,8 +379,7 @@ static void emit_cddb_form(char *fname_b
|
||||
static void emit_cdindex_form(char *fname_baseval);
|
||||
#endif
|
||||
|
||||
-
|
||||
-typedef struct TOC { /* structure of table of contents (cdrom) */
|
||||
+typedef struct TOC_t { /* structure of table of contents (cdrom) */
|
||||
unsigned char reserved1;
|
||||
unsigned char bFlags;
|
||||
unsigned char bTrack;
|
||||
@@ -391,8 +390,7 @@ typedef struct TOC { /* structure of tab
|
||||
int frms;
|
||||
unsigned char ISRC[16];
|
||||
int SCMS;
|
||||
-} TOC;
|
||||
-
|
||||
+} TOC_t;
|
||||
|
||||
/* Flags contains two fields:
|
||||
bits 7-4 (ADR)
|
||||
@@ -432,7 +430,7 @@ struct iterator {
|
||||
int index;
|
||||
int startindex;
|
||||
void (*reset)(struct iterator *this);
|
||||
- struct TOC *(*getNextTrack)(struct iterator *this);
|
||||
+ struct TOC_t *(*getNextTrack)(struct iterator *this);
|
||||
int (*hasNextTrack)(struct iterator *this);
|
||||
};
|
||||
|
||||
@@ -518,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks)
|
||||
InitIterator(&i, 1);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
if (IS__AUDIO(p)) count_audio_tracks++;
|
||||
}
|
||||
|
||||
@@ -733,7 +731,7 @@ static void emit_cddb_form(char *fname_b
|
||||
fprintf( cddb_form, "# Track frame offsets:\n#\n");
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
if (GETTRACK(p) == CDROM_LEADOUT) break;
|
||||
fprintf( cddb_form,
|
||||
"# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p)));
|
||||
@@ -765,7 +763,7 @@ static void emit_cddb_form(char *fname_b
|
||||
|
||||
i.reset(&i);
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
int ii;
|
||||
|
||||
ii = GETTRACK(p);
|
||||
@@ -788,7 +786,7 @@ static void emit_cddb_form(char *fname_b
|
||||
|
||||
i.reset(&i);
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
int ii;
|
||||
|
||||
ii = GETTRACK(p);
|
||||
@@ -1495,7 +1493,7 @@ static int IsSingleArtist(void)
|
||||
InitIterator(&i, 1);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
int ii;
|
||||
|
||||
if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue;
|
||||
@@ -1681,7 +1679,7 @@ static void emit_cdindex_form(char *fnam
|
||||
global.creator ? ascii2html(global.creator) : "");
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
int ii = GETTRACK(p);
|
||||
|
||||
if (ii == CDROM_LEADOUT) break;
|
||||
@@ -1703,7 +1701,7 @@ static void emit_cdindex_form(char *fnam
|
||||
fprintf( cdindex_form, " <MultipleArtistCD>\n");
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
int ii = GETTRACK(p);
|
||||
|
||||
if (ii == CDROM_LEADOUT) break;
|
||||
@@ -1942,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned
|
||||
|
||||
if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0
|
||||
&& i.hasNextTrack(&i)) {
|
||||
- TOC *o = i.getNextTrack(&i);
|
||||
+ TOC_t *o = i.getNextTrack(&i);
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
int from;
|
||||
from = GETTRACK(o);
|
||||
|
||||
@@ -2072,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l
|
||||
count_audio_trks = 0;
|
||||
|
||||
if (i.hasNextTrack(&i)) {
|
||||
- TOC *o = i.getNextTrack(&i);
|
||||
+ TOC_t *o = i.getNextTrack(&i);
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
int from;
|
||||
from = GETTRACK(o);
|
||||
|
||||
@@ -2131,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l
|
||||
i.reset(&i);
|
||||
if ((global.verbose & SHOW_TOC) != 0 &&
|
||||
i.hasNextTrack(&i)) {
|
||||
- TOC *o = i.getNextTrack(&i);
|
||||
+ TOC_t *o = i.getNextTrack(&i);
|
||||
|
||||
for (; i.hasNextTrack(&i);) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
|
||||
if ( GETTRACK(o) <= MAXTRK ) {
|
||||
unsigned char brace1, brace2;
|
||||
@@ -2189,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l
|
||||
ii = 0;
|
||||
i.reset(&i);
|
||||
if (i.hasNextTrack(&i)) {
|
||||
- TOC *o = i.getNextTrack(&i);
|
||||
+ TOC_t *o = i.getNextTrack(&i);
|
||||
for ( ; i.hasNextTrack(&i);) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
fprintf ( stderr,
|
||||
" %2u.(%8u)",
|
||||
GETTRACK(o),
|
||||
@@ -2248,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l
|
||||
|
||||
i.reset(&i);
|
||||
for ( ; i.hasNextTrack(&i);) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
int jj = GETTRACK(p);
|
||||
|
||||
if ( global.tracktitle[jj] != NULL ) {
|
||||
@@ -2260,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l
|
||||
|
||||
i.reset(&i);
|
||||
for ( ; i.hasNextTrack(&i); ) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
int jj;
|
||||
|
||||
if (IS__DATA(p))
|
||||
@@ -2720,7 +2718,7 @@ void Read_MCN_ISRC(void)
|
||||
InitIterator(&i, 1);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
unsigned ii = GETTRACK(p);
|
||||
|
||||
if (ii == CDROM_LEADOUT) break;
|
||||
@@ -3155,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns
|
||||
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- struct TOC *p = i.getNextTrack(&i);
|
||||
+ struct TOC_t *p = i.getNextTrack(&i);
|
||||
unsigned ii = GETTRACK(p);
|
||||
|
||||
if ( ii < starttrack || IS__DATA(p) )
|
||||
@@ -3322,7 +3320,7 @@ unsigned char *Get_MCN(void)
|
||||
}
|
||||
|
||||
|
||||
-static TOC g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
|
||||
+static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
|
||||
|
||||
/*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/
|
||||
|
||||
@@ -3397,10 +3395,10 @@ static int patch_cd_extra(unsigned track
|
||||
|
||||
static int restrict_tracks_illleadout(void)
|
||||
{
|
||||
- struct TOC *o = &g_toc[cdtracks+1];
|
||||
+ struct TOC_t *o = &g_toc[cdtracks+1];
|
||||
int i;
|
||||
for (i = cdtracks; i >= 0; i--) {
|
||||
- struct TOC *p = &g_toc[i];
|
||||
+ struct TOC_t *p = &g_toc[i];
|
||||
if (GETSTART(o) > GETSTART(p)) break;
|
||||
}
|
||||
patch_cd_extra(i+1, GETSTART(o));
|
||||
@@ -3523,7 +3521,7 @@ static void it_reset(struct iterator *th
|
||||
|
||||
|
||||
static int it_hasNextTrack(struct iterator *this);
|
||||
-static struct TOC *it_getNextTrack(struct iterator *this);
|
||||
+static struct TOC_t *it_getNextTrack(struct iterator *this);
|
||||
|
||||
static int it_hasNextTrack(struct iterator *this)
|
||||
{
|
||||
@@ -3532,7 +3530,7 @@ static int it_hasNextTrack(struct iterat
|
||||
|
||||
|
||||
|
||||
-static struct TOC *it_getNextTrack(struct iterator *this)
|
||||
+static struct TOC_t *it_getNextTrack(struct iterator *this)
|
||||
{
|
||||
/* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */
|
||||
if ( this->index > (int)cdtracks+1 ) return NULL;
|
||||
@@ -3583,7 +3581,7 @@ long Get_AudioStartSector(unsigned long
|
||||
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
|
||||
if (GETTRACK(p) == p_track) {
|
||||
if (IS__DATA(p)) {
|
||||
@@ -3613,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra
|
||||
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
|
||||
if (GETTRACK(p) == p_track) {
|
||||
return GETSTART(p);
|
||||
@@ -3637,7 +3635,7 @@ long Get_EndSector(unsigned long p_track
|
||||
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
if (GETTRACK(p) == p_track) {
|
||||
p = i.getNextTrack(&i);
|
||||
if (p == NULL) {
|
||||
@@ -3669,7 +3667,7 @@ long FirstAudioTrack(void)
|
||||
else i.reset(&i);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
unsigned ii = GETTRACK(p);
|
||||
|
||||
if (ii == CDROM_LEADOUT) break;
|
||||
@@ -3687,7 +3685,7 @@ long FirstDataTrack(void)
|
||||
else i.reset(&i);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
if (IS__DATA(p)) {
|
||||
return GETTRACK(p);
|
||||
}
|
||||
@@ -3708,7 +3706,7 @@ long LastAudioTrack(void)
|
||||
else i.reset(&i);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) {
|
||||
j = GETTRACK(p);
|
||||
}
|
||||
@@ -3730,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_
|
||||
if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
|
||||
if (GETTRACK(p) < p_track)
|
||||
continue;
|
||||
@@ -3749,9 +3747,9 @@ int Get_Track(unsigned long sector)
|
||||
else i.reset(&i);
|
||||
|
||||
if (i.hasNextTrack(&i)) {
|
||||
- TOC *o = i.getNextTrack(&i);
|
||||
+ TOC_t *o = i.getNextTrack(&i);
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) {
|
||||
if (IS__DATA(o)) {
|
||||
return -1;
|
||||
@@ -3772,7 +3770,7 @@ int CheckTrackrange(unsigned long from,
|
||||
else i.reset(&i);
|
||||
|
||||
while (i.hasNextTrack(&i)) {
|
||||
- TOC *p = i.getNextTrack(&i);
|
||||
+ TOC_t *p = i.getNextTrack(&i);
|
||||
|
||||
if (GETTRACK(p) < from)
|
||||
continue;
|
||||
@@ -3788,54 +3786,3 @@ int CheckTrackrange(unsigned long from,
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#ifdef USE_PARANOIA
|
||||
-long cdda_disc_firstsector(void *d);
|
||||
-
|
||||
-long cdda_disc_firstsector(void *d)
|
||||
-{
|
||||
- return Get_StartSector(FirstAudioTrack());
|
||||
-}
|
||||
-
|
||||
-int cdda_tracks(void *d);
|
||||
-
|
||||
-int cdda_tracks(void *d)
|
||||
-{
|
||||
- return LastAudioTrack() - FirstAudioTrack() +1;
|
||||
-}
|
||||
-
|
||||
-int cdda_track_audiop(void *d, int track);
|
||||
-
|
||||
-int cdda_track_audiop(void *d, int track)
|
||||
-{
|
||||
- return Get_Datatrack(track) == 0;
|
||||
-}
|
||||
-
|
||||
-long cdda_track_firstsector(void *d, int track);
|
||||
-
|
||||
-long cdda_track_firstsector(void *d, int track)
|
||||
-{
|
||||
- return Get_AudioStartSector(track);
|
||||
-}
|
||||
-
|
||||
-long cdda_track_lastsector(void *d, int track);
|
||||
-
|
||||
-long cdda_track_lastsector(void *d, int track)
|
||||
-{
|
||||
- return Get_EndSector(track);
|
||||
-}
|
||||
-
|
||||
-long cdda_disc_lastsector(void *d);
|
||||
-
|
||||
-long cdda_disc_lastsector(void *d)
|
||||
-{
|
||||
- return Get_LastSectorOnCd(cdtracks) - 1;
|
||||
-}
|
||||
-
|
||||
-int cdda_sector_gettrack(void *d,long sector);
|
||||
-
|
||||
-int cdda_sector_gettrack(void *d, long sector)
|
||||
-{
|
||||
- return Get_Track(sector);
|
||||
-}
|
||||
-
|
||||
-#endif
|
||||
@ -0,0 +1,83 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils flag-o-matic
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
|
||||
inherit subversion autotools
|
||||
else
|
||||
MY_P=${PN}-${PV/_}
|
||||
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
|
||||
HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
|
||||
|
||||
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
|
||||
sys-libs/ncurses:0=[static-libs(+)]
|
||||
magic? ( sys-apps/file[static-libs(+)] )
|
||||
nls? ( virtual/libintl )
|
||||
!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
static? ( ${LIB_DEPEND} )"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
eautoreconf
|
||||
fi
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
local myconf=()
|
||||
case ${CHOST} in
|
||||
*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
|
||||
esac
|
||||
econf \
|
||||
--bindir="${EPREFIX}"/bin \
|
||||
--htmldir=/trash \
|
||||
$(use_enable !minimal color) \
|
||||
$(use_enable !minimal multibuffer) \
|
||||
$(use_enable !minimal nanorc) \
|
||||
--disable-wrapping-as-root \
|
||||
$(use_enable magic libmagic) \
|
||||
$(use_enable spell speller) \
|
||||
$(use_enable justify) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable unicode utf8) \
|
||||
$(use_enable minimal tiny) \
|
||||
$(usex ncurses --without-slang $(use_with slang)) \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
rm -rf "${D}"/trash
|
||||
|
||||
dodoc doc/nanorc.sample
|
||||
dohtml doc/faq.html
|
||||
insinto /etc
|
||||
newins doc/nanorc.sample nanorc
|
||||
if ! use minimal ; then
|
||||
# Enable colorization by default.
|
||||
sed -i \
|
||||
-e '/^# include /s:# *::' \
|
||||
"${ED}"/etc/nanorc || die
|
||||
fi
|
||||
|
||||
dodir /usr/bin
|
||||
dosym /bin/nano /usr/bin/nano
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit depend.apache systemd
|
||||
|
||||
DESCRIPTION="PHP eselect module"
|
||||
HOMEPAGE="https://www.gentoo.org"
|
||||
SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="fpm apache2"
|
||||
|
||||
RDEPEND="app-admin/eselect"
|
||||
S="${WORKDIR}"
|
||||
|
||||
want_apache
|
||||
|
||||
src_install() {
|
||||
mv eselect-php-${PV} php.eselect
|
||||
insinto /usr/share/eselect/modules/
|
||||
doins php.eselect
|
||||
|
||||
if use apache2 ; then
|
||||
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
|
||||
newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" \
|
||||
"70_mod_php5.conf"
|
||||
fi
|
||||
|
||||
if use fpm ; then
|
||||
newinitd "${FILESDIR}/php-fpm.init-r2" "php-fpm"
|
||||
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
|
||||
exeinto /usr/libexec
|
||||
doexe "${FILESDIR}/php-fpm-launcher"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
extra_started_commands="reload"
|
||||
|
||||
set_phpvars() {
|
||||
PHPSLOT="${SVCNAME#php-fpm-}"
|
||||
PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid"
|
||||
if [ ${PHPSLOT} = 'php-fpm' ] ; then
|
||||
PHPSLOT="$(eselect php show fpm)"
|
||||
PHP_FPM_PID="/run/php-fpm.pid"
|
||||
fi
|
||||
|
||||
PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \
|
||||
--exec "/usr/lib/${PHPSLOT}/bin/php-fpm" \
|
||||
-- \
|
||||
--fpm-config "${PHP_FPM_CONF}" \
|
||||
--pid "${PHP_FPM_PID}"
|
||||
local i=0
|
||||
local timeout=5
|
||||
while [ ! -f "${PHP_FPM_PID}" ] && [ $i -le $timeout ]; do
|
||||
sleep 1
|
||||
i=$(($i + 1))
|
||||
done
|
||||
|
||||
[ $timeout -gt $i ]
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --signal QUIT \
|
||||
--stop \
|
||||
--exec "/usr/lib/${PHPSLOT}/bin/php-fpm" \
|
||||
--pidfile "${PHP_FPM_PID}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
[ -f "${PHP_FPM_PID}" ] && kill -USR2 $(cat "${PHP_FPM_PID}")
|
||||
eend $?
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST gspell-0.1.1.tar.xz 354932 SHA256 fef8cd89d220fc9ad6b69ff625ca2263a09c69ba56fcefcc90cf4422896e4c52 SHA512 aca0f3e9e9c8f3b4b7ebecc82aecb2f23782fad5192fb23a6737c23767cdff82c47e2d0d2d0d5540838f269d9a07895817ea405abada142b0f493306ad607087 WHIRLPOOL ebe1ba9fc0932eeec85191d012d1bc9734e69cfdf812ab09371aa8bdf5ef6ab49320cd80c81703ce8ec29737f558336a8505ef5ff945038b0a30ad61ec2918eb
|
||||
DIST gspell-0.1.2.tar.xz 355128 SHA256 e8625c57296b6c178bc37659f023342f8edefaaa2c5eccf40de8bd479dbfa8f0 SHA512 8d9bd61f378929217b9461debb58df5070952539f30f6ee211cf13f856dfe5d5216468679a8d7d7b08df47ee6b7b45f25b2b6400212a83de9563e2bf175905bb WHIRLPOOL 44334ac608e9a66c5a6bf011ad21d7d368e29d7923079e947ed5484ae0c7847df1f29dc255979d0da844e1ecba16fa19dfae5b84aefd85287bc63de1465d3ffa
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
|
||||
DIST poppler-0.36.0.tar.xz 1629984 SHA256 93cc067b23c4ef7421380d3e8bd7c940b2027668446750787d7c1cb42720248e SHA512 36f7ea892d05c73d2862b6d5a29753cfe6823f54f8449e010b9960b59d9c698ba4f239625e8dbf41a235ae61203d8b445f775f5622b38c6d24328870e77371c5 WHIRLPOOL 4111ab5146a65ef4485ff010b9056dfd6573c9d72af3d07c5a16bde49c25ded5c05e26285d672e33a06b05845fdfef240170359ebe4547191a7ca695a91e3e90
|
||||
DIST poppler-0.37.0.tar.xz 1636496 SHA256 b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee SHA512 9cdff2da9d13b8db25a24e8703ab411da1caa6545cd25b6153ce019c185cd90eda8dbb59a5c320ea6e8ec1896b0197987acc72ba233d6ece4e212a2132a6b087 WHIRLPOOL 8dda998aac39d86caf215a4c9f3019918282e800d37a29e8f686527e6f2eba6177dbd70968254085008b7a86e34327cbb80b01473a52bf941ad9ad3511fe2341
|
||||
DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
|
||||
|
||||
@ -0,0 +1,122 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils toolchain-funcs
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
|
||||
SLOT="0/9999"
|
||||
else
|
||||
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/57" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
|
||||
fi
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="http://poppler.freedesktop.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.4 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
|
||||
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# Clang doesn't grok this flag, the configure nicely tests that, but
|
||||
# cmake just uses it, so remove it if we use clang
|
||||
if [[ ${CC} == clang ]] ; then
|
||||
sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT4_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
$(cmake-utils_use_enable curl LIBCURL)
|
||||
$(cmake-utils_use_enable cxx CPP)
|
||||
$(cmake-utils_use_enable utils)
|
||||
$(cmake-utils_use_with cairo)
|
||||
$(cmake-utils_use_with introspection GObjectIntrospection)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_with qt4)
|
||||
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||
$(cmake-utils_use_with tiff)
|
||||
)
|
||||
if use jpeg2k; then
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
|
||||
fi
|
||||
if use lcms; then
|
||||
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_CMS=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# live version doesn't provide html documentation
|
||||
if use cairo && use doc && [[ ${PV} != 9999 ]]; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
|
||||
DIST xmlto-0.0.28.tar.bz2 127921 SHA256 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 WHIRLPOOL 4adbd66f85ed0ca90cb122dc08f9817d82e0b2bd417ae2ca8bb97e1fa3e301ab344d1ff9b9dec8571a6a519f1e0a80f0ce133d2618a211a64b0982c0b2b8c5f6
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
|
||||
HOMEPAGE="https://fedorahosted.org/xmlto/"
|
||||
SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
|
||||
IUSE="latex"
|
||||
|
||||
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-shells/bash:0=
|
||||
dev-libs/libxslt
|
||||
sys-apps/sed
|
||||
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|
||||
|| ( sys-apps/util-linux app-misc/getopt )
|
||||
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
|
||||
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
|
||||
# We only depend on flex when we patch the imput lexer.
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We don't want the script to detect /bin/sh if it is bash.
|
||||
export ac_cv_path_BASH=/bin/bash
|
||||
has_version sys-apps/util-linux || export GETOPT=getopt-long
|
||||
econf
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST salt-vim-20151119.tar.gz 4009 SHA256 7ac88028007779a69355a946ffe7d8f93725bbb56b334e9cd601104cfc527646 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105 WHIRLPOOL db55f271b0268b3309be97a3d0047427534670d25b94fe26a9168de255563d4955eaf7d8659f09193a57940b587e06683756f57a005b77afe3bc9f83ca53028c
|
||||
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>vim</herd>
|
||||
<maintainer>
|
||||
<email>chutzpah@gentoo.org</email>
|
||||
<name>Patrick McLean</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
SALT_VIM_HASH="5b15d379fbcbb84f82c6a345abc08cea9d374be9"
|
||||
|
||||
DESCRIPTION="Vim files for working on Salt files"
|
||||
HOMEPAGE="https://github.com/saltstack/salt-vim"
|
||||
SRC_URI="https://github.com/saltstack/${PN}/archive/${SALT_VIM_HASH}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="!<=app-admin/salt-2015.5.6
|
||||
!~app-admin/salt-2015.8.0
|
||||
!~app-admin/salt-2015.8.1"
|
||||
|
||||
S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}"
|
||||
@ -1,2 +1,2 @@
|
||||
DIST mariadb-galera-10.0.21.tar.gz 56518164 SHA256 dc5385603257980ac2549a2c142e7eb41ab2bf60f9ca47ddfc1f6138b5138b58 SHA512 46d007b48a6f03bf5242d771d96a07ebf3f35af9c32d74bed37fb1d72b493d66db2007ec134be7e9d9aca5b2ccb968049a347fb1cfd86d8cc2da1408ff32b5dc WHIRLPOOL a3d5b118a1fe11fc07727ace130cb8766d47b1ae49926ec95fcf79e80250286286ccc02cb8f8c78ec63bcb0556d2f559cbaab0ff62bf721bdd27a49d219da981
|
||||
DIST mariadb-galera-10.0.22.tar.gz 56593286 SHA256 03707fe86add4ed3a1039d1c2d2a1eca768feef15bf8499d6a61bdeb0802de9e SHA512 4dd508293235fc786f1d3ada37b20284f591e16c50aea06514de3d5310f01ef22d01c8345226395ddccc0ee8c96b952a6e7b17f94b248cb6977bf40fff7c117f WHIRLPOOL 612f8910a9549aab4e77f1580570500fc4591d6f034728be55c2af8cd861e1170289c82db622cb34116aa0131c2ba89b32290fff5e863c96693ed1825eeaf070
|
||||
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
|
||||
|
||||
@ -1 +0,0 @@
|
||||
DIST commons-attributes-2.2-src.tar.gz 98307 SHA256 f24acddd1b82db16052672c255bd57add05107bbb1220264aec6ba10091e7713 SHA512 6030af498f085c56b313f473d3f44fc063608b9e0d7442e2f7fd0ee73c320b84cc334dd75038ab3aaac4b72a54cf12f3e3bddfb7faf3610f0f080c389f370e07 WHIRLPOOL b5a03da8126f8df02977a4318dd7cd6e1ebdb0b15f6932e344abb4b44dc1ee8e98214f3ff01fc0eeaf6b4ff6f47eeb67b4f7b6bc692407283c10f510947b4faf
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Commons Attributes enables Java programmers to use C#/.Net-style attributes in their code"
|
||||
HOMEPAGE="http://commons.apache.org/attributes/"
|
||||
SRC_URI="mirror://apache/commons/attributes/source/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
CDEPEND="dev-java/ant-core:0
|
||||
dev-java/gjdoc:0
|
||||
dev-java/qdox:1.6
|
||||
dev-java/xjavadoc:0"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6
|
||||
${CDEPEND}"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.6
|
||||
${CDEPEND}"
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6"
|
||||
|
||||
src_compile() {
|
||||
java-pkg-2_src_compile
|
||||
|
||||
# The generated build.xml is faulty.
|
||||
jar uf target/${PN}-compiler-${PV}.jar -C compiler/src/java \
|
||||
org/apache/commons/attributes/anttasks.properties || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
|
||||
java-pkg_newjar target/${PN}-compiler-${PV}.jar ${PN}-compiler.jar
|
||||
|
||||
java-pkg_register-ant-task
|
||||
|
||||
dodoc NOTICE.txt
|
||||
dohtml README.html
|
||||
|
||||
use doc && java-pkg_dojavadoc dist/docs/api
|
||||
use source && java-pkg_dosrc api/src/java/org compiler/src/java/org
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Commons components to manipulate core java classes"
|
||||
HOMEPAGE="http://commons.apache.org/lang/"
|
||||
SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
|
||||
SLOT="2.1"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
test? (
|
||||
dev-java/ant-junit:0
|
||||
)"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.4"
|
||||
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
JAVA_ANT_ENCODING="ISO-8859-1"
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar "target/${P}.jar" "${PN}.jar"
|
||||
dodoc RELEASE-NOTES.txt NOTICE.txt || die
|
||||
dohtml *.html || die
|
||||
use doc && java-pkg_dojavadoc target/apidocs
|
||||
use source && java-pkg_dosrc src/main/java/*
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
|
||||
HOMEPAGE="https://java.net/projects/rome"
|
||||
SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND=">=dev-java/jdom-1.0"
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
app-arch/unzip
|
||||
test? ( dev-java/ant-junit )
|
||||
${COMMON_DEPEND}"
|
||||
RDEPEND=">=virtual/jre-1.4
|
||||
${COMMON_DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Patch build.xml so the tests pass
|
||||
epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
|
||||
|
||||
# Symlink jars
|
||||
mkdir -p target/lib
|
||||
cd target/lib
|
||||
java-pkg_jar-from jdom-1.0
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar target/${P}.jar
|
||||
|
||||
use doc && java-pkg_dojavadoc dist/docs/api
|
||||
use source && java-pkg_dosrc src/java/*
|
||||
}
|
||||
|
||||
src_test() {
|
||||
java-pkg_jar-from --into target/lib junit
|
||||
ANT_TASKS="ant-junit" eant test
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
JAVA_PKG_IUSE="source doc"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
DESCRIPTION="Utility classes that allow high performance XML processing based on SAX"
|
||||
HOMEPAGE="http://ws.apache.org/commons/util/"
|
||||
SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6"
|
||||
RDEPEND=">=virtual/jre-1.6"
|
||||
|
||||
JAVA_SRC_DIR="src"
|
||||
|
||||
java_prepare() {
|
||||
mv "${S}"/"${P}"/src . || die
|
||||
rm -rf "${S}"/"${P}" src/test || die
|
||||
}
|
||||
@ -1,2 +0,0 @@
|
||||
DIST xjavadoc-1.1-src.tar.gz 58804 SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 SHA512 e186d2b790def023bde797ca1693b06bcd00e564cf99400b0bd4c95b46a43ee65ee6b37528878afd8c415820972b43c35ba660f4321b15ca8be4d27342b64a92 WHIRLPOOL eea59a799cd5e14dae11771ae01560400c4f4f4f673b8dc56f723057e0cb9377ee9801dd08c67d34730c605e4c7303680e004f8ee4e272c983e5c517f7cb7946
|
||||
DIST xjavadoc-1.1-supplement.tar.bz2 458861 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b SHA512 64d9c43ea75ebb9c1faf22b69e6f818e2deadfb4064cfc5d0fdda7e18bcd4fb8c806bb0d12b42080f10488c8ae466764de26a7f070085a1db108b0b9e801cc2b WHIRLPOOL 25ccf314eaa80972849d569aec434a7486fc04670bb7320e33d98e5c5da35c190a0ecff24827feb857201e9aad034d2e279978cef1b45ecd0a4e83b7c14dc549
|
||||
@ -1,26 +0,0 @@
|
||||
--- build.xml.orig 2005-04-03 04:24:07.000000000 +0200
|
||||
+++ build.xml 2005-04-03 04:31:17.000000000 +0200
|
||||
@@ -38,12 +38,6 @@
|
||||
<include name="**/package.html"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
- <copy todir="${build.dir}/junit">
|
||||
- <fileset dir="${basedir}/junit">
|
||||
- <include name="**/*.java"/>
|
||||
- <include name="**/package.html"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
@@ -64,8 +58,8 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- Makes the jar -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="jar" depends="junit">
|
||||
- <jar jarfile="${jardir}/xjavadoc-${version}.jar">
|
||||
+ <target name="jar" depends="compile">
|
||||
+ <jar jarfile="${jardir}/xjavadoc.jar">
|
||||
<fileset dir="${build.dir}/classes">
|
||||
<exclude name="**/*Test.class"/>
|
||||
</fileset>
|
||||
@ -1,27 +0,0 @@
|
||||
--- build.xml.orig 2004-10-03 11:15:32.000000000 +0200
|
||||
+++ build.xml 2006-08-21 16:44:57.000000000 +0200
|
||||
@@ -38,12 +38,6 @@
|
||||
<include name="**/package.html"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
- <copy todir="${build.dir}/junit">
|
||||
- <fileset dir="${basedir}/junit">
|
||||
- <include name="**/*.java"/>
|
||||
- <include name="**/package.html"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
@@ -64,8 +58,8 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- Makes the jar -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="jar" depends="junit">
|
||||
- <jar jarfile="${jardir}/xjavadoc-${version}.jar">
|
||||
+ <target name="jar" depends="compile">
|
||||
+ <jar jarfile="${jardir}/xjavadoc.jar">
|
||||
<fileset dir="${build.dir}/classes">
|
||||
<exclude name="**/*Test.class"/>
|
||||
</fileset>
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
JAVA_PKG_IUSE="source"
|
||||
WANT_ANT_TASKS="ant-nodeps"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet"
|
||||
HOMEPAGE="http://xdoclet.sourceforge.net/xjavadoc/"
|
||||
SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz
|
||||
mirror://gentoo/${P}-supplement.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-java/commons-collections:0
|
||||
dev-java/junit:0"
|
||||
RDEPEND=">=virtual/jre-1.5
|
||||
${COMMON_DEPEND}"
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
dev-java/javacc
|
||||
${COMMON_DEPEND}"
|
||||
|
||||
java_prepare() {
|
||||
# remove the junit tests, would need xdoclet, causing circular dep
|
||||
epatch "${FILESDIR}"/${P}-nojunit.patch
|
||||
|
||||
cd "${S}"/lib || die
|
||||
rm -v *.jar || die
|
||||
java-pkg_jar-from commons-collections,junit
|
||||
java-pkg_jar-from --build-only javacc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar target/${PN}.jar
|
||||
use source && java-pkg_dosrc src/*
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
|
||||
--- a/ext/mysqlnd/mysqlnd.c 2010-10-22 17:46:26.000000000 +0200
|
||||
+++ b/ext/mysqlnd/mysqlnd.c 2010-12-08 21:54:47.000000000 +0100
|
||||
@@ -619,7 +619,8 @@
|
||||
if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
|
||||
DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
|
||||
if (!socket_or_pipe) {
|
||||
- socket_or_pipe = "/tmp/mysql.sock";
|
||||
+ // gentoo mysql default socket location
|
||||
+ socket_or_pipe = "/var/run/mysqld/mysqld.sock";
|
||||
}
|
||||
transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
|
||||
unix_socket = TRUE;
|
||||
@ -1,14 +0,0 @@
|
||||
upstream bug: http://bugs.php.net/bug.php?id=46311
|
||||
The current patch follows a suggestion from Siarhei Siamashka
|
||||
Adapted for php 5.5
|
||||
--- Zend/zend_execute.h.old 2013-01-01 13:49:04.587825704 +0100
|
||||
+++ Zend/zend_execute.h 2013-01-01 13:53:28.762958578 +0100
|
||||
@@ -293,7 +293,7 @@
|
||||
void **end = p - (int)(zend_uintptr_t)*p;
|
||||
|
||||
while (p != end) {
|
||||
- zval *q = *(zval **)(--p);
|
||||
+ zval *q = (zval *)*(--p);
|
||||
*p = NULL;
|
||||
i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
--- ./Zend/acinclude.m4 2013-03-20 15:09:27.000000000 +0100
|
||||
+++ ./Zend/acinclude.m4.new 2013-03-25 21:35:27.654016588 +0100
|
||||
@@ -17,12 +17,7 @@
|
||||
if test -n "$bison_version_vars"; then
|
||||
set $bison_version_vars
|
||||
bison_version="${1}.${2}"
|
||||
- for bison_check_version in $bison_version_list; do
|
||||
- if test "$bison_version" = "$bison_check_version"; then
|
||||
- php_cv_bison_version="$bison_check_version (ok)"
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
+ php_cv_bison_version="$bison_version (ok)"
|
||||
fi
|
||||
])
|
||||
fi
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
|
||||
index ccbc9b1..6a9a24a 100644
|
||||
--- a/Zend/zend_language_parser.y
|
||||
+++ b/Zend/zend_language_parser.y
|
||||
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
|
||||
|
||||
#define YYERROR_VERBOSE
|
||||
#define YYSTYPE znode
|
||||
-#ifdef ZTS
|
||||
-# define YYPARSE_PARAM tsrm_ls
|
||||
-# define YYLEX_PARAM tsrm_ls
|
||||
-#endif
|
||||
-
|
||||
|
||||
%}
|
||||
|
||||
%pure_parser
|
||||
%expect 3
|
||||
|
||||
+%code requires {
|
||||
+#ifdef ZTS
|
||||
+# define YYPARSE_PARAM tsrm_ls
|
||||
+# define YYLEX_PARAM tsrm_ls
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
%token END 0 "end of file"
|
||||
%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
|
||||
%token T_INCLUDE "include (T_INCLUDE)"
|
||||
@ -1,30 +0,0 @@
|
||||
Gentoo bug: #494240
|
||||
Upstream: #64503
|
||||
|
||||
--- Zend/zend_language_parser.y.orig 2013-12-14 12:25:43.528989017 +0100
|
||||
+++ Zend/zend_language_parser.y 2013-12-14 12:26:30.088988957 +0100
|
||||
@@ -38,10 +38,6 @@
|
||||
|
||||
#define YYERROR_VERBOSE
|
||||
#define YYSTYPE znode
|
||||
-#ifdef ZTS
|
||||
-# define YYPARSE_PARAM tsrm_ls
|
||||
-# define YYLEX_PARAM tsrm_ls
|
||||
-#endif
|
||||
|
||||
|
||||
%}
|
||||
@@ -49,6 +45,13 @@
|
||||
%pure_parser
|
||||
%expect 2
|
||||
|
||||
+%code requires {
|
||||
+#ifdef ZTS
|
||||
+# define YYPARSE_PARAM tsrm_ls
|
||||
+# define YYLEX_PARAM tsrm_ls
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
|
||||
%left ','
|
||||
%left T_LOGICAL_OR
|
||||
@ -1,10 +0,0 @@
|
||||
--- acinclude.m4 2013-04-02 09:58:33.069274096 +0200
|
||||
+++ acinclude.m4.new 2013-04-02 09:58:25.221240142 +0200
|
||||
@@ -762,6 +762,7 @@
|
||||
if test -z "$php_cxx_done"; then
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CXXCPP
|
||||
+ PHP_ADD_LIBRARY(stdc++)
|
||||
php_cxx_done=yes
|
||||
fi
|
||||
])
|
||||
@ -1,64 +0,0 @@
|
||||
From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
|
||||
From: Adam Harvey <aharvey@php.net>
|
||||
Date: Sat, 7 Dec 2013 19:39:40 -0800
|
||||
Subject: [PATCH] Switch to using freetype-config for freetype detection.
|
||||
|
||||
This fixes GD compilation against libfreetype 2.5.1 and later after they made
|
||||
the rather interesting decision to change their include directory layout in a
|
||||
point release.
|
||||
|
||||
The original suggestion in the bug was to use pkg-config, but my inclination is
|
||||
to use freetype-config instead: we should be able to get the same configuration
|
||||
information without actually needing pkg-config installed, since pkg-config is
|
||||
by no means guaranteed to exist on many Unices and distros, whereas
|
||||
freetype-config should always be present if a libfreetype build environment is
|
||||
installed. Let's try it out and see what happens.
|
||||
|
||||
Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
|
||||
|
||||
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
|
||||
index 0e35ece..732e14c 100644
|
||||
--- a/ext/gd/config.m4
|
||||
+++ b/ext/gd/config.m4
|
||||
@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
|
||||
if test "$PHP_FREETYPE_DIR" != "no"; then
|
||||
|
||||
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
|
||||
- if test -f "$i/include/freetype2/freetype/freetype.h"; then
|
||||
+ if test -f "$i/bin/freetype-config"; then
|
||||
FREETYPE2_DIR=$i
|
||||
- FREETYPE2_INC_DIR=$i/include/freetype2
|
||||
+ FREETYPE2_CONFIG="$i/bin/freetype-config"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if test -z "$FREETYPE2_DIR"; then
|
||||
- AC_MSG_ERROR([freetype.h not found.])
|
||||
+ AC_MSG_ERROR([freetype-config not found.])
|
||||
fi
|
||||
|
||||
- PHP_CHECK_LIBRARY(freetype, FT_New_Face,
|
||||
- [
|
||||
- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
|
||||
- PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
|
||||
- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
|
||||
- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
|
||||
- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
|
||||
- AC_DEFINE(ENABLE_GD_TTF,1,[ ])
|
||||
- ],[
|
||||
- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
|
||||
- ],[
|
||||
- -L$FREETYPE2_DIR/$PHP_LIBDIR
|
||||
- ])
|
||||
+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
|
||||
+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
|
||||
+
|
||||
+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
|
||||
+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
|
||||
+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
|
||||
+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
|
||||
+ AC_DEFINE(ENABLE_GD_TTF,1,[ ])
|
||||
else
|
||||
AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
|
||||
fi
|
||||
@ -1,52 +0,0 @@
|
||||
--- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
|
||||
+++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
|
||||
@@ -366,22 +366,37 @@
|
||||
|
||||
if test -z "$ODBC_TYPE"; then
|
||||
PHP_ARG_WITH(iodbc,,
|
||||
-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
|
||||
+[ --with-iodbc[=DIR] Include iODBC support])
|
||||
|
||||
if test "$PHP_IODBC" != "no"; then
|
||||
AC_MSG_CHECKING(for iODBC support)
|
||||
- if test "$PHP_IODBC" = "yes"; then
|
||||
- PHP_IODBC=/usr/local
|
||||
+ if test -z "$PKG_CONFIG"; then
|
||||
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
+ fi
|
||||
+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
|
||||
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
+ ODBC_TYPE=iodbc
|
||||
+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
|
||||
+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
|
||||
+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
|
||||
+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
|
||||
+ AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
+ AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
+ AC_MSG_RESULT([$ext_output])
|
||||
+ else
|
||||
+ if test "$PHP_IODBC" = "yes"; then
|
||||
+ PHP_IODBC=/usr/local
|
||||
+ fi
|
||||
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
|
||||
+ ODBC_TYPE=iodbc
|
||||
+ ODBC_INCLUDE=-I$PHP_IODBC/include
|
||||
+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
|
||||
+ ODBC_LIBS=-liodbc
|
||||
+ AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
+ AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
+ AC_MSG_RESULT([$ext_output])
|
||||
fi
|
||||
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
|
||||
- ODBC_TYPE=iodbc
|
||||
- ODBC_INCLUDE=-I$PHP_IODBC/include
|
||||
- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
|
||||
- ODBC_LIBS=-liodbc
|
||||
- AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
- AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
- AC_MSG_RESULT([$ext_output])
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
--- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
|
||||
+++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
|
||||
@@ -366,22 +366,37 @@
|
||||
|
||||
if test -z "$ODBC_TYPE"; then
|
||||
PHP_ARG_WITH(iodbc,,
|
||||
-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
|
||||
+[ --with-iodbc[=DIR] Include iODBC support])
|
||||
|
||||
if test "$PHP_IODBC" != "no"; then
|
||||
AC_MSG_CHECKING(for iODBC support)
|
||||
- if test "$PHP_IODBC" = "yes"; then
|
||||
- PHP_IODBC=/usr/local
|
||||
+ if test -z "$PKG_CONFIG"; then
|
||||
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
+ fi
|
||||
+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
|
||||
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
+ ODBC_TYPE=iodbc
|
||||
+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
|
||||
+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
|
||||
+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
|
||||
+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
|
||||
+ AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
+ AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
+ AC_MSG_RESULT([$ext_output])
|
||||
+ else
|
||||
+ if test "$PHP_IODBC" = "yes"; then
|
||||
+ PHP_IODBC=/usr/local
|
||||
+ fi
|
||||
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
|
||||
+ ODBC_TYPE=iodbc
|
||||
+ ODBC_INCLUDE=-I$PHP_IODBC/include
|
||||
+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
|
||||
+ ODBC_LIBS=-liodbc
|
||||
+ AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
+ AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
+ AC_MSG_RESULT([$ext_output])
|
||||
fi
|
||||
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
|
||||
- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
|
||||
- ODBC_TYPE=iodbc
|
||||
- ODBC_INCLUDE=-I$PHP_IODBC/include
|
||||
- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
|
||||
- ODBC_LIBS=-liodbc
|
||||
- AC_DEFINE(HAVE_IODBC,1,[ ])
|
||||
- AC_DEFINE(HAVE_ODBC2,1,[ ])
|
||||
- AC_MSG_RESULT([$ext_output])
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- acinclude.m4 2012-11-17 21:53:06.346408695 +0100
|
||||
+++ acinclude.m4.new 2013-03-18 11:37:09.253432820 +0100
|
||||
@@ -2331,8 +2331,10 @@
|
||||
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
|
||||
fi
|
||||
|
||||
- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
|
||||
+ if test -n "$OPENSSL_LIBS" ; then
|
||||
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
|
||||
+ fi
|
||||
+ if test -n "$OPENSSL_INCS" ; then
|
||||
PHP_EVAL_INCLINE($OPENSSL_INCS)
|
||||
fi
|
||||
fi
|
||||
@ -1,47 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
|
||||
set_phpvars() {
|
||||
PHPSLOT=${SVCNAME#php-fpm-}
|
||||
[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
|
||||
|
||||
PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
|
||||
PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
|
||||
}
|
||||
|
||||
extra_commands="depend"
|
||||
extra_started_commands="reload"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use apache2 lighttpd nginx
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
|
||||
/usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
|
||||
local i=0
|
||||
local timeout=5
|
||||
while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
|
||||
sleep 1
|
||||
i=$(($i + 1))
|
||||
done
|
||||
|
||||
[ $timeout -gt $i ]
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
[ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
|
||||
eend $?
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
--- ext/gd/libgd/webpimg.c.orig 2015-04-10 17:33:03.864937281 +0300
|
||||
+++ ext/gd/libgd/webpimg.c 2015-04-10 17:33:32.089873980 +0300
|
||||
@@ -706,14 +706,14 @@
|
||||
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
|
||||
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
|
||||
|
||||
- vpx_img_wrap(&img, IMG_FMT_I420,
|
||||
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
|
||||
y_width, y_height, 16, (uint8*)(Y));
|
||||
- img.planes[PLANE_Y] = (uint8*)(Y);
|
||||
- img.planes[PLANE_U] = (uint8*)(U);
|
||||
- img.planes[PLANE_V] = (uint8*)(V);
|
||||
- img.stride[PLANE_Y] = y_stride;
|
||||
- img.stride[PLANE_U] = uv_stride;
|
||||
- img.stride[PLANE_V] = uv_stride;
|
||||
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
|
||||
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
|
||||
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
|
||||
+ img.stride[VPX_PLANE_Y] = y_stride;
|
||||
+ img.stride[VPX_PLANE_U] = uv_stride;
|
||||
+ img.stride[VPX_PLANE_V] = uv_stride;
|
||||
|
||||
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Gentoo bugs: 88944 463800
|
||||
--- ext/imap/config.m4 2013-03-27 19:31:13.000000000 +0100
|
||||
+++ ext/imap/config.m4.new 2013-03-30 18:34:17.581557062 +0100
|
||||
@@ -198,9 +198,9 @@
|
||||
AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
|
||||
fi
|
||||
|
||||
- if test -r "$IMAP_DIR/c-client/c-client.a"; then
|
||||
+ if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
|
||||
ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
|
||||
- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
|
||||
+ elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
|
||||
ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
make sure we respect the system libffi setting in our build config.
|
||||
the compiler probing is fragile and can break in some situations.
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2069,7 +2069,7 @@ class PyBuildExt(build_ext):
|
||||
return True
|
||||
|
||||
def detect_ctypes(self, inc_dirs, lib_dirs):
|
||||
- self.use_system_libffi = False
|
||||
+ self.use_system_libffi = ('--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"))
|
||||
include_dirs = []
|
||||
extra_compile_args = []
|
||||
extra_link_args = []
|
||||
@@ -2113,7 +2113,7 @@ class PyBuildExt(build_ext):
|
||||
sources=['_ctypes/_ctypes_test.c'])
|
||||
self.extensions.extend([ext, ext_test])
|
||||
|
||||
- if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
|
||||
+ if not self.use_system_libffi:
|
||||
return
|
||||
|
||||
if host_platform == 'darwin':
|
||||
@@ -2141,10 +2141,10 @@ class PyBuildExt(build_ext):
|
||||
ffi_lib = lib_name
|
||||
break
|
||||
|
||||
- if ffi_inc and ffi_lib:
|
||||
+ if ffi_inc:
|
||||
ext.include_dirs.extend(ffi_inc)
|
||||
+ if ffi_lib:
|
||||
ext.libraries.append(ffi_lib)
|
||||
- self.use_system_libffi = True
|
||||
|
||||
|
||||
class PyBuildInstall(install):
|
||||
@ -1,3 +1,4 @@
|
||||
DIST libqtxdg-0.5.3.tar.xz 52948 SHA256 ce45c0de4f1f5c4587178cc8a1d12561b3d101461c71ce3715ed9d5d6a6ad6f4 SHA512 02211e7fd8fc5db014e642c8222a5bade95eef5da8f60c39567cac5f4da385c7b99b454d68a6c88e211981dd98bcb1d17d53c105dcf3e7b89b17b171af904ec2 WHIRLPOOL 1f4f2bc8e6731c0fbc31dcb0f8264f7aafe329f022a74f4bf43828c8016b8af02077d9dcfd1ee0a574d7441db4ba7676dfd0f431d727059b59ccefd5fbe9b216
|
||||
DIST libqtxdg-1.1.0.tar.xz 54268 SHA256 5c90989fcd13387cc8a7905a03e0b65f76aa28545cb9733625e1d88fd6ff4002 SHA512 67e47547d5719fa5a2c4f4b6d6f8c0bc285503ed611f1a3e8b1b5e2cf46f18e98d8b1394c1f68d16cbb0b5ec8721934f50401fb36bfae41bef574c4716b9937a WHIRLPOOL 24f4d35d85eabb0ebf53dcf60fee67fbbe72aca54060039d7f2e2418ab77b7f38a9822ed6c4f512bd4d9c5c66a9db5dee30b173e72d9b5bbc998c13496811839
|
||||
DIST libqtxdg-1.2.0.tar.xz 55704 SHA256 88c9b01b56fea205226b53642833963e4f27471de3b90e93e9b650ca28d098d9 SHA512 f3d6cacc21aec970fcba7de963d4703ec4ed057b0cacacb2458d30260be4ecfaf463e761033eca8c60254dcc83e593e0d722ad6097d837e46434297be0d68398 WHIRLPOOL 01ed25db765faa79973114683808a7c4fa65a05cba32f1221afea0328c77d17589f84af93f4829f95665ecdf55828676c0cab77fb5d0a97eb223338464bf9e26
|
||||
DIST libqtxdg-1.3.0.tar.xz 52472 SHA256 850cad7c25412f70ccc997d1f3013a788d35deae42d9c1376556dc779ea92a89 SHA512 2cc70c4d779c83afdfd83e6e36f1b9362aa5b2bd8f5d9839880e31c30e317da812e97dfd8d7188816ef60e7e27471b02bf9248b5781b2b81f299040a4a7a5b65 WHIRLPOOL 317a017b5dcfc64f0fbb2f483478dab116881ca717513e9e0ce27d302dcf099cbab01289f140ab02682679a09290e711e139a901a324dc4a7adc581fce425a85
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit cmake-utils virtualx
|
||||
|
||||
DESCRIPTION="A Qt implementation of XDG standards"
|
||||
HOMEPAGE="http://lxqt.org/"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
|
||||
else
|
||||
SRC_URI="http://downloads.lxqt.org/${PN}/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtxml:5
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-qt/qttest:5 )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
x11-misc/xdg-utils
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_TESTS=$(usex test)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST PyQt-gpl-5.5.1.tar.gz 3705749 SHA256 0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386 SHA512 ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4 WHIRLPOOL 199a36ff1ee3689a76d0aae9d2bee586f9de3a0e3cf23c5b625c1f62b5f19311450afd9d009cbdb4f5be63ba024326c63ff0e6c9ea515216c686db9d8e07bcb3
|
||||
DIST PyQt-gpl-5.5.tar.gz 3675521 SHA256 cdd1bb55b431acdb50e9210af135428a13fb32d7b1ab86e972ac7101f6acd814 SHA512 84e591da37032763f961e546250fa1da617e3f9b08c8586e0764d1ecf09fb0eed03b6e602742fa6921a7dd6f10db3255cb834770dba606613bf9897f5276bf43 WHIRLPOOL bcfa7e113ddb692b7d035671f47fcf92300e4ff4048e1c6c44724de0f1b3255d0b4901b88d05cc229263f003c45a6fda4a518127a05484a3cc2b487269c28ca2
|
||||
|
||||
@ -0,0 +1,173 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
|
||||
|
||||
inherit eutils multibuild multilib python-r1 qmake-utils
|
||||
|
||||
DESCRIPTION="Python bindings for the Qt framework"
|
||||
HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/intro
|
||||
https://pypi.python.org/pypi/PyQt5"
|
||||
|
||||
MY_PN="PyQt-gpl"
|
||||
if [[ ${PV} == *_pre* ]]; then
|
||||
MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION}
|
||||
SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
|
||||
else
|
||||
MY_P=${MY_PN}-${PV}
|
||||
SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
|
||||
# TODO: QtBluetooth, QtLocation, QtNfc, QtWebEngineWidgets
|
||||
IUSE="dbus debug declarative designer doc examples gles2 gui help multimedia
|
||||
network opengl positioning printsupport sensors serialport sql svg
|
||||
testlib webchannel webkit websockets widgets x11extras xmlpatterns"
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
positioning? ( gui )
|
||||
sensors? ( gui )
|
||||
serialport? ( gui )
|
||||
sql? ( widgets )
|
||||
testlib? ( widgets )
|
||||
webchannel? ( network )
|
||||
"
|
||||
|
||||
# Minimal supported version of Qt.
|
||||
QT_PV="5.4.2:5"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=dev-python/sip-4.16.6:=[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtcore-${QT_PV}
|
||||
>=dev-qt/qtxml-${QT_PV}
|
||||
dbus? (
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtdbus-${QT_PV}
|
||||
)
|
||||
declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
|
||||
designer? ( >=dev-qt/designer-${QT_PV} )
|
||||
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
|
||||
help? ( >=dev-qt/qthelp-${QT_PV} )
|
||||
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
|
||||
network? ( >=dev-qt/qtnetwork-${QT_PV} )
|
||||
opengl? ( >=dev-qt/qtopengl-${QT_PV} )
|
||||
positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
|
||||
printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
|
||||
sensors? ( >=dev-qt/qtsensors-${QT_PV} )
|
||||
serialport? ( >=dev-qt/qtserialport-${QT_PV} )
|
||||
sql? ( >=dev-qt/qtsql-${QT_PV} )
|
||||
svg? ( >=dev-qt/qtsvg-${QT_PV} )
|
||||
testlib? ( >=dev-qt/qttest-${QT_PV} )
|
||||
webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
|
||||
webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
|
||||
websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
|
||||
widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
|
||||
x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
|
||||
xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dbus? ( virtual/pkgconfig )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pyqt_use_enable() {
|
||||
use "$1" || return
|
||||
|
||||
if [[ $# -eq 1 ]]; then
|
||||
echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
|
||||
else
|
||||
shift
|
||||
echo ${@/#/--enable=}
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
configuration() {
|
||||
local myconf=(
|
||||
"${PYTHON}"
|
||||
"${S}"/configure.py
|
||||
$(use debug && echo --debug --trace)
|
||||
--verbose
|
||||
--confirm-license
|
||||
--qmake="$(qt5_get_bindir)"/qmake
|
||||
--destdir="$(python_get_sitedir)"
|
||||
--qsci-api
|
||||
--enable=QtCore
|
||||
--enable=QtXml
|
||||
$(pyqt_use_enable dbus QtDBus)
|
||||
$(usex dbus '' --no-python-dbus)
|
||||
$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
|
||||
$(usex declarative '' --no-qml-plugin)
|
||||
$(pyqt_use_enable designer)
|
||||
$(usex designer '' --no-designer-plugin)
|
||||
$(pyqt_use_enable gui)
|
||||
$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
|
||||
$(pyqt_use_enable help)
|
||||
$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
|
||||
$(pyqt_use_enable network)
|
||||
$(pyqt_use_enable opengl QtOpenGL)
|
||||
$(pyqt_use_enable positioning)
|
||||
$(pyqt_use_enable printsupport QtPrintSupport)
|
||||
$(pyqt_use_enable sensors)
|
||||
$(pyqt_use_enable serialport QtSerialPort)
|
||||
$(pyqt_use_enable sql)
|
||||
$(pyqt_use_enable svg)
|
||||
$(pyqt_use_enable testlib QtTest)
|
||||
$(pyqt_use_enable webchannel QtWebChannel)
|
||||
$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
|
||||
$(pyqt_use_enable websockets QtWebSockets)
|
||||
$(pyqt_use_enable widgets)
|
||||
$(pyqt_use_enable x11extras QtX11Extras)
|
||||
$(pyqt_use_enable xmlpatterns QtXmlPatterns)
|
||||
)
|
||||
echo "${myconf[@]}"
|
||||
"${myconf[@]}" || die
|
||||
|
||||
eqmake5 -recursive ${PN}.pro
|
||||
}
|
||||
python_foreach_impl run_in_build_dir configuration
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl run_in_build_dir default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installation() {
|
||||
local tmp_root=${D%/}/tmp
|
||||
emake INSTALL_ROOT="${tmp_root}" install
|
||||
|
||||
local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
|
||||
if python_is_python3; then
|
||||
rm -r "${uic_dir}"/port_v2 || die
|
||||
else
|
||||
rm -r "${uic_dir}"/port_v3 || die
|
||||
fi
|
||||
|
||||
python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic5
|
||||
rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic5 || die
|
||||
|
||||
multibuild_merge_root "${tmp_root}" "${D}"
|
||||
python_optimize
|
||||
}
|
||||
python_foreach_impl run_in_build_dir installation
|
||||
|
||||
dodoc ChangeLog NEWS
|
||||
|
||||
if use doc; then
|
||||
dodoc -r doc/html
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue