root
9 years ago
parent
8f69b8a11f
commit
48f2981395
@ -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
|
||||
}
|
||||
@ -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,10 +1,7 @@
|
||||
AUX cdrkit-1.1.11-cmakewarn.patch 346 SHA256 34f010470f28607b7c2bdbdf4c5539bfa59609ff7821cf663cffb49a85165828 SHA512 cf50ecaf4bfb834e407207327d7adcf7bf99426f881e7e590d46adb8e983639ecb67822346ce49f2bef5ac71998c772384e03078b2ef138183929c4e8d88feaa WHIRLPOOL 4aa20b075db2e49891f4c09bffaa06289f7ff396b69cf8163cec18c53ae139d126dcbf00e751dba6ce17fa345cfe6e2e9fcea1202a036949b05690ff5c9a5155
|
||||
AUX cdrkit-1.1.11-paranoiacdda.patch 16499 SHA256 57a86644f3276dd361acd109ccaa3be1e8878999691d3c91ac55137f3e0a82fe SHA512 5d70ff553dbc103a3bb2203950366f7be554fa2e92ec4f02f68e1cb70d19e453e42855612e1ffa387cf7ac2edcaedcbea40df44d8eced63be1580837ffa224a0 WHIRLPOOL f3557b0ffa17752c649411db7257110429ef24316b3f0931f8724f735008aec80124c6539dd529d07dfb6e437aaa1d531ac20c699cd544ee804ae4a083aa61f4
|
||||
DIST cdrkit-1.1.11-libcdio-paranoia.tar.xz 18664 SHA256 366727c6806f689fbb79b4bc64fe216c54428823f56f8375ff95529529231a8b SHA512 aa1e1a7a750872f80a363789573c7ccb7a30702e7770456a15abb7d2d7d2fc5f705fa8a006e022ac006d88ce985a848c2a7a33e52f1c1e91f13cac0349d8ac6e WHIRLPOOL 95610295a693bdd96c4b6f1c336b9cc2e24df38f07272691b437976228b355f6170c185c0fcc28739618147c7a2dce831765ef1598694f37c2afb60de114bac1
|
||||
DIST cdrkit_1.1.11.orig.tar.gz 1445133 SHA256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da SHA512 e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05 WHIRLPOOL e836af6a8786e38965e7238fddef3b4746234a2d96afaa18b5a23baa36c13506f78c1ec50d97b4bc7374daf5db78e9b7775184ec16f8513c10dc3b9b18a2d395
|
||||
EBUILD cdrkit-1.1.11-r1.ebuild 1567 SHA256 87564dd4d0ac70719d00a6b80bc4e01682ff4ea71ce0a6f6337a7b7f4dd6c1ff SHA512 35061ccde44c0b9e5906d0c93ae6c2e1bd2fea83fe3f7780578ec272f5099cae11d517a12521b08c500ac0a814ac6110a285d625006c73b2ae9935fa4f4df57b WHIRLPOOL 35a8e4625981d51b82083bebb4411f404264c4650ffb7c6de8f5a76d973cd3cf5fa274bc69240e69600f004db7d8ccb99a566c883a17b047da896e5d8195d798
|
||||
EBUILD cdrkit-1.1.11-r2.ebuild 1676 SHA256 67078e46fe2199d45dc26bd3896178e0c592eb01f31b30ec3e53dda0303f768a SHA512 0291950976fceb0a02fb804d5cadd6ef22925484a6d772e831f9c6f8d26ed8469d02adb0bf0f3cf18cd845e37800b572fd743428e3d344b2ce3d79f2338ca108 WHIRLPOOL 6da8de8a419a985223f6a76f35c45d5a0bc699a85319ab816c05d89c19d08bf78cf863221dcfcd31828a497d0d27163f1ed86370f9272381f65b63f80611ccc0
|
||||
EBUILD cdrkit-1.1.11.ebuild 1467 SHA256 a38813466498628643f0d28d31409ae511143df899f1a5aab03f8702858aae1b SHA512 3060bc30902b2e8fd9b42a6a127ba66cb67cdb5a943456fb9eb5833e1b1113c27611957c576c66fd4382313f46f8b1e88ba9306bcaf8f0a761e880297bb2c34e WHIRLPOOL b38eb278a4403ece7cdf1ec71665ded19adf808bff11c6e404effc6b0addba0078ce0ba81062214a442aa4e70c25a989598d2db9b835b6332b90a53019da4da3
|
||||
MISC ChangeLog 2274 SHA256 a5b82cca5d546facaa050ae7075f268fc1c4b61e96e86d6ea7ca39f33087c607 SHA512 ed182e701931b696e6a556fab2d5b89bdb5282077c0bd7f8875898d87b058f25d294aa8fdbb67a55a1366a4cb2aa88441776b0283dad93567749d9288030d51b WHIRLPOOL ae4c0161b8073d61a4c3aa5f751304974ccfab65a784f27101732463b3b6d5b51effc65a11c4662b888ce73a9d7bc90235e225abe8287abaa8c7d5a8ba94b88b
|
||||
MISC ChangeLog 2471 SHA256 57b6aab93210ec6bb1d1d143e6fda6fed58f6934e9f21a2a14111b477fc75b4d SHA512 16134faf514f7e0fe50869c93715170f63bf2687ddd4134c719e6c5777dffed5907afbdb903b0cefeef6d9fc149ec1a31e6ea127f8a889375483d6ce8a575a45 WHIRLPOOL 587da218fb4f2807216bfd2f696c5e11fa837c97fd63e97479b12d19f3d25916df51011ca9695c8bedec87601943dfd8c8847ebe0f6fff27c98e633969acbcd5
|
||||
MISC ChangeLog-2015 12894 SHA256 33755ad00a48360e5ba6acbd0bc7b5aa3c889f528b85a19f4964b0639706a433 SHA512 c152b6e8076ceb6c070c981e011517b95ebc9cbd404056695bd74cbc6fe20b2acd318ec9f76ae994e87de5bbe49eb82abd88ee64ec467124cbfa2001900feb5a WHIRLPOOL 65bfd12467d3e1d49ba18339af6b1b9473176192e2c38604ab5ebc6da343f162b09fbc550b95313bc1f8c4c163dc9c412d37a71ae0cc8287080b3bcac9696ebd
|
||||
MISC metadata.xml 247 SHA256 4d18b2a7e3f3237d29a2ea874c71c66abcda946f15bb7e15fa7cfc1d33731a24 SHA512 e44c538732e2825d46ea1e2d11314f6ae28228c8a69065bb4c25d80892984385b2807658c49c65d47c0fb52d44b5460eff8863fb0fcc9171da8ea1f68fe559e3 WHIRLPOOL 3349274d448313c17151d7131c9838a8bae74af9bb7e590fe65cf1ab0f115d93d0fff46b9f5f79eca5c0640d9cf5aa9c24137a3e89f035904d7e9b86a6eeb59e
|
||||
|
||||
@ -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,4 +1,4 @@
|
||||
DIST gspell-0.1.1.tar.xz 354932 SHA256 fef8cd89d220fc9ad6b69ff625ca2263a09c69ba56fcefcc90cf4422896e4c52 SHA512 aca0f3e9e9c8f3b4b7ebecc82aecb2f23782fad5192fb23a6737c23767cdff82c47e2d0d2d0d5540838f269d9a07895817ea405abada142b0f493306ad607087 WHIRLPOOL ebe1ba9fc0932eeec85191d012d1bc9734e69cfdf812ab09371aa8bdf5ef6ab49320cd80c81703ce8ec29737f558336a8505ef5ff945038b0a30ad61ec2918eb
|
||||
EBUILD gspell-0.1.1.ebuild 928 SHA256 d53dcb6ef81f45ceea7d37388582745fca7f6d76312a0e0dba2d0e1868473bc3 SHA512 cf07f2a877745484e5ebea16e79f38f0dd626bca1705b98796f3611a1bd58cbf5a0c6deff33294c8e489c77ac63bdbeb8623cde4c6b2bfe27d26bbdc58c5f2b1 WHIRLPOOL cc262f7a8f191ca3b0f2959e76428abecbbf251b38197e71ee5bc6e14e2f7285b769a7e7bd0dffc628f61ddf3b2b7f358d59758562a276a35e44cf50da8fa7fe
|
||||
MISC ChangeLog 318 SHA256 80b40a7dbbd9e7b3b10381c6adf4c038081038e1b90d8bab3a59399b83b97a69 SHA512 7fda383009b679f051e8aa9ac2ed8c64af70ade741598acfa685379c82d85b539d090f26f3b23dd02483cc137db4fba9932a5963a51ac85fe6cb4774a156c1db WHIRLPOOL 1d4e17fcc15422f8540beb562108cd138b6b08cda7033b7ee0ef149ebdb23ed1ae302e1fafaeecd08e24ca061877db0e6d968bd7f3201926b2284a72d4db4810
|
||||
DIST gspell-0.1.2.tar.xz 355128 SHA256 e8625c57296b6c178bc37659f023342f8edefaaa2c5eccf40de8bd479dbfa8f0 SHA512 8d9bd61f378929217b9461debb58df5070952539f30f6ee211cf13f856dfe5d5216468679a8d7d7b08df47ee6b7b45f25b2b6400212a83de9563e2bf175905bb WHIRLPOOL 44334ac608e9a66c5a6bf011ad21d7d368e29d7923079e947ed5484ae0c7847df1f29dc255979d0da844e1ecba16fa19dfae5b84aefd85287bc63de1465d3ffa
|
||||
EBUILD gspell-0.1.2.ebuild 928 SHA256 d53dcb6ef81f45ceea7d37388582745fca7f6d76312a0e0dba2d0e1868473bc3 SHA512 cf07f2a877745484e5ebea16e79f38f0dd626bca1705b98796f3611a1bd58cbf5a0c6deff33294c8e489c77ac63bdbeb8623cde4c6b2bfe27d26bbdc58c5f2b1 WHIRLPOOL cc262f7a8f191ca3b0f2959e76428abecbbf251b38197e71ee5bc6e14e2f7285b769a7e7bd0dffc628f61ddf3b2b7f358d59758562a276a35e44cf50da8fa7fe
|
||||
MISC ChangeLog 581 SHA256 0cb61d6fc175bf13addb278ffe6e494bc016151ce950f5bda0dd2295b3d37b14 SHA512 2a2e1018642d0e782a5c241dcd8396b4ecfb08886c2f5a61fe7da5a9df965ab54eac8196e9dc445e5b53db34669bb5e27a2c310bff4f3c84a9b33ad49d02cf62 WHIRLPOOL c413a6fb34286fee2d442345c887a830748398883f9300720665d59a3b1b9611ad21dd5860c8c217a263182cdb45782330b356a969aa5b718e7d4c9e1d688d28
|
||||
MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
|
||||
|
||||
@ -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,7 +1,7 @@
|
||||
DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
|
||||
DIST qpdf-5.1.2.tar.gz 7664268 SHA256 e9dd8d5d0a322078ffd573f057f03d24a734cc5b7dd925b089ebcb0f6e867bfd SHA512 be2fe3f1127532edc1b3d9af2d25df64c2c04c402cfef8d1ca5ed77129c2f17ef3435abb6c630b260ee4be8458984c0fbf0abfb6cda82ef4fa74dc23ca7a8864 WHIRLPOOL 5ec875f0ea73aa044c671f4ea9e5b69c74c188463ad58006a55ed395fed4e0184baad760486596586866b9f701ae5e211ac08ade1eff54028e20c6c1462ee629
|
||||
EBUILD qpdf-5.1.1.ebuild 1149 SHA256 5f63a765202c4279a9ef2ee9909348600e351a04e79348a2bc017b0e48d02c68 SHA512 43c0f55a9fa41e3fecccb31ab78058a0e0cb47b329a554e75e77963acaef5de2e4816d37972d6bc069166e319636660ced3c867bd662f3d8885b0ef201e9bd28 WHIRLPOOL fd1b20c705e3da3eed0be33c3b7fcea1097f6ff983984be296dfbd021f48b5ff6392de70b4bac46f7170c0cab968b463e3c89da8e4a4b77a1a917fb6773ae930
|
||||
EBUILD qpdf-5.1.2.ebuild 1158 SHA256 4db6707c61aa118918059378e5979115d037db54c68d96f63cada4d13f70933a SHA512 1b98baf42f10801b6e953c6edb5a614bb83d1e18e980039ede2888fdb6b73b8ceaa195e835f38cf5d94a2fd5c00c15fd9a3ada3634efad14773f9eb8e53cb755 WHIRLPOOL bb72e238e50f2b7759682b7d7f46aee34e6d1df3d762c04c32c8819165777cb74ab274fec4f3fc3db32f6b913a4eefdf06e3ffd660a87f83543bdc48e9d7d0d2
|
||||
MISC ChangeLog 2087 SHA256 a1d81bdb37ca3f3744dc3c2eb90869a21709b4593b0020c1ea08e6f063527227 SHA512 539ec2d3d8c269bb409d29ba504d3c8d1de1701cd3fea8f7bb30f0ef374a874ba55a32f864db9d108f0cb333d30daa64f75e92cb9b93e1f15bec2c4e5bcba2ea WHIRLPOOL 7333eb5ea888b1cd3553bf2cb24d68b59e4f730854a8841efd5188473c3e3bb4abcc96b7f0dfdba8257b4b53413726d26e8b03a821dc47300086deedc7fb02bc
|
||||
EBUILD qpdf-5.1.2.ebuild 1165 SHA256 225af90e25d4742ee9e6f4d20ac04baa8a8756c2585ed5fdea7b3e5791dea446 SHA512 02dfed01be0a06dc34c22c15f7df56f13087b03333b84b40457ba3530407a3a4886535a1a9f5e98ef8603f1b9b7e2496b641acd97a41e8e1965c84f32d7fb188 WHIRLPOOL 7fe72f13cee85560dc90943fc4b33fe00d2a2b3f95b3470d05fba7160cc0ff430c3d85bb32b900414e86c2d5c8b63fc6ad2dac1aa4dafcff46b24bec81f40457
|
||||
MISC ChangeLog 2174 SHA256 df98bba8d695c58f8ffbf1762b45e880f108b2b70dde7a0098c1d9a034519aec SHA512 6de0cd150fb5db45f7dc1592e438eca74cbe601590ce261d9609f3a8a8a68e1234741453e073e645b28e651c0f8e3e08d1093c7de6f90b005042a622995b51b0 WHIRLPOOL 90be8311d7e8ecc43873d9aa687fac23bb75e9151484abafcf829a27335d94fbf1a2ee9c8df4d3c3ee5e17db623fd56e27c44e9a138c050722a94457fb3dba83
|
||||
MISC ChangeLog-2015 6308 SHA256 9c969026385fd6ec61f8d31db32bf76fdfdba99079085fc0523da55e5f9b9e79 SHA512 c5ebd542a18be75c45a00e4c596ab869b85e24b5f316c49d2b1d3a3bb94865d183fd3cd65673e1282e5b7464f1b185f24c1447746e2b330cbb22365b93f0f78c WHIRLPOOL a29fc4ceb83cfcd87bd877f7e5c5f1acd3016aa4b946d91089b61f27da78d103e8aaa0ca79439c01a5419f226ddb86f6ac638d137f7cdbce63a64989e4057be1
|
||||
MISC metadata.xml 236 SHA256 fd67b9fa4a4225b994cecdd2bf95d9eed389301d3a08aa8bc97b67dda537bc34 SHA512 f4916472296618a6424a71cdb6c1ed9f63b467aafe7740c74eeef942f31784ab92b81de4e25af1d1fb07412f48df195db393861f7080c68c0994c1e85eb3a981 WHIRLPOOL 8789f77e8fab7ea1a11553a4adb4f6cecb86fc680ddc5bf106f59df825e73d949f11d2070f1faaf1022576a216d89b41a4cfd9e2f7bce6aa64bfba0b767ce063
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 WHIRLPOOL ae83df73b7682f05b6e048aa7908331ef5b1ece0f2a40dfb968bfadd1991611fb998edd33dcef2984f0e5259e11a597a1620f9025a1f2d98554bd96da52b18be
|
||||
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
|
||||
EBUILD xmlto-0.0.26.ebuild 1341 SHA256 b804ce6f2a449a33c11b683403bb44ffc00b34bf92405278e3d4c8931d3f0004 SHA512 e82f8e1327ad71c23ab1a46864a33f7d23c6ab37bdc99765b9467d109ff41120be5b27c041d6202a264eefc95533275a77a23a2c31e8343511e5188ec78e9647 WHIRLPOOL bdbe77cbbf1f53277a6d4516059e77affba9f86e4eeedffaa8b2b24136d34bce5609a07c9b92c04d54be47f7e4f60db62a38aee2562d34a2662a151867c8f1d9
|
||||
MISC ChangeLog 2102 SHA256 72eddc359a94b9017e2cc1d0289ce269b196302f800937876cf7dbd1eb6d3b2c SHA512 d41e312b1f69921e536bd3b7ff564e9a16e6fa7e7649c65ae309d031c0213e1b45e84dbc3e7afe0fcfaa83bdb7334bf1421018316b972c6f31b77856b45fe681 WHIRLPOOL e96b1759861bcf21cbba9ea7405e5bbf6b3ee2204135092728c93e565b55cb5704871953fa9f921fab8b8f13a6df5277af3f66f1f40425d3bf9e69051aeebc03
|
||||
EBUILD xmlto-0.0.28.ebuild 1357 SHA256 bfd7e778f091135f683a21715b8ba228993174fed2b4821f519c9c335dbea407 SHA512 f22a0403452e80136df7577de7918ec65e4365a387bd868a793640e23109deb5efe02ad223b718bf9dd91b42e1b99d743b7f8e4f058e5c546ee2a0e85fa5cefd WHIRLPOOL 2f3a5454febdf357256960220a8b5964213795e6708583cbcbf2fcbc77c63098249dec9192bb5e56892edb9bee3799968b4f0dfa15b2e41649019788f6b16647
|
||||
MISC ChangeLog 2324 SHA256 91e4b3ed1f0a83299062d231a49b7dfb899cdfc49716c80084c97aa5f8260b9d SHA512 392abb6700319369bd4cb2ba719261f254d4e2c18ee01f9c3090ef63af230fed30d19a7d3aea90c87055c5f8a6e4d8ac856a4814de68aa5b37d3697eceffe634 WHIRLPOOL c7965d728fb8cd120e9ad1e609b3f847a13baedcc2aeaea584cc652098d927cf45bf627bb18493dc162545e62b1aafc8e877eec1902bebbbd4c82aa61671ff2b
|
||||
MISC ChangeLog-2015 12889 SHA256 664e2564cde09621649415b636efae8d8b846c5eaef9dea2eccc321b519721dc SHA512 962a84dc23501ed2699789e4383ff4085b9d14353f6375254bbdec8de766a34b106eeb1f859a4f7dc28209311443c12911b7362e5520bf9a5e42d9700bfcb96c WHIRLPOOL 30dcbad24d85623a3cce1607d6a4181ee34a8f3847a2c1b0589035ac9ce511d2802c6f167c904dbb4985c70563d934265a55f03867751b542d40a613993bfbcf
|
||||
MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
|
||||
|
||||
@ -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,12 @@
|
||||
# ChangeLog for app-vim/salt-vim
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# (auto-generated from git log)
|
||||
|
||||
*salt-vim-20151119 (19 Nov 2015)
|
||||
|
||||
19 Nov 2015; Patrick McLean <chutzpah@gentoo.org> +metadata.xml,
|
||||
+salt-vim-20151119.ebuild:
|
||||
new package
|
||||
|
||||
Package-Manager: portage-2.2.24
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
DIST salt-vim-20151119.tar.gz 4009 SHA256 7ac88028007779a69355a946ffe7d8f93725bbb56b334e9cd601104cfc527646 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105 WHIRLPOOL db55f271b0268b3309be97a3d0047427534670d25b94fe26a9168de255563d4955eaf7d8659f09193a57940b587e06683756f57a005b77afe3bc9f83ca53028c
|
||||
EBUILD salt-vim-20151119.ebuild 570 SHA256 ebb32781f840af7e13acf1e4e1432bae74911aa63f4c0e3b91969d8475bf097b SHA512 3b59ee2510e7e9677dfcaed73594ae59d00697be311b896e9754b6a6f2b0051322170d6a85c741ccc37706f6b931f29203e1e54571b5b5df4fb7d43cc0a2373b WHIRLPOOL 408265b5d7e88995aa55bc894cfda66149a3142faa0d0e9b08806db3417328756a5cb5b5a78253a7791aa2699dfc7a69359d87dbed851a3b483efca4a6214677
|
||||
MISC ChangeLog 316 SHA256 e599c40d0e3d939eddad48ec87313c3c76ca209ebd1d005df6be46ca072ba7e3 SHA512 ddf59801b6a7bad95f5c4c9aaef0585ae6826297b5d72f1bc02eafe6f53954825ab81b9b122ab30a69fc9706ec25dda259672581bb68bf0600980dd2326daaa3 WHIRLPOOL 665752bd04ac876da0d8d6631a8aa40a992b6448e46f16b48cc6b637aefd7c36b2eddc322fd56e87c39dfc27fcf3aedc110257700feae0f7b583de769ed735b6
|
||||
MISC metadata.xml 253 SHA256 261507ab403845c9f9f587a8ba1f4dc9b16bb2f3fd96c51221ef92ca5f7da6a2 SHA512 4c71368130cb077d6f44ce59708780142bf742cf3757a8d555a2436cdb66ad5e48fa76983c7e9dd304b1b86b822fc7257a0ad822f704da6f77568068e5315466 WHIRLPOOL db4c9d86200f9d09611433b03e579aa09b9c0e0e0abd232c221fcdc04f8abb03f5b7ee2a2c829621f25f4f5c819dcbc3de468096b1f7e6dadf139e5b84bce471
|
||||
@ -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,8 +1,8 @@
|
||||
AUX my.cnf-5.5 5251 SHA256 7678212a0987ad081f03b17d05ac02e80ba8e78b7118c264de89d08d57c2ee68 SHA512 42b9e3ae1a99cb16b0a601d9138571ca8cdb3380fa5406d1a549415c1ed47f8341c367e93a7bb009a6a2538936be79e4a6358efd82f3226278b40c56075eab12 WHIRLPOOL 035f938c8d18a4a7f1b5a139a4736c7a59cfe8930fb6db58ded3f662cded1a580f846aaebfa8b4763ee8810870404ddcc13c46e3cd706b2046e84ca7c5fe29e6
|
||||
AUX my.cnf-5.6 5151 SHA256 d5d3478866503a1167733f9018b80d30fd74dee2d5cbf9543c7c39e4009ff09b SHA512 4ef5ab9ab81f6b0432242ab158d3fdc53e8b8640527f45f24e70bc39f1e461266487a29213095d78d796d12b5e9fed1fbe7433478e8324e16c3fca0f93617fb2 WHIRLPOOL 320b25a02100b0d5a8890402483cd38860ea191d8653cfdb98b7e80b854e9550f1dffb58b3d160c504f04f3b4ec1fec404338325c92b4a8b85bbe195434b33fa
|
||||
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
|
||||
EBUILD mariadb-galera-10.0.21.ebuild 4814 SHA256 1fcfd51558b20fce96c794bd083ab11df36354539a3500d2fbcdd035611f4644 SHA512 21abc0cf1ef96e440538160c720cd7788e9010457965fec13ccf7fd2ed6cc9f1d9ad336ecb8b865561aa574b34db0a6f5c983aff78f3b82e4228ef420061b340 WHIRLPOOL f1274d285d021a95677d8750aac968cecf8ab6c9d5fb44c1f781143e6bc4f1514cb45c67265db22fcfc46ff62d6d42a36d983d94700467e50c7f5dffafb9c543
|
||||
MISC ChangeLog 3052 SHA256 fd126327afe71cae953ef94d25e2b3ec14cdbd6d708ffa2237bfe3360a8ed3e9 SHA512 1fda834f51443e1c090fb379212fc7a05a4148af14738f11c50a2aed6774300bdf8798b98204280a813a4c4f5f9e96b425c80bd52f80afd6f2e3c8d4ef4aef7b WHIRLPOOL 0b174dc1fedef40b7ba2c7b8b3542828afa8d22d6d4f392751895e74a4d2fa0244c66b1d5269f6751a012813dc8b18e0984217c9a36610c32e018bf8e1dbbd1c
|
||||
EBUILD mariadb-galera-10.0.22.ebuild 4727 SHA256 3dfdee9e035df2998d7b87a78e9e45730e51ceeaa03f15a1e7d62f0b9e478578 SHA512 a5f4d6d625e2546e4793a3e000e8b24514d7007e35017a9f0d2f1134b6af42868e1734ec9784f1a661a377b3b9ff07865421075ace1c673fa5ad67fb6493c0dc WHIRLPOOL d2f7658f9acb6c0d5ff4d9b3cb8f97f4ec444a7593bcfbb52128604245bf18e32dff049e2943393c49d95b50518e9140f533afdf314efacb4feca95f868d2b84
|
||||
MISC ChangeLog 3379 SHA256 c365fb2f7ed1b5d55fcf55cf8e4bd1b8ff78e95e6ee0e25e389686a3555b1305 SHA512 5d668b550ea93cd46638959cf40e3f707c4c35dd049c082d40f5bba4745476a251e5476100e27e9327ef0fc6a9ae3526b205ca13dcfd19bed71625b29cb95b7a WHIRLPOOL ef1928a61476c5057230db5d0f1abef68bee287a3f0ae80b9bb96a98fc422b3f305031845ad9a0302f5f6591b0338ead5663a1028f339b7ffa002f29740da40f
|
||||
MISC ChangeLog-2015 2731 SHA256 3c6b2f3f6424f3d27bd3a8e96303e02a265a93e386f7b783243d2c417a6979b2 SHA512 cbdeb596fdf2a22b6e3bc4344a29ecfa939de2a9a175ee9a9c57cbaca988494cddb67d71a4dfeff3a848c2f4e7bfbda1c3fe4982f8a5005484d9b01377efdd79 WHIRLPOOL 3d2ce00f9a4546e2064b6375cac1fc3538ca8ee6dfc2cbb324e18b948ab824da0aedd4cf8543bf2017773c9e385fe3f0fa5c51afbe2101acc9334ca8f89d15af
|
||||
MISC metadata.xml 2077 SHA256 9d59f8593c9efdbd7d57ec71557c4266e329e48c178699140f700de15d6f5135 SHA512 0ccffa317a14000ecf2ed58d0eabb29e3193a239e61c7a8ac66c00e947722c4d1c98a928089f939da08a22d6a21c78696aebab87f0ef807033529ad83dc32c2c WHIRLPOOL 21ac2a9fa568cb858c0eae473769e2daff83028daf0e6ed8c57fab533ca8e09c58f55ffa930fee5d6d002a257c14cb24bf812fa2060a5ed40cf89b466074a7a3
|
||||
|
||||
@ -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,7 +1,6 @@
|
||||
AUX rome-0.9-build.xml-test-upstream.patch 527 SHA256 fc1771d6487d4f37c0f60ac33f50f6d9caa6a4e1b8db82a457e2f9fe1f6e40dd SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781 WHIRLPOOL 0f1408c68c085b59269b659f4f7e9e642243c5bb1441d1089459d149f9975527a3eb11326f392e84f8299d65cdef17452ee380736fabc9bfeba0778bd840d452
|
||||
DIST rome-0.9-src.zip 248755 SHA256 c8e8674de5b204d02ce8b5e33fa5f848f23ee4e4746c60ebc7ccf52a1ac97a4f SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff WHIRLPOOL 69554087947fec155478d5d8cd820976a878d1055dfbeebcb567893c2e943ae89f247dd578ad94d6c88cba2ee8d3faa7fac05556790157f7e2e95ed1cd752404
|
||||
EBUILD rome-0.9-r1.ebuild 1077 SHA256 424a4d3b61bf6a20e585060d626ea58bf6ec27370e17a4a1195fc2c51d916214 SHA512 b2f2b95706e2f21df8614b261793ee94e2ff532e1038213ed3c6e5f645af4b378254b85b6399ea68b45c86c0472f4ebffaf295230b3ffdd4ede8ea0c6d6e0ff0 WHIRLPOOL 909ae9ebdcb94f49ced0f38818227853b8a14f132697c7d7501187de8d7aaa85a6a4626e713b5177fc22f73dfc2520f370420ca2aa1fd9fe06458026dccc0369
|
||||
EBUILD rome-0.9.ebuild 1116 SHA256 728e6c99ed65142d0b1199599de8050ed2992ec368df318258dc5ec59454cf8a SHA512 9dfd51d95343eb10875741c7fd47d83b28135d9b87e8da5027c7ca201761038b15a78cfadae59d3de206db432830094d8852bf55cd1204ebdabf86f565cb9e35 WHIRLPOOL fe7d5f65a81031042abd6f632d9fc1bd9b4fde8abbb92e54c14f9b1a75dc8bfe1d6a15255a67669b509419e46fd2a54b13903b6da52a0b14a61cf999decc480a
|
||||
MISC ChangeLog 2506 SHA256 fd935285fb0555c5c01b5fe4c13f93c34fbaa78eff6a6170615f7562d1db34d1 SHA512 0ee2ca6a0776c61383466b91c3ccc26e7105d42737eef160c79ec6eb75743bb3c47de3f5bfc7eb818d3011bec7245eb9e542ad0a32cdfbcb1e696386ecdd4cd9 WHIRLPOOL 0af63b43f3361d2719f98698f5db5fbc00d0519b7b6dff8948f63c4ab80e237a90e170d81c21a1388ade6e2081ad471f1143dca6793bb3448ab35b7a1c40d4cf
|
||||
EBUILD rome-0.9-r2.ebuild 1088 SHA256 8fd65979ba98b0ea7161b2b5f0e340311a35ec08108bf2dd3dbd1461d25f1944 SHA512 a09718dff4ed0bcb678655386d18def61e6fe1a0891f2d67836909f17ff78c36c0fc838f2d13d74b3a7d4e34361636697e0204711724296a74ba45c8b7d07379 WHIRLPOOL 93af220cf0f7cd2a4777dab34cc8d9806f83d675e0b3c61fcd44a3e06d5c5b78a089fedf0f2db2496ac9e7ade3925e97b3ca2ea7bc107b214e7720b6b33c7f13
|
||||
MISC ChangeLog 3207 SHA256 0f5076b0a3d02e014b6252b51ef43184fd52853278f1765a00d41419a402dab0 SHA512 f8d476329e4a26c1c73c0849cf29cee1e4837b4ee84633f6fd9ea695153dd99d262dcefd3242c25c73c5779582c563b42a3a4497b118bcc3180264e4a6ef29d4 WHIRLPOOL d58ed29a7259ab9b01268ccfc004e3760a624f479f1ab079c9004a1ba7feffcb18e653770f3c64c9737ca9e1ec3d4e157ae2042d1421d0d1a4a9ef59b7248992
|
||||
MISC ChangeLog-2015 1128 SHA256 e439ed6b0bd626e1025605e80881ef51389a08588f34ddde75ad0fb1f0460324 SHA512 c871d8c719b06cfa0437f93a2adc13a9c0a591d0650e309768532134a4d07d8343784f14422d501f00e9796126ded91629ce5d0a126a5b1b1d0a68200ea19095 WHIRLPOOL 35d0cb452d7adc2ddfea734ff854947279c4ec2c21c8621ade2d79ae06e036f114ddfab4da7f4e79d1fd35b537b2c0e8e1e9b185072380a1394015cee4d04e91
|
||||
MISC metadata.xml 217 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 SHA512 c831b55f48fe5072b2af6e2e4731462838edc100a568248719a12de95fe7716198d12e159aa3025294040c26841607e04ccc87451be220e667fdc1146f4656f8 WHIRLPOOL 0d6782469b5a96acc07542adcdc15ac99674231aa8f6384bad12fd50cfd7994afeebef4cae6269599588193aa8bbcbd9d986579baa5a33581d89edad6de8634c
|
||||
|
||||
@ -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
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
DIST ws-commons-util-1.0.1-src.tar.gz 24838 SHA256 cede9cc3136e09fedfe8ccdf61e3e963afb3c54ccc833262316ceb103b74df88 SHA512 4eefe61daf462105ca8cfb8ec42ef42ef414d1426b201da044fe9a72e9ab7d3fd34bd80d19d8f6220f1f91d9de7cab3d8d2dec4c267784ba3d3bbd69a1c62c4c WHIRLPOOL 545b790e44023d8f0a0fb81de587ea6846eb7ae7af9dbc31f6921d06268d1474ea055134b8485113e991fbe5bcd09ecffff7f48efe99434b5c41e50e0c715e31
|
||||
EBUILD ws-commons-util-1.0.1-r1.ebuild 624 SHA256 b759ef6774cea2fa82e83227e4a2a546fd924c109af788563cb177bb79fe00dd SHA512 c46c5b1d153efb1caebff4a12691e623da6797f5436ce7673ab0a7ad1ee47e5234e8586a94ca686fcf59301c32573cb1d24afbbd69c7dfc202ddb21015924488 WHIRLPOOL 876667b4f5da031e96c0b66bfe1a32ebac2764a15b5973661698188235815d7a093461b0ceb16a82b6ec639f548edd44cd4b8f846f9aa2c0557fa4652c165f77
|
||||
EBUILD ws-commons-util-1.0.1.ebuild 1006 SHA256 7f1d39fb442ddf086959931e401878166f08778f2f37c4b5da398baf93901243 SHA512 d4af7fd6694598c771ed2fdd4c23ad7c78386e0441890520ae41191297c7fd79e7b6987993f505a19edebb7ddce51897e697796ce1da3ea9bf2fd93bd860d7ee WHIRLPOOL 19685c5bd86c7b6ce08dc9b833b033263806aefb6a16d760eed98f255c3023c894ed990f66d60ca165ae70ea2dee0f8b0e85cf7829af822ec4af02b6fd9cbdb6
|
||||
MISC ChangeLog 2074 SHA256 a8686890572198521cacb5726d2a9ad45f9a387764215c2a09ead33377114622 SHA512 fac9616d713cf0c5a0a9a67e51e6813b692f008c5348caadb435c7cfc1171fc518c961d383d99692d365df2e40214f37ab9374374f4323cdc0993d81ae216ac2 WHIRLPOOL 7e0d58917a74dd7f04b7dd65b1a9c85fcc135013e0392a4350bbf49d5b17f6ddbd889645682d2b229aabea0b3f3980732dc7c2666c3ae1c911c0dc6ea72101b4
|
||||
MISC ChangeLog 2385 SHA256 6218175c0d115790d732e62632a93fb710f2f4c10763639d14e85456bcb48847 SHA512 dfb1a786bf441b822fa68ff072256434361bac72ae18f3e3e7b563d52e1e01666f0166e2caf5069577dc6817fb64e2a0f0b3455e798b2dcfc5bbf96540ec2d12 WHIRLPOOL 7f92e2f91aaf150ae2b7c30cb06a08b7bd2ed0b370c0c51356b3410c72bba720490f03f437d7948fc54c71e4884003555787eb933dd95d13b185fea4481c2765
|
||||
MISC ChangeLog-2015 742 SHA256 086ab774130690e497e57a05a089f2552b01b1ce82c84f8962e9bedda1ea42ef SHA512 5360437f9a165e772ad44a4269551e6af3782ee06feea8e8a8593311adee7de7732d2b034305639726e28a9883a889282df528454d4677d32a05e740821b2b9c WHIRLPOOL 896935dda1c80cf1b48d3c94eeaff11143be4478409b7ab9b01ce82ba5d86a20f2a79bd25e80ad6462810981898f274f1accf83e4928eb2192aabcf72722a83f
|
||||
MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
|
||||
|
||||
@ -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,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,7 +1,7 @@
|
||||
DIST coffee-script-1.10.0.tar.gz 813684 SHA256 1747a315002e69c2d459c2e618ac51d13b383a37792f05bdab155b3c943d2ef2 SHA512 4bf6d3e396a3c5eb2b4eb385216ed930f09a3b6d88c3939813ceea21c32b18706640f73d75619528d5ef12a90888e713385ecabbb8d424c06f52eb71e88230ec WHIRLPOOL 216652595821cad1f0c388ff614ceab48de4cec6669f6da98e0607ae94ae16960071d2e18d060b7c6ebd6035dc515f5c0f418940826555752320d672714d0d21
|
||||
DIST coffee-script-1.9.3.tar.gz 810246 SHA256 8c8faeeee21ed3cdde727fcc08ed6062d9d0233679317f026160aee8bfa85060 SHA512 660826e27f842ed67ec6ef59f734087c95585e03b6b8c6d25c8ecfc567f3161f59034e730b61e5f806edaaa7ec6c805ad6d14902857aaf09cf6193b0fe14f506 WHIRLPOOL c99eab68344609b5352ee7b7f59ebb4e6c90d1454c3cf37ac8cb00b1add0637e2e56084864ae54cdeb494a6966a97e896bf95760e1e8dbe1b26c0fc75abd5a41
|
||||
EBUILD coffee-script-1.10.0.ebuild 1148 SHA256 f74b18edd7b63acb67b81a69156f85c8e4c2d6ea8ea8810409a9e568527ea713 SHA512 9c5f9569b9f3119ed8e04ef7654dfe52668de1e7f149556c3f5e284897d84b50fb5fe7d1e555356ad85fd50e3401c989afcac213d621789236f0da7dc0488a3b WHIRLPOOL 62492c6ccdad3273b2891da3bea908a2b805eb1e2407723bb9d0fd3d0f5cdbbcef1fdb041cec30983b18e51d74168fb0d1de9c4b1fbd35a13f87d08b602a0304
|
||||
EBUILD coffee-script-1.9.3-r1.ebuild 1288 SHA256 4388241cb2cdadb6a42b116232b9b42945ecf102796589e259dd81e1158d0de7 SHA512 7ae17145ced73d918ed801c3067196a2713763a02fc1a21ef71dd613b21c7fae1a97839ccca46b30bcba229d7a565e5142c9791d3a0cd317ced1a7d4e3a8578b WHIRLPOOL f613f637ca8182f376e6676a44c881d86a98762336f8b16bfcb759a4bac1b9f6309fa4af1094e1f2cfd1bc96e3c475131a8721c17fff59035c0788339b3eb13a
|
||||
MISC ChangeLog 2250 SHA256 6c6c1992436a768c6e0d8812191f91b090d6af17e95088b0216741e31a3dde78 SHA512 260c2ea18da6046a9121b1beb7bb0878517de4d4c03add0f5390fa3c1e4a5924c4a9be38481ca3675158c30de62f4210ddd07421ab04632376aa4b0ced512e57 WHIRLPOOL 917a0827226158367575e9931c5469ee2f0e29f422323bd9512c2f07c7cb4f6e768d6b4fb92ae6db0aba68eb82b4ebff4a5724402a332d92cbfe46bbda2ce23e
|
||||
EBUILD coffee-script-1.9.3-r1.ebuild 1287 SHA256 5811e5295e289f3635ed97a3fa164b32830f16abd4f401e8763f10e11109f785 SHA512 590c15eff8151c140e60c531f527c24522f902b0a0ba9061b3467eab3c75e1cd6ac52ee1c052da2ff4bd57bc5cb89c78c297c0c366a803095a3d62c2bda8697a WHIRLPOOL d25e3796ccf44ebe210f1d7e367eca324d09a96f371878518ca9d0ff4ed266e36422fe3d265589d6329035699799f3bd58d7728603202b397bee11b67808aa8f
|
||||
MISC ChangeLog 2445 SHA256 63a702d87ed35c4164a6399e25e4bc965b665b2727fcfbf03caa3c4989384a3e SHA512 1478c1a7dc52f9190fd7b4d474463ec33fff910c307048fb3fe938c4b3d7f333481771e2b794068c22fc538f17d7119206b964c82c86da4ab522f7cd21bc9e1b WHIRLPOOL 37b793595895a0862c186fa80d491e398a9db218a4e814cbff5c7e7d81e16202325b52c2e1aa38d673e50ebc23feaf79a58c65a50252655dd2e4845bfafe6c2e
|
||||
MISC ChangeLog-2015 643 SHA256 5eda3d5951a1434f324267dda178ecc04ea84b2fd09f007f2536b0db8c94fef2 SHA512 dd734804274716e285dfbdecc285b1c5148c4ac51c0392cf97ad69acd795866226022205813efc5ecde4ff2753dcf153c0f0752043abd623c023347afea1c6e4 WHIRLPOOL c7b4544184b6827f52633d1e9844bec26321c006560c667c93e12ad6d3bb1e42185e3383587f370d8376162699640ed7bfe74d47bbbdbbfe8109fe0219d79078
|
||||
MISC metadata.xml 329 SHA256 92504467411a749e06164f43fe4d3cb4e94a1a549215b5ad68771e498383c00a SHA512 81b495a3bbebfa553afba0308589aa6f6be1ec55a1c972246e942bab2a8df85c6b09c05458fbfb127257054c5c4796e4f42e723bb2eeab7484e45286f768d403 WHIRLPOOL 22a239b98ba2bd525ce2763d886724bf51f004c25133b208b7624945568183e163a247ad503033d6dfdc07fb7ec9ae4b8c87cfabb234714f016ea8fb980787b6
|
||||
|
||||
@ -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
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue