Sync with portage [Mon Nov 14 09:14:13 MSK 2016].

mhiretskiy 635
root 8 years ago
parent 2aa8e16520
commit 56e0360620

@ -1 +1,2 @@
DIST accerciser-3.14.0.tar.xz 3213916 SHA256 f5a5915d475e9241396414ccd167724c88807e77e69151cf0b40b32bd57d0574 SHA512 bafc30e15fe0121f8abc64239e48834ab06a03fe64fc368a221d167a13079721962441e0343f17934dde57cd012c9132374739297c23c79c567fc36cc60fb07d WHIRLPOOL 4b9679145ad1ad7f8d059dfdfb12d372c1b27780532a7c19cc25b66bbe0a13db5b864548e332b74e0327eebb488622ae471514046737b738c15624969d8df7a8
DIST accerciser-3.22.0.tar.xz 3060756 SHA256 883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1 WHIRLPOOL b30adca45e02d5fb684adbbbb4a3b608d8703fad0e5e5b9ed690f339419792e3bcd9ef486ca4508ceb7c870ae227243b383daf3cac0af1f6bc39323f0c28b1ef

@ -0,0 +1,65 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python{3_4,3_5} )
PYTHON_REQ_USE="xml"
inherit gnome2 python-r1
DESCRIPTION="Interactive Python accessibility explorer"
HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
LICENSE="BSD CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
>=app-accessibility/at-spi2-core-2.5.2:2
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
>=x11-libs/gtk+-3.1.13:3[introspection]
dev-libs/atk[introspection]
>=dev-libs/glib-2.28:2
dev-libs/gobject-introspection:=
>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf[introspection]
x11-libs/libwnck:3[introspection]
x11-libs/pango[introspection]
${PYTHON_DEPS}
"
DEPEND="${RDEPEND}
app-text/yelp-tools
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
"
src_prepare() {
gnome2_src_prepare
# Leave shebang alone
sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
python_copy_sources
}
src_configure() {
python_foreach_impl run_in_build_dir gnome2_src_configure
}
src_compile() {
python_foreach_impl run_in_build_dir gnome2_src_compile
}
src_install() {
installing() {
gnome2_src_install
python_doscript src/accerciser
}
python_foreach_impl run_in_build_dir installing
}

@ -39,9 +39,16 @@ src_prepare() {
# This package really should upgrade to using pcre's .pc file.
cat <<-\EOF >"${T}"/pcre-config
#!/bin/sh
[ "${flag}" = "--version" ] && set -- --modversion
exec ${PKG_CONFIG} libpcre "$@"
#!/bin/bash
flags=()
for flag; do
if [[ ${flag} == "--version" ]]; then
flags+=( --modversion )
else
flags+=( "${flag}" )
fi
done
exec ${PKG_CONFIG} libpcre "${flags[@]}"
EOF
chmod a+x "${T}"/pcre-config
}

@ -39,9 +39,16 @@ src_prepare() {
# This package really should upgrade to using pcre's .pc file.
cat <<-\EOF >"${T}"/pcre-config
#!/bin/sh
[ "${flag}" = "--version" ] && set -- --modversion
exec ${PKG_CONFIG} libpcre "$@"
#!/bin/bash
flags=()
for flag; do
if [[ ${flag} == "--version" ]]; then
flags+=( --modversion )
else
flags+=( "${flag}" )
fi
done
exec ${PKG_CONFIG} libpcre "${flags[@]}"
EOF
chmod a+x "${T}"/pcre-config
}

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -1,8 +1,5 @@
DIST puppet-3.7.3.tar.gz 2594007 SHA256 4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637 SHA512 74baae5525090ac6213cc8ef27ad74cde5372ac08f8d5c11ed2a4bd2f6ed2b9940fa141ddb705328785611cbd0d32d70a40f1b44dbc9b167e11f0ad1051efc8b WHIRLPOOL 7ff9909c6bfb4d83caf8fbfcac11dff27c3a7583a68336040d404745bf35f4676933b6494d2c65c1f87fc9de5928ac9ae79f81e0b0a356088c0be5d8526ad42a
DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 SHA512 868a80df0e07b68f0de2fe31dcc55ab1f9da160d66e151298ecb11c17382c13939a88f2925e387a14d2713be5375c2606f26ff52c11dd214874d71f17b3c0617 WHIRLPOOL d5dfb53a062532427ed32acb834517d8eaeba9f53e85bccb79de93f5f947e7d4df472b40c0bed91703b8977ac99c9764944290627815dc60430a8cfe2098519b
DIST puppet-3.8.1.tar.gz 2633982 SHA256 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 SHA512 a188c9f5baad3260c7cc2ea26d79d6655b504809deefe90a9e9ed81d3a66c1e10cc0b72b63c9ef34e5dd9266d3588cb7dc0d55e7a762f5fa5bbdc1ebe347979d WHIRLPOOL fd476519032d7b346a8813e4c73826daafc69fc4f7a8924efb35dfc6d691a7734322a7746008484df3f62f32865b23c6203f38662f354057aff5e75c20bf1965
DIST puppet-3.8.2.tar.gz 2637591 SHA256 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 SHA512 b209a7b009e1d9510753a7484e620c3fb34a83058e8dbc2d9de2c33aca97e813fa85046d9b4de2fad9cb8fb7db257d46c221dd6eb9c0f86e1343cce6e1a9ca5a WHIRLPOOL 55bc7ece7ee918fab29e0f116f8ebc58322b42c07285a8965f2acae9dcff9c13e90cfc9c3c2537f9d21c663062015482fd48e24a1505fc7445fb6b949bc805bc
DIST puppet-3.8.3.tar.gz 2638669 SHA256 bbdf5e32428fe005ea7279e9396bfcdf2c9b112763595fbfed48fb599108df7f SHA512 8f955c68556a835de738cf5f34cefd916392145853cd59108af26cb5c23b28740cdd078ac33b3171280ac691884c073c53d230641c88484561ac463bca094da6 WHIRLPOOL 2ff3181a3ea11d4b25d8499c3984f22e530e94ccc5a87e668b758a55f3c9091ca3d344afc62fb0f08b1835d5668b2f90e26ddf2560111fb52c0292b511301cd2
DIST puppet-3.8.4.tar.gz 2639537 SHA256 19e83ebbbf0933a9df6696255d7ff4d65e3daba1ed8dacf87f16a87ae40a7ad7 SHA512 bcd4251f56292529973c1694d4c1b0673e01cc6525c3fda8415e3b69b03861f0c1c168911b47c1372eeecd54c5eb2efc67ae23fd9ca0329b821b6f1b1e4e641a WHIRLPOOL 8088df2bcfa2f2ed5be8f0769c45d70d5b8496c59f84217299d0df9b143f7551c2fb3a86edc467dfdaca6574a57e7fe4a8b89e9a376e991385650f6ce4dc9f21
DIST puppet-3.8.5.tar.gz 2640987 SHA256 ecba7c70e32c3da6682f9c4706c01cc588a5614759a864446e9fbd2449c6305c SHA512 9c17508032ab4306c0ec1d2e79e1c3548a1da6c875c61155e597642cc901d0639eb99543084a6f88c5826b5faa5af83eaf936672e80a32bf27cf45f545e7d859 WHIRLPOOL 46a227365316c913f16a3b02bc13fd3b47ace497c406a14309d480c49881665d0ca9a0d86fae8a3761d6beb159b222dfdd033e0c1cdb2aaeadd62741c232a50f
DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273

@ -1,191 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.7.0
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
dev-ruby/json
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
ruby_add_bdepend "test? ( dev-ruby/mocha )"
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# Avoid Rails specs to avoid this dependency and because they
# currently fail against Rails 4.1.
find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
rm -r spec/unit/rails || die
rm spec/unit/parser/collector_spec.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
# Avoid failing spec that need further investigation.
rm spec/unit/module_tool/metadata_spec.rb || die
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
#${RUBY} install.rb --destdir="${D}" install || die
}
all_ruby_install() {
all_fakegem_install
#systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
newinitd "${FILESDIR}"/puppet.init-r1 puppet
# Initial configuration files
insinto /etc/puppet
# Location of log and data files
keepdir /var/log/puppet
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
rm "${ED}/etc/puppet/auth.conf"
else
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fi
fperms 0750 /etc/puppet
fowners :puppet /etc/puppet
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
if [ \
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
] ; then
elog
elog "Please remove deprecated config files."
elog " /etc/puppet/puppetca.conf"
elog " /etc/puppet/puppetd.conf"
elog " /etc/puppet/puppetmasterd.conf"
elog
fi
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
elog
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
elog "http://docs.puppetlabs.com/guides/upgrading.html"
elog
fi
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}

@ -1,191 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.7.0
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
dev-ruby/json
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
ruby_add_bdepend "test? ( dev-ruby/mocha )"
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# Avoid Rails specs to avoid this dependency and because they
# currently fail against Rails 4.1.
find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
rm -r spec/unit/rails || die
rm spec/unit/parser/collector_spec.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
# Avoid failing spec that need further investigation.
rm spec/unit/module_tool/metadata_spec.rb || die
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
#${RUBY} install.rb --destdir="${D}" install || die
}
all_ruby_install() {
all_fakegem_install
#systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
newinitd "${FILESDIR}"/puppet.init-r1 puppet
# Initial configuration files
insinto /etc/puppet
# Location of log and data files
keepdir /var/log/puppet
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
rm "${ED}/etc/puppet/auth.conf"
else
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fi
fperms 0750 /etc/puppet
fowners :puppet /etc/puppet
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
if [ \
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
] ; then
elog
elog "Please remove deprecated config files."
elog " /etc/puppet/puppetca.conf"
elog " /etc/puppet/puppetd.conf"
elog " /etc/puppet/puppetmasterd.conf"
elog
fi
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
elog
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
elog "http://docs.puppetlabs.com/guides/upgrading.html"
elog
fi
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}

@ -1,191 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.7.0
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
dev-ruby/json
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
ruby_add_bdepend "test? ( dev-ruby/mocha )"
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# Avoid Rails specs to avoid this dependency and because they
# currently fail against Rails 4.1.
find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
rm -r spec/unit/rails || die
rm spec/unit/parser/collector_spec.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
# Avoid failing spec that need further investigation.
rm spec/unit/module_tool/metadata_spec.rb || die
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
#${RUBY} install.rb --destdir="${D}" install || die
}
all_ruby_install() {
all_fakegem_install
#systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
newinitd "${FILESDIR}"/puppet.init-r1 puppet
# Initial configuration files
insinto /etc/puppet
# Location of log and data files
keepdir /var/log/puppet
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
rm "${ED}/etc/puppet/auth.conf"
else
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fi
fperms 0750 /etc/puppet
fowners :puppet /etc/puppet
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
if [ \
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
] ; then
elog
elog "Please remove deprecated config files."
elog " /etc/puppet/puppetca.conf"
elog " /etc/puppet/puppetd.conf"
elog " /etc/puppet/puppetmasterd.conf"
elog
fi
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
elog
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
elog "http://docs.puppetlabs.com/guides/upgrading.html"
elog
fi
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}

@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
ruby_add_rdepend "

@ -1,3 +1,4 @@
DIST file-roller-3.20.3.tar.xz 1432400 SHA256 6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9 SHA512 afa7a7e49b357f11a8e8c2678c02f9ce1c20e3bef4c64be0930342127b11dc271369958b634985fb1305fe913182a2e5a63326afc2d1839ab116ad773ee668c3 WHIRLPOOL aa96b158971ed0105f416fc5e83d9a8810d5ececa30a5b9761b9caeeaa607e50ce635629c4aaf05fabb9391959db149cd8b4b2d69c1c765c78001e9f2a11c467
DIST file-roller-3.20.4.tar.xz 1432484 SHA256 d9346bb90d5f3296bf22f93a81f5bcd2e974620a4d81efea882db2b3db3b66c1 SHA512 a536876bed13838c4e3f2a2c4fb269ec814afb6fd6ff538e1de4b9872588e0bf2c6df7eece6fd93e79752b2bb8c17c2492b022cea3d84716c2f2cda49aeea130 WHIRLPOOL fb25b905e8b6ac98a838a156849e4bd1a0d5e6889d384e7ea963d1cd99cb62515582459c2fc7ddb15c4a8ee53277a41cefb50385cc6d2e3a5e4a115295ecd0c7
DIST file-roller-3.22.1.tar.xz 1423712 SHA256 8106791dcecbd2ab64194f4aeb5cb709a15e9e0d28e6470528c7bf56969be552 SHA512 118b33e70dea357d3320ee8a1e13d161499682725a981806a6333918fb4f76eed8c10aa22db5d797cada893e38dea4d280d84f6fcd3303b4ea0782ef45295939 WHIRLPOOL 385fecf68f39413bd8b80ffdda9ce991ad84950c84017d1ede52f8a7d1abcc468c33f3356a42dd41ccf03817b8ebbdef305023510b1ee52334d12f9545cb45e9
DIST file-roller-3.22.2.tar.xz 1423992 SHA256 27158cdcc366f82100312b1e0a02ad1f3aa7a6c32d4eba68fc5a2a8829685df9 SHA512 cd4ed804d7291868acd351b4f1b5d3fca48c1e493c37d9e20463dfbca11fe9859a2d1b8fd6d13c8ac2d4f2967f0734e6ff07efc08ca292f73640e631bea2fb22 WHIRLPOOL f79c7f50f62cf88100577721e7b5017fcc90cc2ed86946dfda40e0addea1ecb995e3536aa5901fcccac78f86e5269f459b04462163dcde5301d84e3e6c331fd9

@ -0,0 +1,89 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
inherit eutils gnome2 readme.gentoo-r1
DESCRIPTION="Archive manager for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="nautilus packagekit"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
# pango used in fr-window
RDEPEND="
>=app-arch/libarchive-3:=
>=dev-libs/glib-2.36:2
>=dev-libs/json-glib-0.14
>=x11-libs/gtk+-3.13.2:3
>=x11-libs/libnotify-0.4.3:=
sys-apps/file
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/pango
nautilus? ( >=gnome-base/nautilus-3 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}
dev-util/desktop-file-utils
>=dev-util/intltool-0.50.1
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
"
# eautoreconf needs:
# gnome-base/gnome-common
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
${PN} is a frontend for several archiving utilities. If you want a
particular archive format support, see ${HOMEPAGE}
and install the relevant package. For example:
7-zip - app-arch/p7zip
ace - app-arch/unace
arj - app-arch/arj
cpio - app-arch/cpio
deb - app-arch/dpkg
iso - app-cdr/cdrtools
jar,zip - app-arch/zip and app-arch/unzip
lha - app-arch/lha
lzop - app-arch/lzop
rar - app-arch/unrar or app-arch/unar
rpm - app-arch/rpm
unstuff - app-arch/stuffit
zoo - app-arch/zoo"
src_prepare() {
# File providing Gentoo package names for various archivers
cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die
gnome2_src_prepare
}
src_configure() {
# --disable-debug because enabling it adds -O0 to CFLAGS
gnome2_src_configure \
--disable-run-in-place \
--disable-static \
--disable-debug \
--enable-magic \
--enable-libarchive \
$(use_enable nautilus nautilus-actions) \
$(use_enable packagekit)
}
src_install() {
gnome2_src_install
readme.gentoo_create_doc
}
pkg_postinst() {
gnome2_pkg_postinst
readme.gentoo_print_elog
}

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -1,2 +1,2 @@
DIST kakoune-0_pre20160620.tar.gz 370523 SHA256 4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512 c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c WHIRLPOOL c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
DIST kakoune-0_pre20160826.tar.gz 377788 SHA256 c54c7b7ed4cca371477bfa6bf9e17ef8fe343debd83c5ae165538899e968a05f SHA512 98a679a9ecf22cb5ea4648b766164c8fc72d818d6b839b35e8c66ca2b73c109e5dfadf6745ae25a9eda9e426b4775d2f3c677417217c31cdabe7919ef1bf0839 WHIRLPOOL bd13b26bda0c1f92edd7c77f691ff5d2b576dc17dcba453272e5e4eac66edaabc9f0f7f4aaf626b5f2475e275eafa7bee38197d49033db85b11a5e7c87df75f0
DIST kakoune-0_pre20161111.tar.gz 394608 SHA256 3c12a79360b83490429952ace10de1f80cff88ea8e8ffe7e27d1b6a00f2a63e7 SHA512 7d7893800519626f2eff2a4dccd8e0c36e374b67e419c4f7682b1e9c14817e2bdae30d6cbb49db22a9b2ffd5a5e5fa1558c3e731eea225c804bff3bf5027d18c WHIRLPOOL 190c427f691c9cf903bf86390606ba71295ea2d21d91f739f71818ba15da01bf946c6c08fdfa912be773e95900a2a6203aaa17fdf8e74d98712bf45f7884f860

@ -0,0 +1,47 @@
diff --git a/src/Makefile b/src/Makefile
index 966582d..cdac6ba 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,10 +4,10 @@ pedantic ?= yes
ifeq ($(debug),yes)
CPPFLAGS += -DKAK_DEBUG
+ CXXFLAGS += -g
suffix := .debug
else
ifeq ($(debug),no)
- CXXFLAGS += -O3
suffix := .opt
else
$(error debug should be either yes or no)
@@ -27,8 +27,6 @@ mandocs := $(docs:.asciidoc=.gz)
PREFIX ?= /usr/local
DESTDIR ?= # root dir
-NCURSESW_INCLUDE ?= /usr/include/ncursesw
-
bindir := $(DESTDIR)$(PREFIX)/bin
sharedir := $(DESTDIR)$(PREFIX)/share/kak
docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
@@ -52,10 +50,9 @@ else ifeq ($(os),DragonFly)
LDFLAGS += -L/usr/local/lib
else ifneq (,$(findstring CYGWIN,$(os)))
CPPFLAGS += -D_XOPEN_SOURCE=700
- LIBS += -lncursesw -lboost_regex -ldbghelp
+ LIBS += -lboost_regex -ldbghelp
else
- LIBS += -lncursesw -lboost_regex
- CPPFLAGS += -I$(NCURSESW_INCLUDE)
+ LIBS += -lboost_regex
LDFLAGS += -rdynamic
endif
@@ -64,7 +61,7 @@ ifeq ($(static),yes)
LDFLAGS += -static -pthread
endif
-CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
+CXXFLAGS += -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
all : kak
kak : $(objects)

@ -6,7 +6,7 @@ EAPI=6
inherit flag-o-matic toolchain-funcs vcs-snapshot versionator
REF="9124851029700026bc937c81da829fbadcc5b29d"
REF="85ce5db08a6461f5fef13cc4f6b090c858698d91"
DESCRIPTION="Selection-oriented code editor inspired by vim"
HOMEPAGE="https://github.com/mawww/kakoune"
@ -15,10 +15,10 @@ SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
LICENSE="Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
IUSE="debug static"
RDEPEND="
sys-libs/ncurses:=[unicode]
sys-libs/ncurses:0=[unicode]
dev-libs/boost:=
"
DEPEND="
@ -27,9 +27,9 @@ DEPEND="
${RDEPEND}
"
PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
PATCHES=( "${FILESDIR}/${PN}-0_pre20161111-makefile.patch" )
pkg_pretend() {
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]]; then
if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
die "Clang or GCC >=5.0 is required to build this version"
@ -40,11 +40,11 @@ pkg_pretend() {
src_configure() {
append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
export CXX=$(tc-getCXX)
tc-export CXX
export debug=$(usex debug)
S="${WORKDIR}/${P}/src"
export static=$(usex static)
}
src_install() {
emake DESTDIR="${D}" PREFIX="/usr" docdir="${D}/usr/share/doc/${PF}" install
emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
}

@ -13,10 +13,10 @@ EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
LICENSE="Unlicense"
SLOT="0"
KEYWORDS=""
IUSE="debug"
IUSE="debug static"
RDEPEND="
sys-libs/ncurses:=[unicode]
sys-libs/ncurses:0=[unicode]
dev-libs/boost:=
"
DEPEND="
@ -25,9 +25,9 @@ DEPEND="
${RDEPEND}
"
PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
PATCHES=( "${FILESDIR}/${PN}-0_pre20161111-makefile.patch" )
pkg_pretend() {
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]]; then
if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
die "Clang or GCC >=5.0 is required to build this version"
@ -38,11 +38,11 @@ pkg_pretend() {
src_configure() {
append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
export CXX=$(tc-getCXX)
tc-export CXX
export debug=$(usex debug)
S="${WORKDIR}/${P}/src"
export static=$(usex static)
}
src_install() {
emake DESTDIR="${D}" PREFIX="/usr" docdir="${D}/usr/share/doc/${PF}" install
emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
}

@ -1,8 +1,17 @@
First part is from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
First part is adapted from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
--- a/common/db.h 2012-08-27 06:55:01.000000000 -0400
+++ b/common/db.h 2012-08-27 07:17:48.000000000 -0400
--- a/common/db.h
+++ b/common/db.h
@@ -4,7 +4,7 @@
#define DB_BUFFER_SMALL ENOMEM
#endif
-#if DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1
+#if (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 3
#define db_env_open(env,path,flags,mode) \
(env)->open(env, path, flags, mode)
#define db_env_remove(env,path,flags) \
@@ -16,7 +16,10 @@
(env)->remove(env, path, NULL, flags)
#endif

@ -1 +1,2 @@
DIST qxmledit-0.9.4-src.tgz 18834064 SHA256 ef78d66c6214a1af2d95ea98c441cad5be91e3064faca4bf9edef952ed6d0133 SHA512 ff479ca8930bd2cbeaa26d09eeafcdff4520f0e62c79c8f8c854ed119967a3c11555a5aa8f92edda2be53adb6d6511c6ebb8e2aeb274a922964eed4fd9e0b056 WHIRLPOOL 9917e8b205dad00d2150afa4c3b660454fa529cf347b937a55b905295c37977221854b8b4ea76701f57d4ceb9289be245bcdde4c294168062eee2a0fafa62164
DIST qxmledit-0.9.5-src.tgz 19653021 SHA256 ac6341f1ceb004e64e070c6e99b5c3be3cfdf7d81a5556e79d99beb2f9eab43f SHA512 d54672af9154dcae4486b72a14024f23bcec834dae9c6ec082496b532d750d2411f64ae0dfbd66da7817027e2f4cd6ed1bc7e065ceb822ef2e4d60d14a308609 WHIRLPOOL 37e32dcca088693d5ffb591e812a93b3d8815eaab341a45d5c2a0278c0db18dc9788593ed7dd8ca8411d5d0ac1034c8a0dac8bd9c1b3a09fe22697dd97716d98

@ -0,0 +1,68 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit eutils fdo-mime qmake-utils
DESCRIPTION="Simple Qt-based XML editor"
HOMEPAGE="http://qxmledit.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS NEWS README )
src_prepare() {
default
# bug 568746
sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
}
src_configure() {
export \
QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
eqmake5
}
src_install() {
emake INSTALL_ROOT="${D}" install
doicon install_scripts/environment/icon/qxmledit.png
domenu install_scripts/environment/desktop/QXmlEdit.desktop
einstalldocs
}
pkg_postinst() {
fdo-mime_desktop_database_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
}

@ -6,7 +6,7 @@ EAPI=6
KEYWORDS="~amd64"
EGO_PN=github.com/docker/${PN##*-}/...
SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz
https://github.com/gemnasium/logrus-airbrake-hook/archive/v2.1.1.tar.gz -> logrus-airbrake-hook-2.1.1.tar.gz
https://github.com/airbrake/gobrake/archive/v2.0.8.tar.gz -> gobrake-2.0.8.tar.gz

@ -0,0 +1,21 @@
From: Li Qiang <address@hidden>
The 'fs.xattr.value' field in V9fsFidState object doesn't consider the
situation that this field has been allocated previously. Every time, it
will be allocated directly. This leads a host memory leak issue. This
patch fix this.
--
1.8.3.1
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 75ba5f1..a4c7109 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3269,6 +3269,7 @@ static void v9fs_xattrcreate(void *opaque)
xattr_fidp->fs.xattr.flags = flags;
v9fs_string_init(&xattr_fidp->fs.xattr.name);
v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
+ g_free(xattr_fidp->fs.xattr.value);
xattr_fidp->fs.xattr.value = g_malloc(size);
err = offset;
put_fid(pdu, file_fidp);

@ -0,0 +1,27 @@
Author: Li Qiang <liqiang6-s@360.cn>
Date: Mon Oct 17 14:13:58 2016 +0200
9pfs: fix information leak in xattr read
9pfs uses g_malloc() to allocate the xattr memory space, if the guest
reads this memory before writing to it, this will leak host heap memory
to the guest. This patch avoid this.
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 26aa7d5..bf23b01 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3269,8 +3269,8 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque)
xattr_fidp->fs.xattr.flags = flags;
v9fs_string_init(&xattr_fidp->fs.xattr.name);
v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);
g_free(xattr_fidp->fs.xattr.value);
- xattr_fidp->fs.xattr.value = g_malloc(size);
+ xattr_fidp->fs.xattr.value = g_malloc0(size);
err = offset;
put_fid(pdu, file_fidp);
out_nofid:

@ -0,0 +1,92 @@
From 7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6 Mon Sep 17 00:00:00 2001
From: Li Qiang <liqiang6-s@360.cn>
Date: Tue, 1 Nov 2016 12:00:40 +0100
Subject: [PATCH] 9pfs: fix integer overflow issue in xattr read/write
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The v9fs_xattr_read() and v9fs_xattr_write() are passed a guest
originated offset: they must ensure this offset does not go beyond
the size of the extended attribute that was set in v9fs_xattrcreate().
Unfortunately, the current code implement these checks with unsafe
calculations on 32 and 64 bit values, which may allow a malicious
guest to cause OOB access anyway.
Fix this by comparing the offset and the xattr size, which are
both uint64_t, before trying to compute the effective number of bytes
to read or write.
Suggested-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-By: Guido Günther <agx@sigxcpu.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/9pfs/9p.c | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index ab18ef2..7705ead 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1637,20 +1637,17 @@ static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp,
{
ssize_t err;
size_t offset = 7;
- int read_count;
- int64_t xattr_len;
+ uint64_t read_count;
V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);
VirtQueueElement *elem = v->elems[pdu->idx];
- xattr_len = fidp->fs.xattr.len;
- read_count = xattr_len - off;
+ if (fidp->fs.xattr.len < off) {
+ read_count = 0;
+ } else {
+ read_count = fidp->fs.xattr.len - off;
+ }
if (read_count > max_count) {
read_count = max_count;
- } else if (read_count < 0) {
- /*
- * read beyond XATTR value
- */
- read_count = 0;
}
err = pdu_marshal(pdu, offset, "d", read_count);
if (err < 0) {
@@ -1979,23 +1976,18 @@ static int v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp,
{
int i, to_copy;
ssize_t err = 0;
- int write_count;
- int64_t xattr_len;
+ uint64_t write_count;
size_t offset = 7;
- xattr_len = fidp->fs.xattr.len;
- write_count = xattr_len - off;
- if (write_count > count) {
- write_count = count;
- } else if (write_count < 0) {
- /*
- * write beyond XATTR value len specified in
- * xattrcreate
- */
+ if (fidp->fs.xattr.len < off) {
err = -ENOSPC;
goto out;
}
+ write_count = fidp->fs.xattr.len - off;
+ if (write_count > count) {
+ write_count = count;
+ }
err = pdu_marshal(pdu, offset, "d", write_count);
if (err < 0) {
return err;
--
2.7.3

@ -0,0 +1,25 @@
From: Li Qiang <address@hidden>
In v9fs_link dispatch function, it doesn't put the 'oldfidp'
fid object, this will make the 'oldfidp->ref' never reach to 0,
thus leading a memory leak issue. This patch fix this.
Signed-off-by: Li Qiang <address@hidden>
---
hw/9pfs/9p.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 8b50bfb..29f8b7a 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -2413,6 +2413,7 @@ static void v9fs_link(void *opaque)
if (!err) {
err = offset;
}
+ put_fid(pdu, oldfidp);
out:
put_fid(pdu, dfidp);
out_nofid:
--
1.8.3.1

@ -0,0 +1,27 @@
Author: Li Qiang <liqiang6-s@360.cn>
Date: Mon Oct 17 14:13:58 2016 +0200
9pfs: fix memory leak in v9fs_write
If an error occurs when marshalling the transfer length to the guest, the
v9fs_write() function doesn't free an IO vector, thus leading to a memory
leak. This patch fixes the issue.
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Greg Kurz <groug@kaod.org>
[groug, rephrased the changelog]
Signed-off-by: Greg Kurz <groug@kaod.org>
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index d43a552..e88cf25 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -2090,7 +2090,7 @@ static void coroutine_fn v9fs_write(void *opaque)
offset = 7;
err = pdu_marshal(pdu, offset, "d", total);
if (err < 0) {
- goto out;
+ goto out_qiov;
}
err += offset;

@ -95,7 +95,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
)
!gtk2? (
x11-libs/gtk+:3
vte? ( x11-libs/vte:2.90 )
vte? ( x11-libs/vte:2.91 )
)
)
infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
@ -359,6 +359,11 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-CVE-2016-8669-2.patch # bug 597108
epatch "${FILESDIR}"/${P}-CVE-2016-8909.patch # bug 598044
epatch "${FILESDIR}"/${P}-CVE-2016-8910.patch # bug 598046
epatch "${FILESDIR}"/${P}-CVE-2016-9102.patch # bug 598328
epatch "${FILESDIR}"/${P}-CVE-2016-9103.patch # bug 598328
epatch "${FILESDIR}"/${P}-CVE-2016-9104.patch # bug 598328
epatch "${FILESDIR}"/${P}-CVE-2016-9105.patch # bug 598328
epatch "${FILESDIR}"/${P}-CVE-2016-9106.patch # bug 598772
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY

@ -93,7 +93,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
)
!gtk2? (
x11-libs/gtk+:3
vte? ( x11-libs/vte:2.90 )
vte? ( x11-libs/vte:2.91 )
)
)
infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )

@ -5,7 +5,7 @@ EAPI="5"
DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
HOMEPAGE="https://www.gentoo.org"
SRC_URI="https://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"
SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<maintainer type="project">

@ -21,7 +21,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="app-arch/xz-utils"

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -6,7 +6,7 @@ EAPI=4
DESCRIPTION="Manages timezone selection"
HOMEPAGE="https://www.gentoo.org"
SRC_URI="https://dev.gentoo.org/~ottxor/distfiles/${P}.tar.xz"
SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
</pkgmetadata>

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -10,7 +10,7 @@ WXWRAP_VER=1.4
DESCRIPTION="Eselect module and wrappers for wxWidgets"
HOMEPAGE="https://www.gentoo.org"
SRC_URI="https://dev.gentoo.org/~ottxor/dist/${P}.tar.xz"
SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<maintainer type="person">

@ -12,7 +12,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc +iconv recode static-libs"
RDEPEND="

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

@ -1,4 +1,4 @@
# Copyright 1999-2007 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 x86"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~x86"
IUSE="doc hyperestraier mysql ruby python static-libs subversion"
RDEPEND=">=dev-libs/glib-2.4

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<maintainer type="person">

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -1,3 +1,2 @@
DIST gramps-3.4.5.tar.gz 10444188 SHA256 940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3 WHIRLPOOL 4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228
DIST gramps-3.4.9.tar.gz 10190446 SHA256 402a8616efeda730d10941690edb6dfb2719c3f7383e376a404577412676a8f3 SHA512 f15481b3791a98568a0a7f734ef5eb9a1149cf76c5e83f1270eee41bcf3518713391cb271a54177e6e6bbaf78da098d7a7a2a807266c971c1331dbb9d29d5fbb WHIRLPOOL 834777cb20ee7a3ef7a2397eef5a0e70caab02666cf127ba01f6310ac68463ea67733883cd3ca63676b9541dc104da818986d7b249950ae6a30415f5fa1bddee
DIST gramps-4.2.4.tar.gz 18683901 SHA256 25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499 WHIRLPOOL ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0

@ -1,79 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit gnome2 python-single-r1
DESCRIPTION="Genealogical Research and Analysis Management Programming System"
HOMEPAGE="http://www.gramps-project.org/"
SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome reports spell webkit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-python/bsddb3[${PYTHON_USEDEP}]
dev-python/pygoocanvas[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
gnome-base/librsvg:2
sci-geosciences/osm-gps-map
x11-misc/xdg-utils
gnome? (
dev-python/gconf-python[${PYTHON_USEDEP}]
dev-python/libgnome-python[${PYTHON_USEDEP}]
)
spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
reports? ( media-gfx/graphviz )
webkit? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/libiconv
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch"
)
src_prepare() {
# Fix install path, bug 423315 for example
einfo "Fix installation path"
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/Makefile.in || die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/docgen/Makefile.in || die
einfo "Fix wrapper script"
sed "s;@datadir@;$(python_get_sitedir);" \
-i gramps.sh.in || die
einfo "Fix icon location"
sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
python_fix_shebang .
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-mime-install \
PYTHON="${EROOT}"/usr/bin/python2
}

@ -1,78 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
GCONF_DEBUG="no"
inherit eutils gnome2 python-single-r1
DESCRIPTION="Genealogical Research and Analysis Management Programming System"
HOMEPAGE="http://www.gramps-project.org/"
SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome reports spell webkit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-python/bsddb3[${PYTHON_USEDEP}]
dev-python/pygoocanvas[${PYTHON_USEDEP}]
>=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
gnome-base/librsvg:2
sci-geosciences/osm-gps-map
x11-misc/xdg-utils
gnome? (
dev-python/gconf-python[${PYTHON_USEDEP}]
dev-python/libgnome-python[${PYTHON_USEDEP}]
)
spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
reports? ( media-gfx/graphviz )
webkit? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/libiconv
virtual/pkgconfig
"
src_prepare() {
epatch "${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch"
# Fix install path, bug 423315 for example
einfo "Fix installation path"
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/Makefile.in || die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/docgen/Makefile.in || die
einfo "Fix wrapper script"
sed "s;@datadir@;$(python_get_sitedir);" \
-i gramps.sh.in || die
einfo "Fix icon location"
sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
python_fix_shebang .
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-mime-install \
PYTHON="${EROOT}"/usr/bin/python2
}

@ -1 +1,2 @@
DIST abiword-3.0.1.tar.gz 11144990 SHA256 e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 SHA512 c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf WHIRLPOOL 7d06614673d7275df57999783205b98a41f0588c7eadfdd4d29e30dd52cf1c44aa5b07e90d47ece328119da9877aec7754511a40768b6ea844c3683abefdcad7
DIST abiword-3.0.2.tar.gz 11154333 SHA256 afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 WHIRLPOOL c916d144a68f6581927c6d75d12cac2ae39e213e1ca928f190c19ffd8843cb0c463e671ec4ef6b21ab0d4c49a084e04a8b7eeed75bf45fdc0f76dfa4391ff898

@ -0,0 +1,139 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools gnome2
DESCRIPTION="Fully featured yet light and fast cross platform word processor"
HOMEPAGE="http://www.abisource.com/"
SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux"
IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus"
# You need 'plugins' enabled if want to enable the extra plugins
REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )"
RDEPEND="
>=app-text/wv-1.2
>=dev-libs/fribidi-0.10.4
>=dev-libs/glib-2.16:2
>=dev-libs/libgcrypt-1.4.5:0=
dev-libs/libxslt
>=gnome-base/librsvg-2.16:2
>=gnome-extra/libgsf-1.14.18:=
>=media-libs/libpng-1.2:0=
virtual/jpeg:0
>=x11-libs/cairo-1.10[X]
>=x11-libs/gtk+-3.0.8:3[cups?]
calendar? ( >=dev-libs/libical-0.46:= )
eds? ( >=gnome-extra/evolution-data-server-3.6.0:= )
goffice? ( >=x11-libs/goffice-0.10.2:0.10 )
introspection? ( >=dev-libs/gobject-introspection-1.0.0 )
map? ( >=media-libs/libchamplain-0.12 )
plugins? (
collab? (
>=dev-libs/libxml2-2.4
>=net-libs/loudmouth-1
net-libs/libsoup:2.4
net-libs/gnutls:= )
grammar? ( >=dev-libs/link-grammar-4.2.1 )
math? ( >=x11-libs/gtkmathview-0.7.5 )
ots? ( >=app-text/ots-0.5-r1 )
readline? ( sys-libs/readline:0= )
thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
wordperfect? (
app-text/libwpd:0.10
app-text/libwpg:0.3 )
wmf? ( >=media-libs/libwmf-0.2.8 )
)
redland? (
>=dev-libs/redland-1.0.10
>=dev-libs/rasqal-0.9.17 )
spell? ( >=app-text/enchant-1.2 )
!<app-office/abiword-plugins-2.8
"
DEPEND="${RDEPEND}
dev-lang/perl
>=dev-libs/boost-1.40.0
virtual/pkgconfig
collab? ( dev-cpp/asio )
"
PATCHES=(
"${FILESDIR}"/${PN}-2.8.3-desktop.patch
"${FILESDIR}"/${PN}-2.6.0-boolean.patch
"${FILESDIR}"/${PN}-3.0.0-librevenge.patch
"${FILESDIR}"/${PN}-3.0.0-link-grammar-5-second.patch
"${FILESDIR}"/${PN}-3.0.0-libwp.patch
"${FILESDIR}"/${PN}-3.0.1-libwps-0.4.patch
"${FILESDIR}"/${PN}-3.0.1-fixwps.patch
"${FILESDIR}"/${PN}-3.0.2-fix-installing-readme.patch
"${FILESDIR}"/${PN}-3.0.2-fix-nullptr-c++98.patch
)
src_prepare() {
gnome2_src_prepare
eautoreconf
}
src_configure() {
local plugins=()
if use plugins; then
# Plugins depending on libgsf
plugins=(t602 docbook clarisworks wml kword hancom openwriter pdf
loadbindings mswrite garble pdb applix opendocument sdw xslfo)
# Plugins depending on librsvg
plugins+=(svg)
# Plugins not depending on anything
plugins+=(gimp bmp freetranslation iscii s5 babelfish opml eml wikipedia
gdict passepartout google presentation urldict hrtext mif openxml)
# inter7eps: eps.h
# libtidy: gsf + tidy.h
# paint: windows only ?
use collab && plugins+=(collab)
use goffice && plugins+=(goffice)
use latex && plugins+=(latex)
use math && plugins+=(mathview)
use ots && plugins+=(ots)
# psion: >=psiconv-0.9.4
use readline && plugins+=(command)
use thesaurus && plugins+=(aiksaurus)
use wmf && plugins+=(wmf)
# wordperfect: >=wpd-0.9 >=wpg-0.2
use wordperfect && plugins+=(wpg)
fi
gnome2_src_configure \
--enable-plugins="${plugins[*]}" \
--disable-static \
--disable-default-plugins \
--disable-builtin-plugins \
--disable-collab-backend-telepathy \
--enable-clipart \
--enable-statusbar \
--enable-templates \
--with-gio \
--without-gnomevfs \
--without-gtk2 \
$(use_enable debug) \
$(use_with goffice goffice) \
$(use_with calendar libical) \
$(use_enable cups print) \
$(use_enable collab collab-backend-xmpp) \
$(use_enable collab collab-backend-tcp) \
$(use_enable collab collab-backend-service) \
$(use_with eds evolution-data-server) \
$(use_enable introspection) \
$(use_with map champlain) \
$(use_with redland) \
$(use_enable spell)
}

@ -0,0 +1,13 @@
diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100
+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100
@@ -23,6 +23,9 @@
#ifndef PD_STYLE_H
#define PD_STYLE_H
+#ifndef FALSE
+#define FALSE 0
+#endif /* FALSE */
#include "ut_types.h"
#include "pt_Types.h"
#include "ut_xml.h"

@ -0,0 +1,12 @@
diff -u -r abiword-2.8.3.orig/abiword.desktop abiword-2.8.3/abiword.desktop
--- abiword-2.8.3.orig/abiword.desktop 2010-04-02 19:59:58.000000000 +0200
+++ abiword-2.8.3/abiword.desktop 2010-04-08 09:07:01.000000000 +0200
@@ -6,7 +6,7 @@
Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
StartupNotify=true
X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
Name=AbiWord
GenericName=Word Processor
Comment=Compose, edit, and view documents

File diff suppressed because it is too large Load Diff

@ -0,0 +1,36 @@
From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 18:43:14 +0200
Subject: [PATCH] fix libwp? detection
---
plugin-configure.m4 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugin-configure.m4 b/plugin-configure.m4
index 54998fb..92e4ec2 100644
--- a/plugin-configure.m4
+++ b/plugin-configure.m4
@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
AC_SUBST([BMP_LIBS])
-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
+wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
wpg_deps="no"
if test "$enable_wpg" != ""; then
@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
AC_SUBST([AIKSAURUS_LIBS])
-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
+wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
+wordperfect_wps_pkgs='libwps-0.3'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
--
2.4.2

@ -0,0 +1,19 @@
--- a/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
+++ b/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
@@ -223,6 +223,7 @@
pErr = NULL;
}
+#ifdef DEAD_DEBUG_CODE
// for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
// {
// pErr = pT->m_vecGrammarErrors.getNthItem(i);
@@ -231,6 +232,8 @@
UT_UTF8String sErr = linkage_get_violation_name(linkage);
// UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
linkage_delete(linkage);
+#endif // DEAD_DEBUG_CODE
+
for(i=0; i< vecMapOfWords.getItemCount(); i++)
{
AbiGrammarError * p = vecMapOfWords.getNthItem(i);

@ -0,0 +1,31 @@
--- abiword-3.0.1/plugin-configure.m4.orig 2016-04-10 14:22:18.271356761 +0100
+++ abiword-3.0.1/plugin-configure.m4 2016-04-10 14:24:22.493303398 +0100
@@ -1355,7 +1355,7 @@
AC_SUBST([BMP_LIBS])
-wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
+wpg_pkgs="libwpg-0.3 $gsf_req"
wpg_deps="no"
if test "$enable_wpg" != ""; then
@@ -1469,8 +1469,8 @@
AC_SUBST([AIKSAURUS_LIBS])
-wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.4'
+wordperfect_pkgs="libwpd-0.10 $gsf_req"
+wordperfect_wps_pkgs='libwps-0.3'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
@@ -1499,7 +1499,7 @@
PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
[
- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
+ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
WPS_DEFINE=" -DHAVE_LIBWPS"
])

@ -0,0 +1,54 @@
From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 21:48:02 +0200
Subject: [PATCH] adapt to libwps 0.4
---
plugin-configure.m4 | 2 +-
plugins/wordperfect/plugin.m4 | 2 +-
plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugin-configure.m4 b/plugin-configure.m4
index 2757f4a..093fbcb 100644
--- a/plugin-configure.m4
+++ b/plugin-configure.m4
@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.3'
+wordperfect_wps_pkgs='libwps-0.4'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
index 0aadbaf..bc32d48 100644
--- a/plugins/wordperfect/plugin.m4
+++ b/plugins/wordperfect/plugin.m4
@@ -1,6 +1,6 @@
wordperfect_pkgs="libwpd-0.10 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.3'
+wordperfect_wps_pkgs='libwps-0.4'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
index bd19971..3e69f79 100644
--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
AbiWordperfectInputStream gsfInput(input);
libwps::WPSKind kind;
- libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
+ libwps::WPSCreator creator;
+ bool needsEncoding = false;
+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
if (kind != libwps::WPS_TEXT)
confidence = libwps::WPS_CONFIDENCE_NONE;
--
2.4.2

@ -0,0 +1,19 @@
Change the installation directory of the readme.txt file
to match standard FHS conventions.
--- a/user/wp/Makefile.am
+++ b/user/wp/Makefile.am
@@ -9,10 +9,11 @@
EXTRA_DIST = \
$(wp_DATA)
+doc_DATA = \
+ readme.txt
+
wpdir = $(ABIWORD_DATADIR)
wp_DATA = \
- readme.txt \
- readme.abw \
system.profile \
system.profile-am-ET \
system.profile-ar \

@ -0,0 +1,34 @@
Replace 'nullptr' by NULL in order to allow compiling in C++98 mode.
See also: https://bugs.gentoo.org/show_bug.cgi?id=599618
--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
@@ -180,7 +180,7 @@
if (m_styleBg) {
g_object_unref(m_styleBg);
}
- m_styleBg = XAP_GtkStyle_get_style(nullptr, "GtkButton"); // "button"
+ m_styleBg = XAP_GtkStyle_get_style(NULL, "GtkButton"); // "button"
// guess colours
// WHITE
GdkRGBA rgba2;
@@ -627,7 +627,7 @@
_setProps();
cairo_save (m_cr);
- GtkStyleContext *context = nullptr;
+ GtkStyleContext *context = NULL;
switch(c) {
case GR_Graphics::CLR3D_Background:
context = m_styleBg;
--- a/src/wp/ap/xp/ap_Dialog_Spell.cpp
+++ b/src/wp/ap/xp/ap_Dialog_Spell.cpp
@@ -251,7 +251,7 @@
UT_return_val_if_fail (m_Suggestions, false);
// get suggestions from spelling engine
- const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = nullptr;
+ const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = NULL;
if (checker->checkWord(m_pWord, m_iWordLength) == SpellChecker::LOOKUP_FAILED)
{

@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@ -394,6 +394,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
if use kde; then
# bug 544108, bug 599076
export QMAKEQT4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages

@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@ -394,6 +394,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
if use kde; then
# bug 544108, bug 599076
export QMAKEQT4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages

@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@ -393,6 +393,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
if use kde; then
# bug 544108, bug 599076
export QMAKEQT4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required

@ -1,11 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="3"
PYTHON_DEPEND="2:2.6"
EAPI="6"
PYTHON_COMPAT=( python2_7 )
inherit distutils
inherit distutils-r1
DESCRIPTION="GTK Utility to help manage Portage's user config files"
HOMEPAGE="https://gna.org/projects/gpytage"
@ -13,12 +13,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
RDEPEND=">=dev-python/pygtk-2.14"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<maintainer type="project">

@ -6,7 +6,7 @@
<name>Marios Andreopoulos</name>
</maintainer>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -1,4 +1,2 @@
DIST zsh-completions-0.18.0.tar.gz 232872 SHA256 b94eb63d044920a4ea6d5d51ae4f237f21b0c3174f3c58ff464b5284477cdb7a SHA512 68510ce1823c59318ffa7ff85b3c0385d056912c68e6513fbbcaf49c3757cca69531e7f3dfb5f75424f8bbf3722ebebc00170b10588de619cdd1353d6754d1ac WHIRLPOOL e48a24b3d612b4797264d28c02b4b151dd5f8bdac981ed24a47ce1490d4ce3372dcaae4ac7d9aeb4dd6d0cbe56c5a3752bec2f83561eb9aa23f43816a31d7e1d
DIST zsh-completions-0.19.0.tar.gz 231152 SHA256 8108692b9f9bfb630b9b96a8ff57e87a9437fd183599972f6b0a60f8552c89e0 SHA512 f105b77a3941caf681861369d32558d0fe54d15761400c3ed8e827c86e924cc5449d03a60a9ff7f7cb5dab275ab2f4b6c6a316f8af8b649eff8c20da0b9b21f6 WHIRLPOOL 4db5e4c178c8c742d01fe49227152e7e427f98d8d29258bc6a1c5b236a91dd7a39ad96da60cf01e7654af2f66696f1d24062acdacef9bbeb5745215cd25f1783
DIST zsh-completions-0.20.0.tar.gz 193091 SHA256 c697d1d6bd093b5f761f9171a28fa9de2133fee929028bbe5ae2b71352800ad5 SHA512 1b494cc8ce3b549018ca27847a52ff94fd6520a6990c6b65527e34d54cc4ed4e4a17153bb23af50c6dd7a3d236d2389c850fe73e849624f111d5a39143dd7f0f WHIRLPOOL e959894b78224fe1862889838e97f3b85ed3fa9195782acf51a7574e4cf183719e7dc1d11c5d0e340dcea200ee86fe32d808171ce755909669667b6ea03465a5
DIST zsh-completions-0.21.0.tar.gz 202122 SHA256 be465b1850d66a90d536460aeba1502aa31829b663023f255e81693420ba7048 SHA512 a8b8c7fed8a126906560f86f29d5e0d6372a7da47f40037d74813ff2a796a0a011da4635bf941ee04bc0e741558bd56247ca0e2c69ce38896e24ef101483e547 WHIRLPOOL 8913628898c7083f59072c416dd202ce4fce90f14baf454e40830f4f36dcb6872c015c536935ef3ab2746955c0987e5f50a97b817455d8ce4ff0ea15f7e8a0be
DIST zsh-completions-0.22.0.tar.gz 204849 SHA256 cfb8c4af39c3df4c2d087f5829dc6f0c1cfcc2b2110bcc7e47b59cff5615a79f SHA512 46c2db28cb58d9abecd51172978c210b3de3b26956e8f8a6a26ebeeacd105ee904b79e2079b046c53b56e6aacd98fb34ef31e1deacdd9230763931f2ae806001 WHIRLPOOL 5e2ee49660a32671de98507e7408901f9f2e717c52fc5bc8c9985f2cff530ac1f4312bd950907bf84f1832ef1b83295633ce0cc066fb765318a08c9cf2c9383f

@ -1,39 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
else
SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Additional completion definitions for Zsh"
HOMEPAGE="https://github.com/zsh-users/zsh-completions"
LICENSE="BSD"
SLOT="0"
RDEPEND="app-shells/zsh"
src_prepare() {
# Already included in dev-util/ninja
rm src/_ninja || die
}
src_install() {
insinto /usr/share/zsh/site-functions
doins src/_*
}
pkg_postinst() {
elog
elog "If you happen to compile your functions, you may need to delete"
elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
elog "to your shell."
elog
}

@ -1,34 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
else
SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Additional completion definitions for Zsh"
HOMEPAGE="https://github.com/zsh-users/zsh-completions"
LICENSE="BSD"
SLOT="0"
RDEPEND="app-shells/zsh"
src_install() {
insinto /usr/share/zsh/site-functions
doins src/_*
}
pkg_postinst() {
elog
elog "If you happen to compile your functions, you may need to delete"
elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
elog "to your shell."
elog
}

@ -15,9 +15,10 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aspell +hunspell static-libs zemberek"
COMMON_DEPENDS="dev-libs/glib:2
COMMON_DEPENDS="
dev-libs/glib:2
aspell? ( app-text/aspell )
hunspell? ( >=app-text/hunspell-1.2.1 )
hunspell? ( >=app-text/hunspell-1.2.1:0= )
zemberek? ( dev-libs/dbus-glib )"
RDEPEND="${COMMON_DEPENDS}

@ -1,2 +1,3 @@
DIST gspell-0.1.2.tar.xz 355128 SHA256 e8625c57296b6c178bc37659f023342f8edefaaa2c5eccf40de8bd479dbfa8f0 SHA512 8d9bd61f378929217b9461debb58df5070952539f30f6ee211cf13f856dfe5d5216468679a8d7d7b08df47ee6b7b45f25b2b6400212a83de9563e2bf175905bb WHIRLPOOL 44334ac608e9a66c5a6bf011ad21d7d368e29d7923079e947ed5484ae0c7847df1f29dc255979d0da844e1ecba16fa19dfae5b84aefd85287bc63de1465d3ffa
DIST gspell-1.0.3.tar.xz 385772 SHA256 d95905e6c631e34911e8e3feeb364815bf3fd7ccd1dac118a34bcbae70261bd5 SHA512 c38159a988996c69ffd4ed7a348ab5eeef214632e57cf599541806b4317937f0f9ccb8d677182886fd281eb1a955cae595e6382924b1bd5f5edbe447b3e95e5b WHIRLPOOL c4dad122007264fe4a61039eb7aa38b04e4325fb3bf0916ddbcd1073988fe3acc13a9fe445023c113b87ea2ff59f93719d2efaa905d522aff5b070129098569b
DIST gspell-1.2.1.tar.xz 395356 SHA256 9f1c3e5f09693a786e8b8dfdc5f142e9c9641d8674ec687014be928073d3f1a3 SHA512 c1073b314dd478ae8b9fc26ad141b8b560e22f7e26aac49f53fcfb687de914c3caaec9d83781213dc5e76cd2b17eecc801cd63b989deb4cf520539479de35588 WHIRLPOOL ab2289d294f89927113e48277a87697fbe4bffeb6ad2cb3a36ce9279fd7cebf2fe308204c4a73c12fdddda11c558a6beb70e4631fb49f90771b212ae209b45a8

@ -0,0 +1,48 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala virtualx
DESCRIPTION="Spell check library for GTK+ applications"
HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/1" # subslot = libgspell-1 soname version
KEYWORDS="~alpha ~amd64 ~arm ~x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
app-text/iso-codes
>=app-text/enchant-1.6.0
>=dev-libs/glib-2.44:2
>=x11-libs/gtk+-3.20:3[introspection?]
introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
vala? ( $(vala_depend) )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.25
>=dev-util/intltool-0.35.0
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
"
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
$(use_enable introspection) \
$(use_enable vala)
}
src_test() {
virtx emake check
}

@ -13,10 +13,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
# FIXME: libepubgen, libeot, librvngabw
# FIXME: libepubgen, librvngabw
RDEPEND="
=app-text/libodfgen-0.1*
>=dev-libs/librevenge-0.0.1
media-libs/libeot
abiword? ( =app-text/libabw-0.1* )
cdr? ( =media-libs/libcdr-0.1* )
ebook? ( =app-text/libebook-0.1* )
@ -35,6 +36,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
REQUIRED_USE="
|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker visio wpd wpg wps )
"
# configure fails if no import library is selected...
src_configure() {
econf \
--disable-werror \

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -44,15 +44,15 @@ RDEPEND="
ffmpeg? ( virtual/ffmpeg )
gdal? ( sci-libs/gdal )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/jasper )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper:= )
openexr? (
media-libs/ilmbase
media-libs/openexr
)
openinventor? ( media-libs/coin )
pdf? ( app-text/poppler[cairo] )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4

@ -46,14 +46,14 @@ RDEPEND="
gdal? ( sci-libs/gdal )
gif? ( media-libs/giflib:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
jpeg2k? ( media-libs/jasper:= )
openexr? (
media-libs/ilmbase
media-libs/openexr
)
openinventor? ( media-libs/coin )
pdf? ( app-text/poppler[cairo] )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -39,15 +39,15 @@ RDEPEND="
ffmpeg? ( virtual/ffmpeg )
gdal? ( sci-libs/gdal )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/jasper )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper:= )
openexr? (
media-libs/ilmbase
media-libs/openexr
)
openinventor? ( media-libs/coin )
pdf? ( app-text/poppler[cairo] )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4

@ -51,7 +51,7 @@ RDEPEND="
media-libs/gst-plugins-base:1.0
)
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
jpeg2k? ( media-libs/jasper:= )
las? ( >=sci-geosciences/liblas-1.8.0 )
lua? ( >=dev-lang/lua-5.1.5:* )
openexr? (
@ -60,7 +60,7 @@ RDEPEND="
)
openinventor? ( media-libs/coin )
pdf? ( app-text/poppler[cairo] )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4

@ -51,7 +51,7 @@ RDEPEND="
media-libs/gst-plugins-base:1.0
)
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/jasper )
jpeg2k? ( media-libs/jasper:= )
las? ( >=sci-geosciences/liblas-1.8.0 )
lua? ( >=dev-lang/lua-5.1.5:* )
openexr? (
@ -60,7 +60,7 @@ RDEPEND="
)
openinventor? ( media-libs/coin )
pdf? ( app-text/poppler[cairo] )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4

@ -1 +1,2 @@
DIST tiled-0.17.0.tar.gz 4852620 SHA256 f7fce2006a04c9e6e5d45a15fb31d342a4a66f7a01e1e6bc0753035cfbf42f31 SHA512 bf9b0cdd08c9091238a5e37f0670f2f3c389a46892c682a81f817e5daae0e6e3b13edf5d61a4105d9064e44585a4d6c7f7956b4c69b14488ee04af1834bf066c WHIRLPOOL 9e8b21098016cb20be66071e115f678bd10531a63b99c949e8a0e04ba6302834c414cc1ddf294f36b13bf1e43c22b9403a2aa13dc52ddbe84c24eb95d9b88ddb
DIST tiled-0.17.1.tar.gz 4854247 SHA256 11297f97370df10dd32b24a0c5ce9988b3c1903a13f2be0ebb3c20f49c5e0fb4 SHA512 97f025d4d8a2018781a0cb3c318e85f56e4b71f3c3ee6950ac2a99dfac87303690ffb72c31d2a90a5b7f9ff0ac3909a112ea0e7858a915615829a301f65acd58 WHIRLPOOL f34ad8b8d622981c833fac5a88bee762eb7a94dfc4dec8f1884c9ee980b33b6969241cf585b1963a804a62002b8a1f60d88b8139297618755a0f0ee56365bc58

@ -0,0 +1,69 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit fdo-mime gnome2-utils multilib python-single-r1 qmake-utils
DESCRIPTION="A general purpose tile map editor"
HOMEPAGE="http://www.mapeditor.org/"
SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
>=dev-qt/qtcore-5.6:5
>=dev-qt/qtgui-5.6:5
>=dev-qt/qtnetwork-5.6:5
>=dev-qt/qtopengl-5.6:5
>=dev-qt/qtwidgets-5.6:5
sys-libs/zlib
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
DOCS=( AUTHORS COPYING NEWS.md README.md )
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
}
src_install() {
emake INSTALL_ROOT="${D}" install
einstalldocs
if use examples ; then
docompress -x /usr/share/doc/${PF}/examples
dodoc -r examples
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}

@ -7,7 +7,7 @@
</maintainer>
<longdescription>
A client library for MPD, the Music Player Daemon
(&lt;http://www.musicpd.org/&gt;).
(&lt;https://www.musicpd.org/&gt;).
</longdescription>
<upstream>
<remote-id type="github">vimus/libmpd-haskell#readme</remote-id>

@ -1,2 +1,3 @@
DIST icu4j-54_1_1.tgz 23457651 SHA256 1919a355742172dbd18021dfb2fd008f5c73168d2d5a39d705721614029d6704 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf WHIRLPOOL d7c35283547c598694ead10620df1511cbe4602415ca8ee2d32ee3b291d28015db4fcd5fb3f426bf524e449099562545c3bdab81209af244890b53ea091f9f1f
DIST icu4j-55_1.tgz 23617640 SHA256 da4c91e6b89bef3da22be475e63916c4f4f304b9689d5fdc5b40a52106efc4c3 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054 WHIRLPOOL b6cace3616d6d0b1c185a744cc1f0a3728682557d51f4b6658f174195c1eb369a2a005e2fd9eb4b421de761e47c2424368359a1948594da7b2f8cd6e1b0d2f33
DIST icu4j-56_1.tgz 23189284 SHA256 0b227aae833af37daf6b8dfbd265b4a3bae92ecb0d5f79d34ccb6dd445135369 SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a WHIRLPOOL acf1bcece9cf1aaa31b05618bd1b79fc5f308a93c9f1b64c69ed2171dcda3031b0d76ebf196af27c0d1712e8be8f7cdf0263ad9432b592afbd5098f05039828c

@ -0,0 +1,48 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
HOMEPAGE="http://www.icu-project.org/"
SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
LICENSE="icu"
SLOT="56"
KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}"
JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
EANT_DOC_TARGET="docs"
EANT_TEST_TARGET="check"
JAVA_RM_FILES=(
tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
)
src_test() {
java-pkg-2_src_test
}
src_install() {
java-pkg_dojar ${PN}.jar
java-pkg_dojar ${PN}-charset.jar
java-pkg_dojar ${PN}-localespi.jar
dodoc readme.html
use doc && java-pkg_dojavadoc doc
use examples && java-pkg_doexamples demos samples
use source && java-pkg_dosrc main/classes/*/src/com
}

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<upstream>

@ -17,7 +17,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2"
SLOT="2.7"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -46,12 +46,12 @@ RDEPEND="
gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
imlib2? ( media-libs/imlib2 )
jpeg? ( virtual/jpeg:0= )
jpeg2k? ( media-libs/jasper[jpeg] )
jpeg2k? ( media-libs/jasper:=[jpeg] )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng )
mpeg3? ( media-libs/libmpeg3 )
opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
png? ( media-libs/libpng:0 )
png? ( media-libs/libpng:0= )
sdl? ( media-libs/libsdl )
tiff? ( media-libs/tiff:0 )
timidity? (

@ -3,3 +3,4 @@ DIST appstream-glib-0.5.15.tar.xz 1884660 SHA256 cc21f213f4aa1693e68b9edf3b79933
DIST appstream-glib-0.5.16.tar.xz 1885896 SHA256 788de3f6480789ad1adc144b0e16978af5863365b7a1650b4f14d29ad848ec62 SHA512 c047d2f6a3cb46ebbcd4dd6165bcbfbaba6d0b20b45d94b933b36cfd62f8821c0e062c4932d0d9d846cdb866bddd611a1055baf21d9438b1fa50b8480ecd7c17 WHIRLPOOL b09d0335a28b138dac58d70257773c2f653808c53c6ea2c923f94612a8a86147e793b36194716a3e58897bff5d9c9d1b677244044020236391d63e05e1be19e5
DIST appstream-glib-0.5.9.tar.xz 1868132 SHA256 f0e4818553fe763894c660fec2c461b8815f83869acbf165daf32e2e41a5b166 SHA512 3c39233df97c464bfc993b54cee7eea01407220de39f833e34a017f6efc4c9bad0eb1762d72aed5eee94bb6a66044c7e031ede6685e1804b7ad6833b12fa9f7b WHIRLPOOL bbcc4318fafb1c3d94a8d695b924d2dec6f8c1bc968de3ca1480a8db6df47b7f30d2b656be09d7b6c2d7ed919b943452eca5b35e4559ff869872e97374228234
DIST appstream-glib-0.6.3.tar.xz 1944512 SHA256 3ec355c950b86cd792b6e396a5a4a72487999e300fcacf7466a663974ec4ad24 SHA512 aae4885e32bc6f0247f6e8f415471531a8c28976e1ba4bd977200d72e24a04dfc2370395e3e0ea6e052386a963540cb91f025cd4f1ab837404762f1be2a76ff0 WHIRLPOOL 5bc9874e9f0708064f93fca8938d3708171dbf4cd356c8475e6d804ba109e51fc0b00d5dc4ac547f55c8a37c358c0d8fad6900ea214e8760b6da999be3f8c252
DIST appstream-glib-0.6.5.tar.xz 1948908 SHA256 b6b77540b03ca56d7a8493d5f50ded747b6033e0437d8e4c516b5228e27b2a1a SHA512 606befae4fd675757e276a13679e1355359179537e701c8b14bb0b0ef0f21105231f2fa1338ac7776faa649a076da3e83f5dcb77120d14bb3a8945aa2d8e1376 WHIRLPOOL 7cce5c75c8659f64a35ed01118b00468d00563b94ed26f3d467c1d875a9c768ede85dc635c5a6eff1c8aa7612decc67ff362c8b8cc6cef73a8ebf1c54a311054

@ -0,0 +1,60 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
inherit bash-completion-r1 gnome2
DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection nls stemmer"
RDEPEND="
app-arch/gcab
app-arch/libarchive
dev-db/sqlite:3
>=dev-libs/glib-2.45.8:2
>=dev-libs/json-glib-1.1.1
dev-libs/libyaml
>=media-libs/fontconfig-2.11:1.0
>=media-libs/freetype-2.4:2
>=net-libs/libsoup-2.51.92:2.4
sys-apps/util-linux
>=x11-libs/gdk-pixbuf-2.31.5:2
x11-libs/gtk+:3
x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
stemmer? ( dev-libs/snowball-stemmer )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.3
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.9
>=sys-devel/gettext-0.19.7
"
# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
# are migrated to appstream-glib
RDEPEND="${RDEPEND}
!<dev-util/appdata-tools-0.1.8-r1
"
src_configure() {
gnome2_src_configure \
--enable-builder \
--enable-firmware \
--disable-rpm \
--disable-static \
--enable-dep11 \
--enable-man \
$(use_enable nls) \
$(use_enable introspection) \
$(use_enable stemmer) \
--with-bashcompletiondir="$(get_bashcompdir)"
}

@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ottxor@gentoo.org</email>
<email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,85 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit gnome2 python-r1 vala
DESCRIPTION="Provide objects allowing to create Model-View-Controller type programs across DBus"
HOMEPAGE="https://launchpad.net/dee/"
SRC_URI="https://launchpad.net/dee/1.0/${PV}/+download/${P}.tar.gz"
SLOT="0/4"
LICENSE="GPL-3"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug examples +icu introspection static-libs test"
REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-libs/glib:2
icu? ( dev-libs/icu:= )
introspection? (
${PYTHON_DEPS}
>=dev-libs/gobject-introspection-0.10.2:=
)
"
DEPEND="${RDEPEND}
$(vala_depend)
>=dev-util/gtk-doc-am-1.8
virtual/pkgconfig
test? (
>=dev-libs/gtx-0.2.2
dev-util/dbus-test-runner
)
"
src_prepare() {
# Fix build with gcc-6, bug #594112
eapply "${FILESDIR}"/${PN}-1.2.7-gcc-6-build.patch
sed \
-e 's:VALA_API_GEN:VAPIGEN:g' \
-i vapi/Makefile.{am,in} || die
sed \
-e '/SUBDIRS/ s:bindings::g' \
-i Makefile.{am,in} || die
vala_src_prepare
gnome2_src_prepare
sed \
-e '/GCC_FLAGS/ s:-g::' \
-e 's:VALA_API_GEN:VAPIGEN:g' \
-i configure || die
}
src_configure() {
gnome2_src_configure \
$(use_enable debug trace-log) \
$(use_enable icu) \
$(use_enable introspection) \
$(use_enable static-libs static) \
$(use_enable test tests)
}
src_install() {
gnome2_src_install
if use examples ; then
insinto /usr/share/doc/${PN}/
doins -r examples
fi
if use introspection ; then
install_gi_override() {
python_moduleinto "$(python_get_sitedir)/gi/overrides"
python_domodule "${S}"/bindings/python/Dee.py
}
python_foreach_impl install_gi_override
fi
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -26,7 +26,7 @@ RDEPEND="
dev-libs/icu:=
introspection? (
${PYTHON_DEPS}
dev-libs/gobject-introspection
dev-libs/gobject-introspection:=
)"
DEPEND="${RDEPEND}
$(vala_depend)

@ -0,0 +1,14 @@
--- a/src/dee-serializable-model.c 2013-09-16 20:21:20.000000000 +0200
+++ b/src/dee-serializable-model.c 2016-05-08 16:49:03.525140126 +0200
@@ -1326,9 +1326,10 @@
pos = 0;
_iter = dee_model_get_first_iter (self);
- while (!dee_model_is_last (self, iter) && iter != _iter)
+ while (!dee_model_is_last (self, iter) && iter != _iter) {
_iter = dee_model_next (self, _iter);
pos++;
+ }
if (iter == _iter)
return pos;

@ -0,0 +1,42 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit eutils
PATCH_LEVEL=2
DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
SRC_URI="http://0pointer.de/public/${P}.tar.xz
mirror://debian/pool/main/liba/${PN}/${PN}_${PV}-${PATCH_LEVEL}.debian.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/4"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="static-libs"
RDEPEND="virtual/libudev"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
# https://bugs.gentoo.org/470874
local d="${WORKDIR}"/debian/patches
sed -i -e '/#/d' \
-e "s|^|${d}/|" "${d}"/series || die
eapply $(<"${d}"/series)
eapply_user
}
src_configure() {
econf \
--docdir=/usr/share/doc/${PF} \
$(use_enable static-libs static)
}
src_install() {
default
prune_libtool_files --all
}

@ -19,7 +19,7 @@ else
fi
RESTRICT="test" # Tests need to run as root.
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"

@ -1,3 +1,4 @@
DIST libuv-1.10.0.tar.gz 1072589 SHA256 50f4ed57d65af4ab634e2cbdd90c49213020e15b4d77d3631feb633cbba9239f SHA512 bbe661911ffbb9d3b9ff2e1475812c03f620859f6e794717968f4817e427c38f42a92579ff6450cf6641da60e5156bcd189b3f184cc204a39527b1700327c747 WHIRLPOOL 4f3e26de63e3c061034c87076772d2c0603c4129fd08f5659040c415e9593a33926499cfcfd964240e06d0e29ddb4c1c59e9e0ab0655da6c47cb1b9d99b2c0b8
DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
DIST libuv-1.8.0.tar.gz 1048022 SHA256 906e1a5c673c95cb261adeacdb7308a65b4a8f7c9c50d85f3021364951fa9cde SHA512 51d5940873a771278c24a697f0da5c9cb7f42c192daa14254cff9309af600a1b343f1f39272f88d4cd0158f7b15bc966fb7e0b67b9590295fe4d9f0a7c6572b4 WHIRLPOOL ce9c49d5ba646458daa60e3f935d2f53483570d6dc34a8515c875115377929271bbc113c4c382054e9b1dbe4c04e04c2381f90d0776d69b064fb72169b6b4060
DIST libuv-1.9.1.tar.gz 1060134 SHA256 a6ca9f0648973d1463f46b495ce546ddcbe7cce2f04b32e802a15539e46c57ad SHA512 ad5f274f75c4c19bedbdeed8204ef8561b8c6a2697650402bf21cbf40ace35c104e089b42adc737d27b4a105283d9463ac02b6dadaec29aa6469f10b69ab3d0a WHIRLPOOL 0b653dc69255596cd7ce7e8ba505f39aa95a0ca08d0fc20dbad56796a5588f2d90fd920fe8977dc36d3eec11706c8ebc4f5e1730bc4171d979b11f7a9615faaf

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit autotools eutils multilib-minimal
@ -20,6 +20,8 @@ DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"
src_prepare() {
default
echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
> m4/libuv-extra-automake-flags.m4 || die

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
<longdescription lang="en">
libuv is a platform layer for node.js. Its purpose is to abstract
IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems.

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug doc test"
RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"

@ -18,10 +18,10 @@ HOMEPAGE="https://wayland.freedesktop.org/"
if [[ $PV = 9999* ]]; then
SRC_URI="${SRC_PATCHES}"
KEYWORDS="alpha arm hppa ppc64"
KEYWORDS="alpha arm hppa ia64 ppc64 sparc"
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
fi
LICENSE="MIT"

@ -12,7 +12,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
src_prepare() {

@ -0,0 +1,28 @@
From a2ecd4815d285281cb816e06b25dc0dc2a933073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 21 Aug 2016 23:13:45 +0200
Subject: [PATCH 06/10] cmake: Remove the CMAKE_BUILD_TYPE assertion
---
CMakeLists.txt | 5 -----
1 file changed, 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 894bc8c..453fcb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,11 +232,6 @@ endif()
string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-if (CMAKE_BUILD_TYPE AND
- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif()
-
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
--
2.9.3

@ -0,0 +1,115 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
CMAKE_MIN_VERSION=3.4.3
PYTHON_COMPAT=( python2_7 )
inherit cmake-utils git-r3 python-any-r1
DESCRIPTION="OCaml bindings for LLVM"
HOMEPAGE="http://llvm.org/"
SRC_URI=""
EGIT_REPO_URI="http://llvm.org/git/llvm.git
https://github.com/llvm-mirror/llvm.git"
# Keep in sync with sys-devel/llvm
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="test ${ALL_LLVM_TARGETS[*]}"
RDEPEND="
>=dev-lang/ocaml-4.00.0:0=
dev-ml/ocaml-ctypes:=
~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
!sys-devel/llvm[ocaml(-)]"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
dev-lang/perl
dev-ml/findlib
test? ( dev-ml/ounit
$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
!!<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( ${ALL_LLVM_TARGETS[*]} )"
python_check_deps() {
! use test \
|| has_version "dev-python/lit[${PYTHON_USEDEP}]"
}
src_prepare() {
# Python is needed to run tests using lit
python_setup
# Allow custom cmake build types (like 'Gentoo')
eapply "${FILESDIR}"/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
# User patches
eapply_user
}
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-DBUILD_SHARED_LIBS=ON
-DLLVM_OCAML_OUT_OF_TREE=ON
-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-DLLVM_BUILD_TESTS=$(usex test)
# disable various irrelevant deps and settings
-DLLVM_ENABLE_FFI=OFF
-DLLVM_ENABLE_TERMINFO=OFF
-DHAVE_HISTEDIT_H=NO
-DWITH_POLLY=OFF
-DLLVM_ENABLE_ASSERTIONS=OFF
-DLLVM_ENABLE_EH=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_HOST_TRIPLE="${CHOST}"
# disable go bindings
-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
# TODO: ocamldoc
)
use test && mycmakeargs+=(
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile ocaml_all
}
src_test() {
# respect TMPDIR!
local -x LIT_PRESERVES_TMP=1
# Force using system-installed tools.
sed -i -e "/llvm_tools_dir/s@\".*\"@\"${EPREFIX}/usr/bin\"@" \
"${BUILD_DIR}"/test/lit.site.cfg || die
cmake-utils_src_make check-llvm-bindings-ocaml
}
src_install() {
DESTDIR="${D}" \
cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
dodoc bindings/ocaml/README.txt
}

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

Loading…
Cancel
Save