diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-01-23 17:48:29 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-01-23 17:49:25 +0000 |
| commit | 1bf817f557fdcc9962cad56242f234ad8d59b7cf (patch) | |
| tree | 0358d678673e7c8342284fbceaa536863382db50 | |
| parent | media-tv/tvbrowser: Version bump. Fixes bug 571010. (diff) | |
| parent | app-admin/ulogd: 2.0.5-r4 revbump to migrate to readme.gentoo-r1 eclass (diff) | |
| download | gentoo-1bf817f5.tar.gz gentoo-1bf817f5.tar.bz2 gentoo-1bf817f5.zip | |
Merge remote-tracking branch 'github/pr/711'.
145 files changed, 2504 insertions, 2374 deletions
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild index f48f76037eda..e95e2e7a6b17 100644 --- a/app-admin/consul/consul-0.5.2-r1.ebuild +++ b/app-admin/consul/consul-0.5.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit golang-base systemd user +inherit git-r3 golang-base systemd user GO_PN="github.com/hashicorp/consul" @@ -100,7 +100,7 @@ src_unpack() { cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die while read -r path; do rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \ - "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die + "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d) } @@ -157,13 +157,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild index 99b94506fbbe..a2ff9c660b03 100644 --- a/app-admin/consul/consul-0.6.3.ebuild +++ b/app-admin/consul/consul-0.6.3.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit golang-base systemd user +inherit git-r3 golang-base systemd user GO_PN="github.com/hashicorp/consul" @@ -108,7 +108,7 @@ src_unpack() { cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die while read -r path; do rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \ - "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die + "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d) } @@ -129,7 +129,7 @@ src_prepare() { } src_compile() { - PATH=${PATH}:${WORKDIR}/bin XC_ARCH=${ARCH} XC_OS=${KERNEL} emake + PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake } src_install() { @@ -158,13 +158,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild index bce86d8de781..deebbb42ff82 100644 --- a/app-admin/consul/consul-9999.ebuild +++ b/app-admin/consul/consul-9999.ebuild @@ -53,7 +53,7 @@ src_unpack() { # Use latest versions of some packages, in case of incompatible # API changes rm -rf "${GOROOT}/src/${GO_PN%/*}" \ - "${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die + "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" || die # Fetch dependencies emake deps @@ -61,7 +61,7 @@ src_unpack() { # Avoid interference from installed instances while read -r path; do rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \ - "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die + "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d) } @@ -112,13 +112,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/ulogd/ulogd-2.0.5-r4.ebuild b/app-admin/ulogd/ulogd-2.0.5-r4.ebuild new file mode 100644 index 000000000000..9c28d08340ac --- /dev/null +++ b/app-admin/ulogd/ulogd-2.0.5-r4.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo-r1 systemd user + +DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" +HOMEPAGE="https://netfilter.org/projects/ulogd/index.html" +SRC_URI=" + https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 + ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2 +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog" + +RDEPEND=" + || ( net-firewall/iptables net-firewall/nftables ) + >=net-libs/libnfnetlink-1.0.1 + dbi? ( dev-db/libdbi ) + json? ( dev-libs/jansson ) + nfacct? ( + >=net-libs/libmnl-1.0.3 + >=net-libs/libnetfilter_acct-1.0.1 + ) + nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) + nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) + mysql? ( virtual/mysql ) + pcap? ( net-libs/libpcap ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND} + doc? ( + app-text/linuxdoc-tools + app-text/texlive-core + virtual/latex-base + ) +" + +DOCS=( AUTHORS README TODO ) + +PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" ) + +DOC_CONTENTS=" + You must have at least one logging stack enabled to make ulogd work. + Please edit example configuration located at /etc/ulogd.conf +" + +pkg_setup() { + enewgroup ulogd + enewuser ulogd -1 -1 /var/log/ulogd ulogd + + linux-info_pkg_setup + + if kernel_is lt 2 6 14; then + die "ulogd requires kernel newer than 2.6.14" + fi + + if kernel_is lt 2 6 18; then + ewarn "You are using kernel older than 2.6.18" + ewarn "Some ulogd features may be unavailable" + fi + + if use nfacct && kernel_is lt 3 3 0; then + ewarn "NFACCT input plugin requires kernel newer than 3.3.0" + fi + + if use ulog && kernel_is gt 3 17 0; then + ewarn "ULOG target was removed since 3.17.0 kernel release" + ewarn "Consider enabling NFACCT, NFCT or NFLOG support" + fi +} + +src_prepare() { + # - make all logs to be kept in a single dir /var/log/ulogd + # - place sockets in /run instead of /tmp + sed -i \ + -e 's%var/log%var/log/ulogd%g' \ + -e 's%tmp%run%g' \ + ulogd.conf.in || die + + append-lfs-flags + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + $(use_with dbi) + $(use_with json jansson) + $(use_enable nfacct) + $(use_enable nfct) + $(use_enable nflog) + $(use_with mysql) + $(use_with pcap) + $(use_with postgres pgsql) + $(use_with sqlite) + $(use_enable ulog) + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + + if use doc; then + # Prevent access violations from bitmap font files generation + export VARTEXFONTS="${T}"/fonts + emake -C doc + fi +} + +src_install() { + autotools-utils_src_install + prune_libtool_files --modules + readme.gentoo_create_doc + + if use doc; then + dohtml doc/${PN}.html + dodoc doc/${PN}.{dvi,ps,txt} + fi + + use mysql && dodoc doc/mysql-*.sql + use postgres && dodoc doc/pgsql-*.sql + use sqlite && dodoc doc/sqlite3.table + + doman ${PN}.8 + + insinto /etc + doins "${BUILD_DIR}/${PN}.conf" + fowners root:ulogd /etc/${PN}.conf + fperms 640 /etc/${PN}.conf + + newinitd "${FILESDIR}/${PN}.init" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + diropts -o ulogd -g ulogd + keepdir /var/log/ulogd +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild b/app-admin/vault/vault-0.1.2-r1.ebuild index c30bcd2fda19..558bf59e87e8 100644 --- a/app-admin/vault/vault-0.1.2-r1.ebuild +++ b/app-admin/vault/vault-0.1.2-r1.ebuild @@ -53,7 +53,7 @@ src_unpack() { export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath) while read -r -d '' x; do - rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die + rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0) mkdir -p "${GOROOT}/src/github.com/mitchellh" || die @@ -97,13 +97,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild index ef7e7b59b029..4c8a514f461e 100644 --- a/app-admin/vault/vault-9999.ebuild +++ b/app-admin/vault/vault-9999.ebuild @@ -51,7 +51,7 @@ src_unpack() { export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath) while read -r -d '' x; do - rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die + rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0) rm -rf "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src/github.com/awslabs" @@ -93,13 +93,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-crypt/keybase/keybase-0.8.25.ebuild b/app-crypt/keybase/keybase-0.8.25.ebuild index 644ff738ea67..22ca86a5b7ad 100644 --- a/app-crypt/keybase/keybase-0.8.25.ebuild +++ b/app-crypt/keybase/keybase-0.8.25.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=" diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 41f05f7d19e1..7994411b4cc1 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,6 +1,6 @@ DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 -DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947 +DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 diff --git a/app-editors/gvim/gvim-7.4.769.ebuild b/app-editors/gvim/gvim-7.4.769.ebuild index 5edb54849968..238a3f202d28 100644 --- a/app-editors/gvim/gvim-7.4.769.ebuild +++ b/app-editors/gvim/gvim-7.4.769.ebuild @@ -8,14 +8,12 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1 -MY_PV=${PV//./-} - if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV} + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else - SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" fi @@ -77,7 +75,7 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) " -S=${WORKDIR}/vim-${MY_PV} +S=${WORKDIR}/vim-${PV} pkg_setup() { # people with broken alphabets run into trouble. bug 82186. diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 41f05f7d19e1..7994411b4cc1 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,6 +1,6 @@ DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 -DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947 +DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 diff --git a/app-editors/vim/vim-7.4.769.ebuild b/app-editors/vim/vim-7.4.769.ebuild index 0fcf8554c138..b346e3a97c38 100644 --- a/app-editors/vim/vim-7.4.769.ebuild +++ b/app-editors/vim/vim-7.4.769.ebuild @@ -8,14 +8,11 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 -MY_PV=${PV//./-} - if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV} else - SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -63,8 +60,6 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) " -S=${WORKDIR}/vim-${MY_PV} - pkg_setup() { # people with broken alphabets run into trouble. bug 82186. unset LANG LC_ALL diff --git a/app-forensics/afflib/afflib-3.7.4.ebuild b/app-forensics/afflib/afflib-3.7.4.ebuild index 9f595b101469..599cf5f7c598 100644 --- a/app-forensics/afflib/afflib-3.7.4.ebuild +++ b/app-forensics/afflib/afflib-3.7.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/simsong/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc x86" +KEYWORDS="amd64 ~arm hppa ppc x86 ~x64-macos" IUSE="fuse ncurses python qemu readline s3 static-libs threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild new file mode 100644 index 000000000000..f0f186a0fc5e --- /dev/null +++ b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="A tool to color syslog files as well" +HOMEPAGE="http://www.nongnu.org/regex-markup/" +SRC_URI="http://savannah.nongnu.org/download/regex-markup/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="examples nls" + +PATCHES=( + "${FILESDIR}/${P}-locale.patch" +) + +src_configure() { + # fix #570960 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + + econf \ + --enable-largefile \ + $(use_enable nls) +} + +src_install() { + default + if use examples; then + cd examples || die + emake -f Makefile + fi +} diff --git a/app-misc/screen/files/screen-9999-bool_visual_bell.patch b/app-misc/screen/files/screen-9999-bool_visual_bell.patch new file mode 100644 index 000000000000..e316a62b2a49 --- /dev/null +++ b/app-misc/screen/files/screen-9999-bool_visual_bell.patch @@ -0,0 +1,11 @@ +--- a/src/telnet.c ++++ b/src/telnet.c +@@ -41,7 +41,7 @@ + + extern Window *fore; + extern Layer *flayer; +-extern int visual_bell; ++extern bool visual_bell; + extern char screenterm[]; + extern int af; + diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 3038ad6bd944..1c5906ae2dec 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -36,6 +36,9 @@ src_prepare() { # Don't use utempter even if it is found on the system epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + # visual_bell is no longer an int + epatch "${FILESDIR}"/${PN}-9999-bool_visual_bell.patch + # sched.h is a system header and causes problems with some C libraries mv sched.h _sched.h || die sed -i '/include/ s:sched.h:_sched.h:' screen.h || die diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest index 25a51b1912ea..643e4d741111 100644 --- a/app-office/texstudio/Manifest +++ b/app-office/texstudio/Manifest @@ -1,3 +1,2 @@ DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607 -DIST texstudio-2.10.4.tar.gz 25810583 SHA256 87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5 WHIRLPOOL 357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9 -DIST texstudio-2.10.6.tar.gz 25956475 SHA256 16368d7334f809aebe7a656f9bfa97f0ececb09d437fdb35ae7fc1888f1525e1 SHA512 061bad8530503aa611a09e5e2013fb5e956f436de00e2cd773fbd5e76c7a198fc9a628e4785e45f63dae5a2d0fed3e7f88d4a1a4a1f6fd0babdc44cc51eee0ab WHIRLPOOL 42d34dcae31f941b4d43af948e91a00be34d002bc85476f12e8e38b83d518f439b012c0c53aeb22728de984a55d2ee6a9139ff96c4aa1fe993059c935727a780 +DIST texstudio-2.10.8.tar.gz 26003322 SHA256 0a569544ceb0ff92e52ed57a34e8eb12e7a16eef1209320737aef5d5b81b3404 SHA512 3faa278f785dc1de34c5a502191430989f078d5301da93f1df13d70287e01322618fd146e1ee7c4c6714233a53affdbb92e3e67f5717b978d2fbe126c59da949 WHIRLPOOL 626d56e68df767e1b02a34f2abe9316c2d237d6e368294d7389c46394f3735d633bb0019da78da3194699cf3fbc3d257c489bbc63829b04199c681c11a688e8f diff --git a/app-office/texstudio/texstudio-2.10.4.ebuild b/app-office/texstudio/texstudio-2.10.4.ebuild deleted file mode 100644 index ebb322347cb2..000000000000 --- a/app-office/texstudio/texstudio-2.10.4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit fdo-mime prefix qmake-utils - -DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" -HOMEPAGE="http://texstudio.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="video qt4 +qt5" - -REQUIRED_USE="^^ ( qt4 qt5 )" - -COMMON_DEPEND=" - app-text/hunspell - app-text/poppler:=[qt4?,qt5?] - >=dev-libs/quazip-0.7.1[qt4?,qt5?] - dev-qt/qtsingleapplication[X,qt4?,qt5?] - x11-libs/libX11 - x11-libs/libXext - qt4? ( - dev-qt/designer:4 - >=dev-qt/qtgui-4.8.5:4 - >=dev-qt/qtcore-4.6.1:4 - >=dev-qt/qtscript-4.6.1:4 - >=dev-qt/qtsvg-4.6.1:4 - >=dev-qt/qttest-4.6.1:4 - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - video? ( media-libs/phonon[qt4?,qt5?] )" -RDEPEND="${COMMON_DEPEND} - virtual/latex-base - app-text/psutils - app-text/ghostscript-gpl - media-libs/netpbm" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -S="${WORKDIR}"/${P/-/} - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch - "${FILESDIR}"/${PN}-2.8.2-desktop.patch - ) - -src_prepare() { - find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die - - if use video; then - sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die - fi - - sed \ - -e '/hunspell.pri/d' \ - -e '/quazip.pri/d' \ - -e '/qtsingleapplication.pri/d' \ - -e '/QUAZIP_STATIC/d' \ - -i ${PN}.pro || die - -# cat >> ${PN}.pro <<- EOF -# exists(texmakerx_my.pri):include(texmakerx_my.pri) -# EOF - - cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die - eprefixify ${PN}.pri - - epatch ${PATCHES[@]} -} - -src_configure() { - if use qt5; then - eqmake5 - else - eqmake4 - fi -} - -src_install() { - local i - for i in 16x16 22x22 32x32 48x48 64x64 128x128; do - insinto /usr/share/icons/hicolor/${i} - newins utilities/${PN}${i}.png ${PN}.png - done - emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-office/texstudio/texstudio-2.10.6.ebuild b/app-office/texstudio/texstudio-2.10.8.ebuild index 668b92ade92f..668b92ade92f 100644 --- a/app-office/texstudio/texstudio-2.10.6.ebuild +++ b/app-office/texstudio/texstudio-2.10.8.ebuild diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild index c159ab590ff6..ae27eb2c84bd 100644 --- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild +++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://www.antlr2.org/" SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz" LICENSE="public-domain" SLOT="2" -KEYWORDS="~amd64 ~arm ppc ~x86" +KEYWORDS="amd64 ~arm ppc ~x86" IUSE="doc examples static-libs" RESTRICT="test" # No tests but test target blows up! diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild index d08a3dd1953f..d4b1a24bcecc 100644 --- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild index 3a8c797b487e..7d5cdc392948 100644 --- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild index f2284ddcb7e2..e4f3e40a6676 100644 --- a/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild +++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild @@ -11,7 +11,7 @@ inherit versionator perl-module DESCRIPTION="Dump symbol names or the symbol table" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="test" RDEPEND="" diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild index fcaaa386aa70..c33402d436bb 100644 --- a/dev-perl/Filter/Filter-1.540.0.ebuild +++ b/dev-perl/Filter/Filter-1.540.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Interface for creation of Perl Filters" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" diff --git a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild index d8577dc0bb93..be1343f3aed7 100644 --- a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild +++ b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Get stock quotes from Yahoo! Finance" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND=" diff --git a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild index c2b936243773..d840bb0dad4c 100644 --- a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild +++ b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Perl5 module to create charts using the GD module" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris" IUSE="" RDEPEND="dev-perl/GDTextUtil diff --git a/dev-perl/Unicode-Normalize/Manifest b/dev-perl/Unicode-Normalize/Manifest index 7492a8ab809d..bb98a22d29f7 100644 --- a/dev-perl/Unicode-Normalize/Manifest +++ b/dev-perl/Unicode-Normalize/Manifest @@ -1 +1,2 @@ DIST Unicode-Normalize-1.18.tar.gz 19856 SHA256 c3058b55f77f648af9f3557f6e66d328ced8e0e211a7d633ff97c21e94da6874 SHA512 e76adbada2ba21306bd34d1296af63f6ad9994c88789338104ff64d1983895a4aeb7b7c66b0f483429450ba2683759d58818380aa8452cde966ee539a7352e75 WHIRLPOOL 18730140b50fb3189099b09141218675b8ca330659ee8dd06136c0881a2a665fbf0a650ed855dc190b8e07f0fe070d27eb0a0d0cd286aab9d2db61528802628e +DIST Unicode-Normalize-1.25.tar.gz 40530 SHA256 00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c SHA512 f28c19e0293cf75cc0aab669ae0a0543f6a1a39e1e50ff32ab37abd8e85efc73e8b9075e581212b6da576ecbf8c0e9ddb7b9b352674aa3a04c77f9aaf4717866 WHIRLPOOL 69abc1765cfba33ea851ebc03a2ab9b0f6c762da5ec491bdf19c8865e701150c4639cc00365d88ad913e96eb51f9f4ad8217661163c0cd95d55f979613b28835 diff --git a/dev-perl/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild b/dev-perl/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild new file mode 100644 index 000000000000..9ae1c30f0a68 --- /dev/null +++ b/dev-perl/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=KHW +MODULE_VERSION=1.25 +inherit perl-module + +DESCRIPTION="Unicode Normalization Forms" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Exporter + virtual/perl-File-Spec +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" +SRC_TEST="do" diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest index 999547993181..2d948224dc1c 100644 --- a/dev-php/igbinary/Manifest +++ b/dev-php/igbinary/Manifest @@ -1,2 +1 @@ DIST igbinary-1.2.1-r1.tar.gz 143092 SHA256 f71a2e085669ed915740b29f55b6a81e30bae52215d041938afb9212e6bafc27 SHA512 5e69831606cfe47db2ae2b2200bd8bcfce42db32599a2a58cf23238d88896a2ef79baf16e78b3aaefb8725f8fdd7b815470e2d314ba14ea05f33be547da31777 WHIRLPOOL f7eb5d28b536bd1d2b0565f3e8541cbdb39edd2f5130bd041f0d75cc8218edeaa8719ebaea4d8ddf372172df9863d9d72a12dd8fc09c3653418b49e26d0e2f61 -DIST igbinary-1.2.1.tar.gz 143092 SHA256 f71a2e085669ed915740b29f55b6a81e30bae52215d041938afb9212e6bafc27 SHA512 5e69831606cfe47db2ae2b2200bd8bcfce42db32599a2a58cf23238d88896a2ef79baf16e78b3aaefb8725f8fdd7b815470e2d314ba14ea05f33be547da31777 WHIRLPOOL f7eb5d28b536bd1d2b0565f3e8541cbdb39edd2f5130bd041f0d75cc8218edeaa8719ebaea4d8ddf372172df9863d9d72a12dd8fc09c3653418b49e26d0e2f61 diff --git a/dev-php/igbinary/igbinary-1.2.1.ebuild b/dev-php/igbinary/igbinary-1.2.1.ebuild deleted file mode 100644 index 2bd558fe06d9..000000000000 --- a/dev-php/igbinary/igbinary-1.2.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PHP_EXT_NAME="igbinary" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS="README" - -USE_PHP="php5-6 php5-5 php5-4" - -inherit php-ext-source-r2 - -KEYWORDS="amd64 x86" - -DESCRIPTION="A fast drop in replacement for the standard PHP serialize" -HOMEPAGE="https://github.com/igbinary/igbinary" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz" - -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_configure() { - my_conf="--enable-igbinary" - php-ext-source-r2_src_configure -} - -src_test() { - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" - done -} diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild deleted file mode 100644 index 7a0d5e4ed772..000000000000 --- a/dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PHP_EXT_NAME="apcu" -PHP_EXT_PECL_PKG="APCu" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO" - -USE_PHP="php5-6 php5-5 php5-4" - -S="${WORKDIR}/apcu-${PV}" -PHP_EXT_S="${WORKDIR}/apcu-${PV}" - -inherit php-ext-pecl-r2 confutils eutils - -S="${WORKDIR}/apcu-${PV}" - -KEYWORDS="amd64 x86" - -DESCRIPTION="Stripped down version of APC supporting only user cache" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="+mmap" - -DEPEND="" -RDEPEND="${DEPEND}" - -LOCKS="pthreadmutex pthreadrw spinlock semaphore" - -LUSE="" -for l in ${LOCKS}; do - LUSE+="lock_${l} " -done - -IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}" - -REQUIRED_USE="^^ ( $LUSE )" - -src_configure() { - my_conf="--enable-apcu" - use mmap || my_conf+=" --disable-apcu-mmap" - - enable_extension_enable "apcu-rwlocks" "lock_pthreadrw" 0 - - php-ext-source-r2_src_configure -} - -src_install() { - php-ext-pecl-r2_src_install - - dodir "${PHP_EXT_SHARED_DIR}" - insinto "${PHP_EXT_SHARED_DIR}" - doins apc.php -} - -pkg_postinst() { - elog "The apc.php file shipped with this release of pecl-apcu was" - elog "installed into ${PHP_EXT_SHARED_DIR}/." -} diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild index cb650d732c68..5bb39e354566 100644 --- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild +++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild @@ -12,7 +12,7 @@ USE_PHP="php5-4 php5-5 php5-6" inherit php-ext-pecl-r2 -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DESCRIPTION="Interface PHP with memcached via libmemcached library" LICENSE="PHP-3" diff --git a/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild index 276b547335b9..06762312bc2a 100644 --- a/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild +++ b/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild @@ -14,7 +14,7 @@ DOCS="arrays.markdown README.markdown" inherit php-ext-pecl-r2 -KEYWORDS="~amd64" +KEYWORDS="amd64" DESCRIPTION="PHP extension for interfacing with Redis" LICENSE="PHP-3.01" diff --git a/dev-python/polygon/polygon-2.0.6.ebuild b/dev-python/polygon/polygon-2.0.6.ebuild index b84f17892841..ab5880012eb5 100644 --- a/dev-python/polygon/polygon-2.0.6.ebuild +++ b/dev-python/polygon/polygon-2.0.6.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/jraedler/${PN}2/downloads/Polygon2-${PV}.zip" LICENSE="LGPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" DEPEND="app-arch/unzip" diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest index 503a71aa3246..659da89d78a8 100644 --- a/dev-python/pytest-localserver/Manifest +++ b/dev-python/pytest-localserver/Manifest @@ -1 +1,2 @@ DIST pytest-localserver-0.3.4.zip 28988 SHA256 9d2dc10aa2ba7e799f22e3fc133f7562c9be5be180b788f7f9dabea30a281814 SHA512 476c15d7020773b8d6a0c13ac1beea2274fc022a7089ea384f6721906f7a8339b7410ad7a5dd6817a2d6ce5dc92d3023632dff5191059bef327dbebd77a9bea7 WHIRLPOOL 158f15597057c226107430dfd6c53338086725b9642fa87cbb07bbe103d4fbd70ca9f82f4fcebd1a2d9371725f772cc3e5eead233976be2408ed7fde36c898d8 +DIST pytest-localserver-0.3.5.tar.gz 18856 SHA256 97a8db7f530afdd009513ebdd86731b51e866fad82595bf92f456d93e5d57837 SHA512 937adbe450143b8ece12920d229e1559c8bcadd4ccce2103d965b92815ba4594b2e4274c6673d5e76d375d569a1c831dc480bd6b57d331b18e8a0adc5a4a1b97 WHIRLPOOL 6349448845577a86b654bc1675ec1d1ec758969d9424e8983f03ea2f3dc3ad8dc4464db1400b8b8e29130242ab2552a52b62bfaf4ccb74df9e8d5f91f042ce67 diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.5.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.5.ebuild new file mode 100644 index 000000000000..0dceaa510d17 --- /dev/null +++ b/dev-python/pytest-localserver/pytest-localserver-0.3.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python{2_7,3_3,3_4}) + +inherit distutils-r1 + +DESCRIPTION="Py.test plugin to test server connections locally" +HOMEPAGE="https://pypi.python.org/pypi/pytest-localserver" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]" +DEPEND="test? ( ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] )" + +python_test() { + py.test || die +} diff --git a/dev-python/visual/visual-5.74-r1.ebuild b/dev-python/visual/visual-5.74-r1.ebuild index a2d6d23d8739..e8381b7f0a6e 100644 --- a/dev-python/visual/visual-5.74-r1.ebuild +++ b/dev-python/visual/visual-5.74-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2" LICENSE="HPND Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="doc examples" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest index 967f52c1efcd..96e69cfbc981 100644 --- a/dev-ros/audio_capture/Manifest +++ b/dev-ros/audio_capture/Manifest @@ -1,3 +1,4 @@ +DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42 diff --git a/dev-ros/audio_capture/audio_capture-0.2.10.ebuild b/dev-ros/audio_capture/audio_capture-0.2.10.ebuild new file mode 100644 index 000000000000..dd65eace76e5 --- /dev/null +++ b/dev-ros/audio_capture/audio_capture-0.2.10.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/audio_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Transports audio from a source to a destination" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/roscpp + dev-libs/boost:=[threads] + media-libs/gstreamer:0.10 +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + media-plugins/gst-plugins-lame:0.10 + media-libs/gst-plugins-good:0.10 + media-libs/gst-plugins-base:0.10 +" diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest index 967f52c1efcd..96e69cfbc981 100644 --- a/dev-ros/audio_common_msgs/Manifest +++ b/dev-ros/audio_common_msgs/Manifest @@ -1,3 +1,4 @@ +DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42 diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.ebuild new file mode 100644 index 000000000000..e872a7e500db --- /dev/null +++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/audio_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit ros-catkin + +DESCRIPTION="Messages for transmitting audio via ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest index 967f52c1efcd..96e69cfbc981 100644 --- a/dev-ros/audio_play/Manifest +++ b/dev-ros/audio_play/Manifest @@ -1,3 +1,4 @@ +DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42 diff --git a/dev-ros/audio_play/audio_play-0.2.10.ebuild b/dev-ros/audio_play/audio_play-0.2.10.ebuild new file mode 100644 index 000000000000..d8c67040ec3b --- /dev/null +++ b/dev-ros/audio_play/audio_play-0.2.10.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/audio_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Outputs audio to a speaker from a source node" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/roscpp + dev-libs/boost:=[threads] + media-libs/gstreamer:0.10 +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + media-plugins/gst-plugins-alsa:0.10 + media-libs/gst-plugins-good:0.10 + media-libs/gst-plugins-base:0.10 +" diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest index 9f4e04e22607..41fb70890369 100644 --- a/dev-ros/camera_calibration_parsers/Manifest +++ b/dev-ros/camera_calibration_parsers/Manifest @@ -1,3 +1,4 @@ +DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441 DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.10.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.10.ebuild new file mode 100644 index 000000000000..f8a8503e0991 --- /dev/null +++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.10.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/image_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Routines for reading and writing camera calibration parameters" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:=[python] + dev-ros/rosconsole + >=dev-cpp/yaml-cpp-0.5 +" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-python/nose ) +" diff --git a/dev-ros/camera_info_manager/Manifest b/dev-ros/camera_info_manager/Manifest index 9f4e04e22607..41fb70890369 100644 --- a/dev-ros/camera_info_manager/Manifest +++ b/dev-ros/camera_info_manager/Manifest @@ -1,3 +1,4 @@ +DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441 DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild new file mode 100644 index 000000000000..5857f50e8f41 --- /dev/null +++ b/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/image_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++ interface for camera calibration information" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/camera_calibration_parsers + dev-ros/image_transport + dev-ros/roscpp + dev-ros/roslib + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:= +" +DEPEND="${RDEPEND} test? ( dev-ros/rostest )" diff --git a/dev-ros/image_transport/Manifest b/dev-ros/image_transport/Manifest index 9f4e04e22607..41fb70890369 100644 --- a/dev-ros/image_transport/Manifest +++ b/dev-ros/image_transport/Manifest @@ -1,3 +1,4 @@ +DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441 DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e diff --git a/dev-ros/image_transport/image_transport-1.11.10.ebuild b/dev-ros/image_transport/image_transport-1.11.10.ebuild new file mode 100644 index 000000000000..00b273ff44b7 --- /dev/null +++ b/dev-ros/image_transport/image_transport-1.11.10.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/image_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Transparent support for transporting images in low-bandwidth compressed formats" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/message_filters + dev-ros/pluginlib + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/roslib + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:= +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/polled_camera/Manifest b/dev-ros/polled_camera/Manifest index 9f4e04e22607..41fb70890369 100644 --- a/dev-ros/polled_camera/Manifest +++ b/dev-ros/polled_camera/Manifest @@ -1,3 +1,4 @@ +DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441 DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e diff --git a/dev-ros/polled_camera/polled_camera-1.11.10.ebuild b/dev-ros/polled_camera/polled_camera-1.11.10.ebuild new file mode 100644 index 000000000000..825bf06a313d --- /dev/null +++ b/dev-ros/polled_camera/polled_camera-1.11.10.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/image_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs" + +inherit ros-catkin + +DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/image_transport + dev-ros/rosconsole +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest index 967f52c1efcd..96e69cfbc981 100644 --- a/dev-ros/sound_play/Manifest +++ b/dev-ros/sound_play/Manifest @@ -1,3 +1,4 @@ +DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42 diff --git a/dev-ros/sound_play/sound_play-0.2.10.ebuild b/dev-ros/sound_play/sound_play-0.2.10.ebuild new file mode 100644 index 000000000000..c4b4cb101276 --- /dev/null +++ b/dev-ros/sound_play/sound_play-0.2.10.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/audio_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs" + +inherit ros-catkin + +DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/roslib + media-libs/gstreamer:0.10 + dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + dev-python/gst-python[${PYTHON_USEDEP}] + app-accessibility/festival + media-libs/gst-plugins-good:0.10 + media-libs/gst-plugins-base:0.10 +" diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild index 12b68233b2e2..6b44cef9c335 100644 --- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild +++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index 11d35639b9df..f3b95071ba41 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,3 @@ DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6 -DIST jenkins-bin-1.643.war 63664108 SHA256 b8c6387e56d04a0a4a7ec8d9dacd379fbd5d4001d01fdfcd443f9864809f9293 SHA512 a39c123b9ea9d5da64b9b1e6dde5987bc3968024bd17465aead3c037eef3e9a61e87dd360b77ba8eea30f4dde7db34a55a6a222a924a327e549148d7034d747f WHIRLPOOL f3ab5d4252a679740ba7517e357507e50efe1c8e1bb9576c8046e12bfc0ce9d7212ade685ecbded85356d16c133a61730f1eaa2926c51cd0dffa006872dff266 DIST jenkins-bin-1.644.war 63665223 SHA256 f4fe9c1faa682cbfa8dc6e7f3e64d78897dcb7332e8f513f12a3b845e3922eb0 SHA512 8a94569372048587af6cf763cd4aa2566413a9fca9adb868f874ccb4258b4c68548210d1f11d2f051785233355300649a3f376a3b338b742b2ef62e05f92b58e WHIRLPOOL 7a9e97469be7372048595825ed4679911d7ef1e044fa21855ef41559e5d4e8ecd42340c4d303e49a4f0212f1cc7055a0b933986ddc112b5a2768afbaba2a8b92 +DIST jenkins-bin-1.645.war 63350272 SHA256 9ea1b6bc4fcdd930cdbfa3a3e97b4d923f68f7542b6978d090efbd4c38d69951 SHA512 684b6e86db19afc8fe92b2eb1d174623fbac74e446f28d2c62fb08db15549bf1fc15a86290b8e14bd1af64074fa08882125306eaea7e94ae88bdb589255167de WHIRLPOOL e2c24eef01c252f14d960f8edba2da55caa256b1128b2cd5093b9dee92ec6fc36802bca67ebdc22c939bf0a46a54b01cac4d87cb45c64a1ed70d7fade73b8eaf diff --git a/dev-util/jenkins-bin/jenkins-bin-1.643.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.645.ebuild index 37fc08477727..96dfaf75f07d 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.643.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.645.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$ diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 951567136e96..da15a4175a69 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1 +1,2 @@ DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f +DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01 diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild new file mode 100644 index 000000000000..4804b7b0db1d --- /dev/null +++ b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="optional" +KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru" +KDE_LINGUAS_LIVE_OVERRIDE="true" +inherit flag-o-matic kde4-base + +DESCRIPTION="A frontend to the subversion vcs" +HOMEPAGE="http://kdesvn.alwins-world.de/" +if [[ ${PV} != 9999* ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" +fi + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="4" +IUSE="debug" + +DEPEND=" + dev-libs/apr:1 + dev-libs/apr-util:1 + dev-qt/qtsql:4[sqlite] + >=dev-vcs/subversion-1.7 + sys-devel/gettext +" +RDEPEND="${DEPEND} + !kde-apps/kdesdk-kioslaves:4[subversion(+)] +" + +src_configure() { + append-cppflags -DQT_THREAD_SUPPORT + + [[ ${PV} = 9999* ]] && local mycmakeargs=(-DDAILY_BUILD=ON) + + kde4-base_src_configure +} diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch new file mode 100644 index 000000000000..7c84c8d481fd --- /dev/null +++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch @@ -0,0 +1,129 @@ +Fix compile errors due to hiding of private API in subversion 1.9. +See also: + https://bugs.gentoo.org/show_bug.cgi?id=558572 + https://slackbuilds.org/cgit/slackbuilds/commit/?id=c2df77021b476ca9484772361003df04fa03038a + https://github.com/RapidSVN/RapidSVN/issues/6 + +--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp ++++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp +@@ -29,6 +29,7 @@ + #include "svn_client.h" + #include "svn_path.h" + #include "svn_sorts.h" ++#include "svn_version.h" + //#include "svn_utf.h" + + // svncpp +@@ -37,6 +38,8 @@ + #include "svncpp/exception.hpp" + + ++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 ++ + static int + compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) + { +@@ -90,6 +93,72 @@ + } + } + ++#else ++ ++#include <algorithm> ++ ++static svn_error_t* store_entry( ++ void *baton, ++ const char *path, ++ const svn_dirent_t *dirent, ++ const svn_lock_t *, ++ const char *abs_path, ++ const char *, ++ const char *, ++ apr_pool_t *scratch_pool) ++{ ++ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton); ++ if (path[0] == '\0') { ++ if (dirent->kind == svn_node_file) { ++ // for compatibility with svn_client_ls behaviour, listing a file ++ // stores that file name ++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); ++ } ++ } else { ++ entries->push_back(svn::DirEntry(path, dirent)); ++ } ++ return SVN_NO_ERROR; ++} ++ ++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) ++{ ++ return svn_path_compare_paths(a.name(), b.name()) < 0; ++} ++ ++namespace svn ++{ ++ DirEntries ++ Client::list(const char * pathOrUrl, ++ svn_opt_revision_t * revision, ++ bool recurse) throw(ClientException) ++ { ++ Pool pool; ++ DirEntries entries; ++ ++ svn_error_t * error = ++ svn_client_list3(pathOrUrl, ++ revision, ++ revision, ++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), ++ SVN_DIRENT_ALL, ++ FALSE, // fetch locks ++ FALSE, // include externals ++ &store_entry, ++ &entries, ++ *m_context, ++ pool); ++ ++ if (error != SVN_NO_ERROR) ++ throw ClientException(error); ++ ++ std::sort(entries.begin(), entries.end(), &sort_by_path); ++ ++ return entries; ++ } ++} ++ ++#endif ++ + /* ----------------------------------------------------------------- + * local variables: + * eval: (load-file "../../rapidsvn-dev.el") +--- rapidsvn-0.12.1/include/svncpp/dirent.hpp ++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp +@@ -41,7 +41,7 @@ + /** + * constructor for existing @a svn_dirent_t entries + */ +- DirEntry(const char * name, svn_dirent_t * dirEntry); ++ DirEntry(const char * name, const svn_dirent_t * dirEntry); + + /** + * copy constructor +--- rapidsvn-0.12.1/src/svncpp/dirent.cpp ++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp +@@ -47,7 +47,7 @@ + { + } + +- Data(const char * _name, svn_dirent_t * dirEntry) ++ Data(const char * _name, const svn_dirent_t * dirEntry) + : name(_name), kind(dirEntry->kind), size(dirEntry->size), + hasProps(dirEntry->has_props != 0), + createdRev(dirEntry->created_rev), time(dirEntry->time) +@@ -78,7 +78,7 @@ + { + } + +- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) ++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) + : m(new Data(name, DirEntry)) + { + } diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch index 4df855fb79b4..e26ecda15d9b 100644 --- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch +++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch @@ -1,7 +1,7 @@ Index: src/svncpp/Makefile.am =================================================================== ---- src/svncpp/Makefile.am (revision 7100) -+++ src/svncpp/Makefile.am (working copy) +--- rapidsvn-0.12.1/src/svncpp/Makefile.am (revision 7100) ++++ rapidsvn-0.12.1/src/svncpp/Makefile.am (working copy) @@ -27,3 +27,7 @@ url.cpp \ wc.cpp diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild new file mode 100644 index 000000000000..ccaeca2f2fbb --- /dev/null +++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +WX_GTK_VER=3.0 + +inherit autotools eutils fdo-mime flag-o-matic python-single-r1 versionator wxwidgets + +MY_PV=$(get_version_component_range 1-2) +MY_REL="1" + +DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system" +HOMEPAGE="http://rapidsvn.tigris.org/" +SRC_URI=" + http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz + doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )" + +LICENSE="GPL-2 LGPL-2.1 FDL-1.2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEP=" + ${PYTHON_DEPS} + dev-libs/apr + dev-libs/apr-util + dev-vcs/subversion + x11-libs/wxGTK:${WX_GTK_VER}[X]" +DEPEND="${COMMON_DEP} + doc? ( + dev-libs/libxslt + app-text/docbook-sgml-utils + app-doc/doxygen + app-text/docbook-xsl-stylesheets + media-gfx/graphviz + )" +RDEPEND="${COMMON_DEP}" + +PATCHES=( + "${FILESDIR}/${P}-svncpp_link.patch" + "${FILESDIR}/${P}-locale.patch" + "${FILESDIR}/${P}-wx3.0.patch" + "${FILESDIR}/${P}-subversion1.9-private-api.patch" +) + +DOCS=( HACKING.txt TRANSLATIONS ) + +src_prepare() { + need-wxwidgets unicode + if use doc; then + mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die + fi + strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g') + sed \ + -e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \ + -i src/locale/Makefile.am || die + + mv configure.in configure.ac || die + + default + eautoreconf +} + +src_configure() { + append-cppflags $( apr-1-config --cppflags ) + econf \ + $(use_enable static-libs static) \ + $(use_with doc manpage) \ + $(use_with doc xsltproc) \ + $(use_with doc doxygen) \ + $(use_with doc dot) \ + --with-wx-config="${WX_CONFIG}" \ + --with-svn-lib="${EPREFIX}/usr/$(get_libdir)" \ + --with-svn-include="${EPREFIX}/usr/include" \ + --with-apr-config="${EPREFIX}/usr/bin/apr-1-config" \ + --with-apu-config="${EPREFIX}/usr/bin/apu-1-config" +} + +src_compile() { + default + use doc && emake -C doc/manpage manpage +} + +src_install() { + default + + doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png + make_desktop_entry rapidsvn "RapidSVN ${PV}" \ + "${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \ + "RevisionControl;Development" + + if use doc ; then + doman doc/manpage/${PN}.1 + dodoc doc/svncpp/html/* + fi + + prune_libtool_files +} + +src_test() { + pushd src/tests/svncpp > /dev/null || die + default + ./svncpptest | grep OK || die +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 15177886d6bf..101437eaa912 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -4,7 +4,7 @@ # # @ECLASS: elisp-common.eclass # @MAINTAINER: -# Gentoo GNU Emacs project <emacs@gentoo.org> +# Gentoo GNU Emacs project <gnu-emacs@gentoo.org> # @AUTHOR: # Matthew Kennedy <mkennedy@gentoo.org> # Jeremy Maitin-Shepard <jbms@attbi.com> diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 93a7d4bb2a37..660865c95cc0 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -4,7 +4,7 @@ # # @ECLASS: elisp.eclass # @MAINTAINER: -# Gentoo GNU Emacs project <emacs@gentoo.org> +# Gentoo GNU Emacs project <gnu-emacs@gentoo.org> # @AUTHOR: # Matthew Kennedy <mkennedy@gentoo.org> # Jeremy Maitin-Shepard <jbms@attbi.com> diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild index 435806842bd2..210b61b0cef9 100644 --- a/games-arcade/supertux/supertux-0.4.0.ebuild +++ b/games-arcade/supertux/supertux-0.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="debug" RDEPEND="dev-games/physfs diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild index 9450035d19aa..f1caf31ee1a5 100644 --- a/media-gfx/fbida/fbida-2.10.ebuild +++ b/media-gfx/fbida/fbida-2.10.ebuild @@ -13,7 +13,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" REQUIRED_USE=" pdf? ( tiff ) diff --git a/media-libs/cogl/cogl-1.22.0-r1.ebuild b/media-libs/cogl/cogl-1.22.0-r1.ebuild new file mode 100644 index 000000000000..6252c25820ab --- /dev/null +++ b/media-libs/cogl/cogl-1.22.0-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit eutils gnome2 multilib virtualx + +DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" +HOMEPAGE="http://www.cogl3d.org/" + +LICENSE="MIT BSD" +SLOT="1.0/20" # subslot = .so version + +# doc and profile disable for now due to bugs #484750 and #483332 +IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx wayland" # doc profile +REQUIRED_USE=" + wayland? ( gles2 ) + || ( gles2 opengl ) +" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +COMMON_DEPEND=" + >=dev-libs/glib-2.32:2 + x11-libs/cairo:= + >=x11-libs/gdk-pixbuf-2:2 + x11-libs/libX11 + >=x11-libs/libXcomposite-0.4 + x11-libs/libXdamage + x11-libs/libXext + >=x11-libs/libXfixes-3 + >=x11-libs/libXrandr-1.2 + virtual/opengl + gles2? ( media-libs/mesa[gles2] ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) + kms? ( + media-libs/mesa[gbm] + x11-libs/libdrm:= ) + pango? ( >=x11-libs/pango-1.20.0[introspection?] ) + wayland? ( + >=dev-libs/wayland-1.1.90 + media-libs/mesa[egl,wayland] ) +" +# before clutter-1.7, cogl was part of clutter +RDEPEND="${COMMON_DEPEND} + !<media-libs/clutter-1.7 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gtk-doc-am-1.13 + sys-devel/gettext + virtual/pkgconfig + test? ( + app-eselect/eselect-opengl + media-libs/mesa[classic] ) +" + +# Need classic mesa swrast for tests, llvmpipe causes a test failure +# For some reason GL3 conformance test all fails again... +RESTRICT="test" + +src_prepare() { + # Upstream fixes from 1.22 branch + # winsys-egl-kms: bypass initial output setup if kms fd passed in + epatch "${FILESDIR}"/${P}-initial-output.patch + + # kms-winsys: don't wait for a flip when page flipping fails + epatch "${FILESDIR}"/${P}-wait-flip.patch + + # Let cogl work with fglrx driver, bug #567168 + # https://bugzilla.gnome.org/show_bug.cgi?id=756306 + use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-1.22.0-fglrx.patch + + # Do not build examples + sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ + -i Makefile.am Makefile.in || die + + if ! use test ; then + # For some reason the configure switch will not completely disable + # tests being built + sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ + -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ + -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ + -i Makefile.am Makefile.in || die + fi + + gnome2_src_prepare +} + +src_configure() { + # TODO: think about quartz, sdl + # Prefer gl over gles2 if both are selected + # Profiling needs uprof, which is not available in portage yet, bug #484750 + # FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332 + gnome2_src_configure \ + --disable-examples-install \ + --disable-maintainer-flags \ + --enable-cairo \ + --enable-deprecated \ + --enable-gdk-pixbuf \ + --enable-glib \ + $(use_enable opengl glx) \ + $(use_enable opengl gl) \ + $(use_enable gles2) \ + $(use_enable gles2 cogl-gles2) \ + $(use_enable gles2 xlib-egl-platform) \ + $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \ + $(use_enable gstreamer cogl-gst) \ + $(use_enable introspection) \ + $(use_enable kms kms-egl-platform) \ + $(use_enable pango cogl-pango) \ + $(use_enable test unit-tests) \ + $(use_enable wayland wayland-egl-platform) \ + $(use_enable wayland wayland-egl-server) \ + --disable-profile +# $(use_enable profile) +} + +src_test() { + # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails + # NOTE: recheck if this is needed after every mesa bump + if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then + ewarn "Skipping tests because a binary OpenGL library is enabled. To" + ewarn "run tests for ${PN}, you need to enable the Mesa library:" + ewarn "# eselect opengl set xorg-x11" + return + fi + LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check +} + +src_install() { + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/{*.c,*.jpg} + fi + + gnome2_src_install + + # Remove silly examples-data directory + rm -rvf "${ED}/usr/share/cogl/examples-data/" || die +} diff --git a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch new file mode 100644 index 000000000000..e213d584d2f6 --- /dev/null +++ b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch @@ -0,0 +1,10 @@ +--- 122/cogl/driver/gl/gl/cogl-driver-gl.c 2015-09-02 18:39:02.000000000 +0200 ++++ 122b/cogl/driver/gl/gl/cogl-driver-gl.c 2015-10-18 10:37:14.052350142 +0200 +@@ -419,7 +419,7 @@ + if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2)) + /* We want to use version 120 if it is available so that the + * gl_PointCoord can be used. */ +- ctx->glsl_version_to_use = 120; ++ ctx->glsl_version_to_use = 150; + else + ctx->glsl_version_to_use = 110; diff --git a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch new file mode 100644 index 000000000000..d7f9d0ff99f4 --- /dev/null +++ b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch @@ -0,0 +1,46 @@ +From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Fri, 13 Nov 2015 13:35:05 -0500 +Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in + +if mutter is handling the output setup, then we shouldn't do it, +too. + +https://bugzilla.gnome.org/show_bug.cgi?id=758073 +--- + cogl/winsys/cogl-winsys-egl-kms.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c +index b460907..6d7049d 100644 +--- a/cogl/winsys/cogl-winsys-egl-kms.c ++++ b/cogl/winsys/cogl-winsys-egl-kms.c +@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, + return FALSE; + } + ++ /* Force a full modeset / drmModeSetCrtc on ++ * the first swap buffers call. ++ */ ++ kms_display->pending_set_crtc = TRUE; ++ ++ if (kms_renderer->opened_fd < 0) ++ return TRUE; ++ + output0 = find_output (0, + kms_renderer->fd, + resources, +@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, + kms_display->width = output0->mode.hdisplay; + kms_display->height = output0->mode.vdisplay; + +- /* We defer setting the crtc modes until the first swap_buffers request of a +- * CoglOnscreen framebuffer. */ +- kms_display->pending_set_crtc = TRUE; +- + return TRUE; + } + +-- +cgit v0.11.2 + diff --git a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch new file mode 100644 index 000000000000..b7c4d99a2812 --- /dev/null +++ b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch @@ -0,0 +1,42 @@ +From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Wed, 21 Oct 2015 15:47:01 -0400 +Subject: kms-winsys: don't wait for a flip when page flipping fails + +If we get EACCES from drmPageFlip we're not going to get +a flip event and shouldn't wait for one. + +This commit changes the EACCES path to silently ignore the +failed flip request and just clean up the fb. + +https://bugzilla.gnome.org/show_bug.cgi?id=756926 +--- + cogl/winsys/cogl-winsys-egl-kms.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c +index 20c325c..b460907 100644 +--- a/cogl/winsys/cogl-winsys-egl-kms.c ++++ b/cogl/winsys/cogl-winsys-egl-kms.c +@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) + for (l = kms_display->crtcs; l; l = l->next) + { + CoglKmsCrtc *crtc = l->data; +- int ret; ++ int ret = 0; + + if (crtc->count == 0 || crtc->ignore) + continue; +@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) + } + } + +- flip->pending++; ++ if (ret == 0) ++ flip->pending++; + } + + if (kms_renderer->page_flips_not_supported && needs_flip) +-- +cgit v0.11.2 + diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest index 101c1d91f531..0899c07d90aa 100644 --- a/media-plugins/live/Manifest +++ b/media-plugins/live/Manifest @@ -7,3 +7,4 @@ DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7 DIST live.2015.11.09.tar.gz 617651 SHA256 33dc683aae4cab9dd7cb05ff25ad35ddbd5ff6769f588a910644dced90e64ce8 SHA512 4c96f81a4c9379f7d1e2d63fa8db75bad6fba914862f538a4cb283ce7d7594f450682276ac684aa74b612d646eb05c0729eae48e00709f71215acb706c8a653f WHIRLPOOL c973a49fd0e5ed195dc4747e796a06b25d401792db3f469c8e8393b0407f3cefc3fdcaea2392bc59a7dd8762c99377adb8022f5fa1fd128cd8b62c86f03d2c1b DIST live.2015.12.22.tar.gz 5644431 SHA256 d0a8a0d13b79a8e34057d4c5c0a65572c2eba4948fcf5548d9d53ce994e14b91 SHA512 e5cec29b769e8c10dcc932c1ed96f88d216a3643b2301d36d8df58b8db9bf823247876f2b4cbccac0fcb61ae098eebff3df3b767b1710e5b8b279ffc3bec4eb1 WHIRLPOOL 46b7f3f5885115d5b7c4b024cd7ce95b1c47a8f7055c2640357f5beb6f1c0d0270a34a176b1ff8e7942394ede41ef2fc486238b1355860b7ee0a5ff3cf481df1 DIST live.2016.01.16.tar.gz 630314 SHA256 980f67cbf353e36275a4019277926f66b8d3d34c87f3a036706130760d4c4415 SHA512 160c1e43e783ec9de70eaf925ea8b26c9deaa72061b3ed89987418f6fd6c0600a98caeff192d7b1b8c165c60d1f21eb5a784f282a35b8ad7a5a9b6f10f29fb6e WHIRLPOOL 27e01f1f9088070651cd56417236f03cbaf3d9134b618ba46d6c184eec196f59ea0edcdf0534c732c2fe56acd3d493157615540aeb2c417990d9258fa4497314 +DIST live.2016.01.20.tar.gz 630353 SHA256 ab12dc388c750cee2d275dd4dd767448e2375178a77f4576f5fbd994befdcad4 SHA512 129a74745ccde26b5e929057e259c0ff549e2e42129c37d411c98f5fd97736e8385e09612ae9aedda32fc78fe29a9d49d69c0fa771cc0dc81fd764e2b153c60a WHIRLPOOL c89819d8b1fa1fb1984624afe91e391ba16764f2b193ee1fd7ddfd55856f1d374a468e35d287d15c2373b235093a8d512820c5866df1cbbc47e4ce38977b964c diff --git a/media-plugins/live/live-2016.01.20.ebuild b/media-plugins/live/live-2016.01.20.ebuild new file mode 100644 index 000000000000..a787b3130fd0 --- /dev/null +++ b/media-plugins/live/live-2016.01.20.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal + +DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming" +HOMEPAGE="http://www.live555.com/" +SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz + mirror://gentoo/${P/-/.}.tar.gz" + +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~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="examples static-libs" +DOCS=( "live-shared/README" ) + +# Alexis Ballier <aballier@gentoo.org> +# Be careful, bump this everytime you bump the package and the ABI has changed. +# If you don't know, ask someone. +LIVE_ABI_VERSION=7 +SLOT="0/${LIVE_ABI_VERSION}" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" + mv "${WORKDIR}/live" "${S}/" || die +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-recursive2.patch" + + if use static-libs ; then + cp -pPR live live-shared + mv live live-static + else + mv live live-shared + fi + + use static-libs && cp "${FILESDIR}/config.gentoo" live-static + cp "${FILESDIR}/config.gentoo-so-r1" live-shared + + case ${CHOST} in + *-solaris*) + use static-libs && { sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ + -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ + live-static/config.gentoo \ + || die ; } + sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ + -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ + live-shared/config.gentoo-so-r1 \ + || die + ;; + *-darwin*) + use static-libs && { sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \ + -e '/^LINK /s/$/ /' \ + -e '/^LIBRARY_LINK /s/$/ /' \ + -e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \ + live-static/config.gentoo \ + || die static ; } + sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \ + -e '/^LINK /s/$/ /' \ + -e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \ + -e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \ + -e '/^LIB_SUFFIX /s/so/dylib/' \ + live-shared/config.gentoo-so-r1 \ + || die shared + ;; + esac + multilib_copy_sources +} + +src_configure() { :; } + +multilib_src_compile() { + tc-export CC CXX LD + + if use static-libs ; then + cd "${BUILD_DIR}/live-static" + + einfo "Beginning static library build" + ./genMakefiles gentoo + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + fi + + cd "${BUILD_DIR}/live-shared" + einfo "Beginning shared library build" + ./genMakefiles gentoo-so-r1 + local suffix=$(get_libname ${LIVE_ABI_VERSION}) + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + + for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do + pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null + ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die + popd > /dev/null + done + + if multilib_is_native_abi; then + einfo "Beginning programs build" + for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do + cd "${BUILD_DIR}/live-shared/${i}" + emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + done + fi +} + +multilib_src_install() { + for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do + use static-libs && dolib.a live-static/${library}/lib${library}.a + dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION}) + dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname) + + insinto /usr/include/${library} + doins live-shared/${library}/include/*h + done + + if multilib_is_native_abi; then + # Should we really install these? + use examples && find live-shared/testProgs -type f -perm 755 -print0 | \ + xargs -0 dobin + + dobin live-shared/mediaServer/live555MediaServer + dobin live-shared/proxyServer/live555ProxyServer + fi +} diff --git a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild index c27eb1ba3290..26633ed5d523 100644 --- a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild +++ b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" +KEYWORDS="~alpha amd64 ~ppc ~x86" IUSE="" RDEPEND=">=media-radio/unixcw-3.3.1" diff --git a/media-radio/fldigi/fldigi-3.23.06.ebuild b/media-radio/fldigi/fldigi-3.23.06.ebuild index f7c21c7c178a..1310de5682d7 100644 --- a/media-radio/fldigi/fldigi-3.23.06.ebuild +++ b/media-radio/fldigi/fldigi-3.23.06.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="hamlib nls portaudio pulseaudio sndfile" RDEPEND="x11-libs/fltk:1[threads,xft] diff --git a/media-radio/grig/grig-0.8.1.ebuild b/media-radio/grig/grig-0.8.1.ebuild index f2c3326c633d..f431d7a52958 100644 --- a/media-radio/grig/grig-0.8.1.ebuild +++ b/media-radio/grig/grig-0.8.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND=" diff --git a/media-radio/unixcw/unixcw-3.5.0.ebuild b/media-radio/unixcw/unixcw-3.5.0.ebuild index 8f624adceba2..1450f102a5e7 100644 --- a/media-radio/unixcw/unixcw-3.5.0.ebuild +++ b/media-radio/unixcw/unixcw-3.5.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" +KEYWORDS="~alpha amd64 ~ppc ~x86" IUSE="alsa ncurses pulseaudio suid qt5" RDEPEND="ncurses? ( sys-libs/ncurses:= ) diff --git a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild index 70075baba0db..3228509d61d7 100644 --- a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild +++ b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-3 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND=" diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index fcd071cb423e..4b078c9915ba 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -1,4 +1,2 @@ -DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036 -DIST pulseaudio-6.0.tar.xz 1469248 SHA256 b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 SHA512 4f2293b41c8278047a41be4609a6bc267766874001092a91e785b05d5224fd82810862402942dadbb54bed7f74689779c958ca512666dfe6755d29551583cc2d WHIRLPOOL d75724f2ada640dabd256dc9e9840def17e78f63116c31df711d266349e9f4b99efbc797a5108649c860a5bf8ec8199383eaede440d8b4b655ef09f4ce37984f -DIST pulseaudio-7.0.tar.xz 1505864 SHA256 ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa SHA512 d5d6444df5429dd9f57c7653b1aebd6e257f5568511275cde087948f13fa6995ed41f8562d437bf30110a0c7fbd000d730925b6c0322d33d4ad8b82ed64393ae WHIRLPOOL d527530e9b4f1148990f0c7f197421573275fb2cc6c1952d0ad41f41421ce346bea1b6910455f79a0e83e1d7d3692a3d19b5ecaaab642183857282378f5701bc DIST pulseaudio-7.1.tar.xz 1506504 SHA256 e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9 SHA512 21f621bd76268b9dd6e5be2231b0e779a8e0cfdece44c46c8ac96a4e1d4df52fe5b9791ef95a0909a3c177bbfa5eab7d52fed9b43362840a9c8a6001e821175e WHIRLPOOL 940801193832d6e9903ef547666ed1a84910a075ec8f42a32c038efdb1d111608ccf3aa97b35970d726e4157459f98edb5e228dc82cdeb3029bd15b3fd3fe691 +DIST pulseaudio-8.0.tar.xz 1517656 SHA256 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989 SHA512 7008abf768f720839353038ffd3e35e442f82452aa7e27d446f75d403096b042643d2b2b1d153454302bd5a51f9217f4979c8995b80ba2695f141e6a29e164fa WHIRLPOOL 1b4efd629bfb5d1a40c4c4709854de1226f811345146e2bb34315d4690060d8b5ad691502c25d80272cb894473ba664b172b36a31ecb89b789a9bcd161392003 diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch deleted file mode 100644 index d14da07459ff..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001 -From: Alexander E. Patrakov <patrakov@gmail.com> -Date: Thu, 05 Jun 2014 16:29:25 +0000 -Subject: rtp-recv: fix crash on empty UDP packets (CVE-2014-3970) - -On FIONREAD returning 0 bytes, we cannot return success, as the caller -(rtpoll_work_cb in module-rtp-recv.c) would then try to -pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger -an assertion. - -Also we have to read out the possible empty packet from the socket, so -that the kernel doesn't tell us again and again about it. - -Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com> ---- -diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c -index 570737e..7b75e0e 100644 ---- a/src/modules/rtp/rtp.c -+++ b/src/modules/rtp/rtp.c -@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct - goto fail; - } - -- if (size <= 0) -- return 0; -+ if (size <= 0) { -+ /* size can be 0 due to any of the following reasons: -+ * -+ * 1. Somebody sent us a perfectly valid zero-length UDP packet. -+ * 2. Somebody sent us a UDP packet with a bad CRC. -+ * -+ * It is unknown whether size can actually be less than zero. -+ * -+ * In the first case, the packet has to be read out, otherwise the -+ * kernel will tell us again and again about it, thus preventing -+ * reception of any further packets. So let's just read it out -+ * now and discard it later, when comparing the number of bytes -+ * received (0) with the number of bytes wanted (1, see below). -+ * -+ * In the second case, recvmsg() will fail, thus allowing us to -+ * return the error. -+ * -+ * Just to avoid passing zero-sized memchunks and NULL pointers to -+ * recvmsg(), let's force allocation of at least one byte by setting -+ * size to 1. -+ */ -+ size = 1; -+ } - - if (c->memchunk.length < (unsigned) size) { - size_t l; --- -cgit v0.9.0.2-2-gbebe diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch deleted file mode 100644 index e8ff6e051ae4..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ef4a41e8b0ef81a53769d853dbc7679b25252327 Mon Sep 17 00:00:00 2001 -From: David Henningsson <david.henningsson@canonical.com> -Date: Fri, 28 Mar 2014 11:59:09 +0100 -Subject: [PATCH 36/38] module-switch-on-port-available: Don't switch profiles - on uninitialized cards - -This could cause the HDMI port to become the default on some systems -where analog output was available. - -BugLink: https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1256511 -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73375 -Signed-off-by: David Henningsson <david.henningsson@canonical.com> ---- - src/modules/module-switch-on-port-available.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c -index 2c7ad17..c560306 100644 ---- a/src/modules/module-switch-on-port-available.c -+++ b/src/modules/module-switch-on-port-available.c -@@ -173,6 +173,11 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port - return PA_HOOK_OK; - } - -+ if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0) -+ /* This card is not initialized yet. We'll handle it in -+ sink_new / source_new callbacks later. */ -+ return PA_HOOK_OK; -+ - find_sink_and_source(card, port, &sink, &source); - - is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name); --- -1.9.0 - diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch deleted file mode 100644 index d90399be3653..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d03ffdccdb7286021e53876ba5d4adf9a1edd0d0 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Sat, 15 Mar 2014 09:37:05 +0200 -Subject: zeroconf-publish: Add locking around pa_mainloop_api_once() - -Commit e1e154c7377779377fa1a36655a10effd693f7b5 added locking around -pa_mainloop_api_once() everywhere except pa__done(). This fixes that -omission. - -diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c -index 0110e1d..35277c2 100644 ---- a/src/modules/module-zeroconf-publish.c -+++ b/src/modules/module-zeroconf-publish.c -@@ -807,7 +807,9 @@ void pa__done(pa_module*m) { - if (!(u = m->userdata)) - return; - -+ pa_threaded_mainloop_lock(u->mainloop); - pa_mainloop_api_once(u->api, client_free, u); -+ pa_threaded_mainloop_unlock(u->mainloop); - pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE); - - pa_threaded_mainloop_stop(u->mainloop); --- -cgit v0.10.2 - diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch deleted file mode 100644 index 7d4de455941f..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 37e73e10be9e42544a4cc160ff85ccada2cc9aa9 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Sat, 15 Mar 2014 09:37:06 +0200 -Subject: zeroconf-publish: Don't react to messages while shutting down - -This fixes a case where pa__done() is called while -AVAHI_MESSAGE_PUBLISH_ALL is waiting for processing. The -pa_asyncmsgq_wait_for(AVAHI_MESSAGE_SHUTDOWN_COMPLETE) call will -process all pending messages, and processing AVAHI_MESSAGE_PUBLISH_ALL -causes publish_all_services(), and that in turn accesses u->services, -which has been already freed at this point. If we are shutting down, -we shouldn't react to any of the messages that the Avahi thread is -sending to the main thread. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184 - -diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c -index 35277c2..db92850 100644 ---- a/src/modules/module-zeroconf-publish.c -+++ b/src/modules/module-zeroconf-publish.c -@@ -141,6 +141,8 @@ struct userdata { - pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot; - - pa_native_protocol *native; -+ -+ bool shutting_down; - }; - - /* Runs in PA mainloop context */ -@@ -638,6 +640,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) { - static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { - struct userdata *u = (struct userdata *) data; - -+ pa_assert(u); -+ -+ if (u->shutting_down) -+ return 0; -+ - switch (code) { - case AVAHI_MESSAGE_PUBLISH_ALL: - publish_all_services(u); -@@ -647,10 +654,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs - pa_module_unload(u->core, u->module, true); - break; - -- case AVAHI_MESSAGE_SHUTDOWN_COMPLETE: -- /* pa__done() is waiting for this */ -- break; -- - default: - pa_assert_not_reached(); - } -@@ -797,7 +800,7 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { - if (u->avahi_poll) - pa_avahi_poll_free(u->avahi_poll); - -- pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL); -+ pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL); - } - - void pa__done(pa_module*m) { -@@ -807,6 +810,8 @@ void pa__done(pa_module*m) { - if (!(u = m->userdata)) - return; - -+ u->shutting_down = true; -+ - pa_threaded_mainloop_lock(u->mainloop); - pa_mainloop_api_once(u->api, client_free, u); - pa_threaded_mainloop_unlock(u->mainloop); --- -cgit v0.10.2 - diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch deleted file mode 100644 index 6bdd46415cd2..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b75a20db10c8605d98324a7782a7da6483ae9f14 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Wed, 19 Mar 2014 09:50:39 +0200 -Subject: zeroconf-publish: Don't assume any particular defer event ordering - -Also, initialize userdata with zeros to avoid invalid pointers in -client_free(). - -This fixes a crash when client_free() is called before -create_client(). The whole issue could be avoided by using some other -mechanism than defer events for running the two functions, but I'll -do that change later (I have also other cleanups planned for -zeroconf-publish). - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184 - -diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c -index db92850..be8806e 100644 ---- a/src/modules/module-zeroconf-publish.c -+++ b/src/modules/module-zeroconf-publish.c -@@ -142,7 +142,8 @@ struct userdata { - - pa_native_protocol *native; - -- bool shutting_down; -+ bool shutting_down; /* Used in the main thread. */ -+ bool client_freed; /* Used in the Avahi thread. */ - }; - - /* Runs in PA mainloop context */ -@@ -707,6 +708,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { - struct userdata *u = (struct userdata *) userdata; - int error; - -+ /* create_client() and client_free() are called via defer events. If the -+ * two defer events are created very quickly one after another, we can't -+ * assume that the defer event that runs create_client() will be dispatched -+ * before the defer event that runs client_free() (at the time of writing, -+ * pa_mainloop actually always dispatches queued defer events in reverse -+ * creation order). For that reason we must be prepared for the case where -+ * client_free() has already been called. */ -+ if (u->client_freed) -+ return; -+ - pa_thread_mq_install(&u->thread_mq); - - if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) { -@@ -733,7 +744,7 @@ int pa__init(pa_module*m) { - goto fail; - } - -- m->userdata = u = pa_xnew(struct userdata, 1); -+ m->userdata = u = pa_xnew0(struct userdata, 1); - u->core = m->core; - u->module = m; - u->native = pa_native_protocol_get(u->core); -@@ -757,8 +768,6 @@ int pa__init(pa_module*m) { - u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u); - u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u); - -- u->main_entry_group = NULL; -- - un = pa_get_user_name_malloc(); - hn = pa_get_host_name_malloc(); - u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1); -@@ -801,6 +810,8 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { - pa_avahi_poll_free(u->avahi_poll); - - pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL); -+ -+ u->client_freed = true; - } - - void pa__done(pa_module*m) { --- -cgit v0.10.2 - diff --git a/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch deleted file mode 100644 index 4e22f5e95d1c..000000000000 --- a/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Wim Taymans -Date: Wed, 7 Jan 2015 11:20:01 +0100 -Subject: [PATCH] svolume.orc: avoid parameter loading undefined behaviour - -In some cases, depending on the instruction that performs the load, orc -ignores the size of the parameter when loading it for the first time. -Explicitly load the parameter into a temp to make sure it is loaded -correctly, like we do for the 2ch case. - -See https://bugzilla.gnome.org/show_bug.cgi?id=742271 ---- - src/pulsecore/svolume.orc | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/pulsecore/svolume.orc b/src/pulsecore/svolume.orc -index 0edbefb..f869893 100644 ---- a/src/pulsecore/svolume.orc -+++ b/src/pulsecore/svolume.orc -@@ -45,13 +45,15 @@ - - .function pa_volume_s16ne_orc_1ch - .dest 2 samples int16_t --.param 4 v int32_t -+.param 4 vols int32_t -+.temp 4 v - .temp 2 vh - .temp 4 s - .temp 4 mh - .temp 4 ml - .temp 4 signc - -+loadpl v, vols - convuwl s, samples - x2 cmpgtsw signc, 0, s - x2 andw signc, signc, v --- -1.9.3 diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild deleted file mode 100644 index 60af38bda9b6..000000000000 --- a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="http://www.pulseaudio.org/" -SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" - -# libpulse-simple and libpulse link to libpulse-core; this is daemon's -# library and can link to gdbm and other GPL-only libraries. In this -# cases, we have a fully GPL-2 package. Leaving the rest of the -# GPL-forcing USE flags for those who use them. -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" - -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" - -IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome -gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd -system-wide tcpd test +udev +webrtc-aec +X xen" - -# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac -REQUIRED_USE="bluetooth? ( dbus ) - udev? ( || ( alsa oss ) )" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - elibc_glibc? ( virtual/libc ) - elibc_uclibc? ( virtual/libc ) - dev-libs/libpcre - ) - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - ) - caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] ) - avahi? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) - tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - bluetooth? ( - net-wireless/bluez:= - >=sys-apps/dbus-1.0.0 - media-libs/sbc - ) - asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/udev-143[hwdb(+)] ) - realtime? ( sys-auth/rtkit ) - equalizer? ( sci-libs/fftw:3.0 ) - orc? ( >=dev-lang/orc-0.4.15 ) - ssl? ( dev-libs/openssl:0 ) - >=media-libs/speex-1.2_rc1 - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( media-libs/webrtc-audio-processing ) - xen? ( app-emulation/xen-tools ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - dev-libs/json-c[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) - || ( - dev-libs/libltdl:0 - ( >=sys-devel/libtool-2.4.2 <sys-devel/libtool-2.4.3-r2 ) - ) -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] - ) - dev-libs/libatomic_ops - virtual/pkgconfig - system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) - dev-util/intltool - >=sys-devel/gettext-0.18.1 -" -# This is a PDEPEND to avoid a circular dep -PDEPEND="alsa? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )" - -# alsa-utils dep is for the alsasound init.d script (see bug #155707) -# bluez dep is for the bluetooth init.d script -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( net-wireless/bluez:= ) - ) -" - -pkg_pretend() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" - check_extra_config - - if linux_config_exists; then - local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) - if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then - ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" - ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" - fi - fi -} - -pkg_setup() { - linux-info_pkg_setup - - enewgroup audio 18 # Just make sure it exists - - if use system-wide; then - enewgroup pulse-access - enewgroup pulse - enewuser pulse -1 -1 /var/run/pulse pulse,audio - fi -} - -src_prepare() { - # Skip test that cannot work with sandbox, bug #501846 - sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die - - # Fix CVE-2014-3970, bug #512516 - epatch "${FILESDIR}/${P}-crash-udp.patch" - - # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master') - epatch "${FILESDIR}/${P}-module-switch.patch" - - epatch_user - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - #elif use tdb; then - # myconf+=( --with-database=tdb ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if has_version '<net-wireless/bluez-5'; then - myconf+=( --disable-bluez5 --enable-bluez4 ) - else - myconf+=( --enable-bluez5 --disable-bluez4 ) - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_enable systemd) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_enable xen) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-systemd - --disable-openssl - --disable-orc - --disable-webrtc-aec - --disable-xen - --without-fftw - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src ${targets[@]} - fi -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - pushd doxygen - doxygen doxygen.conf - popd - fi -} - -multilib_src_test() { - # We avoid running the toplevel check target because that will run - # po/'s tests too, and they are broken. Officially, it should work - # with intltool 0.41, but that doesn't look like a stable release. - if multilib_is_native_abi; then - emake -C src check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C src \ - install-libLTLIBRARIES \ - lib_LTLIBRARIES="${targets[*]}" \ - install-pulseincludeHEADERS - fi -} - -multilib_src_install_all() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - if use system-wide; then - newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio - - use_define() { - local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} - - use "$1" && echo "-D$define" || echo "-U$define" - } - - unifdef $(use_define avahi) \ - $(use_define alsa) \ - $(use_define bluetooth) \ - $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-5" \ - > "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - - systemd_dounit "${FILESDIR}/${PN}.service" - fi - - use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - if use doc; then - pushd doxygen/html - dohtml * - popd - fi - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - if use system-wide; then - elog "You have enabled the 'system-wide' USE flag for pulseaudio." - elog "This mode should only be used on headless servers, embedded systems," - elog "or thin clients. It will usually require manual configuration, and is" - elog "incompatible with many expected pulseaudio features." - elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." - elog "For more information, see" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" - elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." - elog "This will build the equalizer module, but the 'qpaeq' tool" - elog "which is required to set equalizer levels will not work." - fi -} diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild deleted file mode 100644 index 731060b641f1..000000000000 --- a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="http://www.pulseaudio.org/" -SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" - -# libpulse-simple and libpulse link to libpulse-core; this is daemon's -# library and can link to gdbm and other GPL-only libraries. In this -# cases, we have a fully GPL-2 package. Leaving the rest of the -# GPL-forcing USE flags for those who use them. -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" - -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib -gnome gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd -system-wide tcpd test +udev +webrtc-aec +X xen zeroconf" - -# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac -REQUIRED_USE="bluetooth? ( dbus ) - udev? ( || ( alsa oss ) )" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - elibc_glibc? ( virtual/libc ) - elibc_uclibc? ( virtual/libc ) - dev-libs/libpcre - ) - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - ) - caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] ) - zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) - tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - bluetooth? ( - net-wireless/bluez:= - >=sys-apps/dbus-1.0.0 - media-libs/sbc - ) - asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/udev-143[hwdb(+)] ) - realtime? ( sys-auth/rtkit ) - equalizer? ( sci-libs/fftw:3.0 ) - orc? ( >=dev-lang/orc-0.4.15 ) - ssl? ( dev-libs/openssl:0 ) - >=media-libs/speex-1.2_rc1 - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( media-libs/webrtc-audio-processing ) - xen? ( app-emulation/xen-tools ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - dev-libs/json-c[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) - dev-libs/libltdl:0 -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] - ) - dev-libs/libatomic_ops - virtual/pkgconfig - system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) - dev-util/intltool - >=sys-devel/gettext-0.18.1 -" -# This is a PDEPEND to avoid a circular dep -PDEPEND="alsa? ( alsa-plugin? ( - >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] -) )" - -# alsa-utils dep is for the alsasound init.d script (see bug #155707) -# bluez dep is for the bluetooth init.d script -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( net-wireless/bluez:= ) - ) -" - -pkg_pretend() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" - check_extra_config - - if linux_config_exists; then - local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) - if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then - ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" - ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" - fi - fi -} - -pkg_setup() { - gnome2_environment_reset - linux-info_pkg_setup - - enewgroup audio 18 # Just make sure it exists - - if use system-wide; then - enewgroup pulse-access - enewgroup pulse - enewuser pulse -1 -1 /var/run/pulse pulse,audio - fi -} - -src_prepare() { - # Skip test that cannot work with sandbox, bug #501846 - sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die - - # Fix CVE-2014-3970, bug #512516 (from 'master') - epatch "${FILESDIR}/${P}-crash-udp.patch" - - # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master') - epatch "${FILESDIR}/${P}-module-switch.patch" - - # Fix module-zeroconf-publish crashes, bug #504612 (from 'master') - epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch - - # svolume.orc: avoid parameter loading undefined behaviour - # orc-0.4.23 triggers a bug on certain volume changes with PA, leading to distorted sounds - # http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-January/022905.html - # Gentoo bug 534144 - epatch "${FILESDIR}"/svolume-fix_param_loading_undefined_beh.patch - - epatch_user - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - #elif use tdb; then - # myconf+=( --with-database=tdb ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if has_version '<net-wireless/bluez-5'; then - myconf+=( --disable-bluez5 --enable-bluez4 ) - else - myconf+=( --enable-bluez5 --disable-bluez4 ) - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable zeroconf avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_enable systemd) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_enable xen) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-systemd - --disable-openssl - --disable-orc - --disable-webrtc-aec - --disable-xen - --without-fftw - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la - fi -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - pushd doxygen - doxygen doxygen.conf - popd - fi -} - -multilib_src_test() { - # We avoid running the toplevel check target because that will run - # po/'s tests too, and they are broken. Officially, it should work - # with intltool 0.41, but that doesn't look like a stable release. - if multilib_is_native_abi; then - emake -C src check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C src \ - install-libLTLIBRARIES \ - install-padsplibLTLIBRARIES \ - lib_LTLIBRARIES="${targets[*]}" \ - install-pulseincludeHEADERS - fi -} - -multilib_src_install_all() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - if use system-wide; then - newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio - - use_define() { - local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} - - use "$1" && echo "-D$define" || echo "-U$define" - } - - unifdef $(use_define zeroconf AVAHI) \ - $(use_define alsa) \ - $(use_define bluetooth) \ - $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-5" \ - > "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - - systemd_dounit "${FILESDIR}/${PN}.service" - fi - - use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - if use doc; then - pushd doxygen/html - dohtml * - popd - fi - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - if use system-wide; then - elog "You have enabled the 'system-wide' USE flag for pulseaudio." - elog "This mode should only be used on headless servers, embedded systems," - elog "or thin clients. It will usually require manual configuration, and is" - elog "incompatible with many expected pulseaudio features." - elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." - elog "For more information, see" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" - elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." - elog "This will build the equalizer module, but the 'qpaeq' tool" - elog "which is required to set equalizer levels will not work." - fi -} diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild deleted file mode 100644 index 8d6743476192..000000000000 --- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="http://www.pulseaudio.org/" -SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" - -# libpulse-simple and libpulse link to libpulse-core; this is daemon's -# library and can link to gdbm and other GPL-only libraries. In this -# cases, we have a fully GPL-2 package. Leaving the rest of the -# GPL-forcing USE flags for those who use them. -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" - -SLOT="0" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib - gnome gtk ipv6 jack libsamplerate lirc native-headset neon ofono-headset - +orc oss qt4 realtime selinux ssl systemd system-wide tcpd test +udev - +webrtc-aec +X xen zeroconf" - -# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac -REQUIRED_USE="bluetooth? ( dbus ) - ofono-headset? ( bluetooth ) - native-headset? ( bluetooth ) - udev? ( || ( alsa oss ) )" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - elibc_glibc? ( virtual/libc ) - elibc_uclibc? ( virtual/libc ) - dev-libs/libpcre - ) - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - ) - caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] ) - zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) - tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - bluetooth? ( - net-wireless/bluez:= - >=sys-apps/dbus-1.0.0 - media-libs/sbc - ) - asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/udev-143[hwdb(+)] ) - realtime? ( sys-auth/rtkit ) - equalizer? ( sci-libs/fftw:3.0 ) - ofono-headset? ( >=net-misc/ofono-1.13 ) - orc? ( >=dev-lang/orc-0.4.15 ) - ssl? ( dev-libs/openssl:0 ) - >=media-libs/speex-1.2_rc1 - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( media-libs/webrtc-audio-processing ) - xen? ( app-emulation/xen-tools ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) - dev-libs/libltdl:0 - selinux? ( sec-policy/selinux-pulseaudio ) -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] - ) - dev-libs/libatomic_ops - virtual/pkgconfig - system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) - dev-util/intltool - >=sys-devel/gettext-0.18.1 -" -# This is a PDEPEND to avoid a circular dep -PDEPEND="alsa? ( alsa-plugin? ( - >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] -) )" - -# alsa-utils dep is for the alsasound init.d script (see bug #155707) -# bluez dep is for the bluetooth init.d script -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( net-wireless/bluez:= ) - ) -" - -pkg_pretend() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" - check_extra_config - - if linux_config_exists; then - local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) - if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then - ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" - ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" - fi - fi -} - -pkg_setup() { - linux-info_pkg_setup - gnome2_environment_reset #543364 - - enewgroup audio 18 # Just make sure it exists - - if use system-wide; then - enewgroup pulse-access - enewgroup pulse - enewuser pulse -1 -1 /var/run/pulse pulse,audio - fi -} - -src_prepare() { - # Skip test that cannot work with sandbox, bug #501846 - sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die - - # Fix CVE-2014-3970, bug #512516 (from 'master') - #epatch "${FILESDIR}/${P}-crash-udp.patch" - - # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master') - #epatch "${FILESDIR}/${P}-module-switch.patch" - - # Fix module-zeroconf-publish crashes, bug #504612 (from 'master') - #epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch - - epatch_user - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - #elif use tdb; then - # myconf+=( --with-database=tdb ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if multilib_is_native_abi; then - if has_version '<net-wireless/bluez-5'; then - myconf+=( --disable-bluez5 --enable-bluez4 ) - else - myconf+=( --enable-bluez5 --disable-bluez4 - $(use_enable native-headset bluez5-native-headset) - $(use_enable ofono-headset bluez5-ofono-headset) ) - fi - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable zeroconf avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_enable systemd systemd-daemon) - $(use_enable systemd systemd-login) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_enable xen) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - --with-systemduserunitdir=$(systemd_get_userunitdir) - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-openssl - --disable-orc - --disable-webrtc-aec - --disable-xen - --without-fftw - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la - fi -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - pushd doxygen - doxygen doxygen.conf - popd - fi -} - -multilib_src_test() { - # We avoid running the toplevel check target because that will run - # po/'s tests too, and they are broken. Officially, it should work - # with intltool 0.41, but that doesn't look like a stable release. - if multilib_is_native_abi; then - emake -C src check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C src \ - install-libLTLIBRARIES \ - install-padsplibLTLIBRARIES \ - lib_LTLIBRARIES="${targets[*]}" \ - install-pulseincludeHEADERS - fi -} - -multilib_src_install_all() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - if use system-wide; then - newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio - - use_define() { - local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} - - use "$1" && echo "-D$define" || echo "-U$define" - } - - unifdef $(use_define zeroconf AVAHI) \ - $(use_define alsa) \ - $(use_define bluetooth) \ - $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-5" \ - > "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - - systemd_dounit "${FILESDIR}/${PN}.service" - fi - - use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - if use doc; then - pushd doxygen/html - dohtml * - popd - fi - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - if use system-wide; then - elog "You have enabled the 'system-wide' USE flag for pulseaudio." - elog "This mode should only be used on headless servers, embedded systems," - elog "or thin clients. It will usually require manual configuration, and is" - elog "incompatible with many expected pulseaudio features." - elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." - elog "For more information, see" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" - elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." - elog "This will build the equalizer module, but the 'qpaeq' tool" - elog "which is required to set equalizer levels will not work." - fi - - if use native-headset && use ofono-headset; then - elog "You have enabled both native and ofono headset profiles. The runtime decision" - elog "which to use is done via the 'headset' argument of module-bluetooth-discover." - fi - - if use libsamplerate; then - elog "The libsamplerate based resamplers are now deprecated, because they offer no" - elog "particular advantage over speex. Upstream suggests disabling them." - fi - - # Needed for pulseaudio-6.0 update from older versions - if use udev; then - if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then - udevadm control --reload && udevadm trigger - fi - fi -} diff --git a/media-sound/pulseaudio/pulseaudio-7.0.ebuild b/media-sound/pulseaudio/pulseaudio-7.0.ebuild deleted file mode 100644 index a441fda7d4cb..000000000000 --- a/media-sound/pulseaudio/pulseaudio-7.0.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="http://www.pulseaudio.org/" -SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" - -# libpulse-simple and libpulse link to libpulse-core; this is daemon's -# library and can link to gdbm and other GPL-only libraries. In this -# cases, we have a fully GPL-2 package. Leaving the rest of the -# GPL-forcing USE flags for those who use them. -LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" - -# +alsa-plugin as discussed in bug #519530 -IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib -gnome gtk ipv6 jack libsamplerate lirc native-headset neon ofono-headset -+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev -+webrtc-aec +X xen zeroconf" - -# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac -REQUIRED_USE=" - bluetooth? ( dbus ) - ofono-headset? ( bluetooth ) - native-headset? ( bluetooth ) - udev? ( || ( alsa oss ) ) -" - -# libpcre needed in some cases, bug #472228 -RDEPEND=" - || ( - elibc_glibc? ( virtual/libc ) - elibc_uclibc? ( virtual/libc ) - dev-libs/libpcre - ) - >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] - X? ( - >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - ) - caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] ) - zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) - tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:3 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - bluetooth? ( - net-wireless/bluez:= - >=sys-apps/dbus-1.0.0 - media-libs/sbc - ) - asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/udev-143[hwdb(+)] ) - realtime? ( sys-auth/rtkit ) - equalizer? ( sci-libs/fftw:3.0 ) - ofono-headset? ( >=net-misc/ofono-1.13 ) - orc? ( >=dev-lang/orc-0.4.15 ) - sox? ( >=media-libs/soxr-0.1.1 ) - ssl? ( dev-libs/openssl:0 ) - >=media-libs/speex-1.2_rc1 - gdbm? ( sys-libs/gdbm ) - webrtc-aec? ( media-libs/webrtc-audio-processing ) - xen? ( app-emulation/xen-tools ) - systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) - >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) - dev-libs/libltdl:0 - selinux? ( sec-policy/selinux-pulseaudio ) -" -# it's a valid RDEPEND, libltdl.so is used for native abi - -DEPEND="${RDEPEND} - sys-devel/m4 - doc? ( app-doc/doxygen ) - test? ( dev-libs/check ) - X? ( - x11-proto/xproto[${MULTILIB_USEDEP}] - >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] - ) - dev-libs/libatomic_ops - virtual/pkgconfig - system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) - dev-util/intltool - >=sys-devel/gettext-0.18.1 -" -# This is a PDEPEND to avoid a circular dep -PDEPEND=" - alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) ) -" - -# alsa-utils dep is for the alsasound init.d script (see bug #155707) -# bluez dep is for the bluetooth init.d script -# PyQt4 dep is for the qpaeq script -RDEPEND="${RDEPEND} - equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) - system-wide? ( - alsa? ( media-sound/alsa-utils ) - bluetooth? ( net-wireless/bluez:= ) - ) -" - -pkg_pretend() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" - check_extra_config - - if linux_config_exists; then - local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) - if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then - ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" - ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" - fi - fi -} - -pkg_setup() { - linux-info_pkg_setup - gnome2_environment_reset #543364 - - enewgroup audio 18 # Just make sure it exists - - if use system-wide; then - enewgroup pulse-access - enewgroup pulse - enewuser pulse -1 -1 /var/run/pulse pulse,audio - fi -} - -src_prepare() { - # Skip test that cannot work with sandbox, bug #501846 - sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die - - epatch_user - eautoreconf -} - -multilib_src_configure() { - local myconf=() - - if use gdbm; then - myconf+=( --with-database=gdbm ) - else - myconf+=( --with-database=simple ) - fi - - if use bluetooth; then - if multilib_is_native_abi; then - if has_version '<net-wireless/bluez-5'; then - myconf+=( --disable-bluez5 --enable-bluez4 ) - else - myconf+=( --enable-bluez5 --disable-bluez4 - $(use_enable native-headset bluez5-native-headset) - $(use_enable ofono-headset bluez5-ofono-headset) ) - fi - fi - else - myconf+=( --disable-bluez5 --disable-bluez4 ) - fi - - myconf+=( - --enable-largefile - $(use_enable glib glib2) - --disable-solaris - $(use_enable asyncns) - $(use_enable oss oss-output) - $(use_enable alsa) - $(use_enable lirc) - $(use_enable neon neon-opt) - $(use_enable tcpd tcpwrap) - $(use_enable jack) - $(use_enable zeroconf avahi) - $(use_enable dbus) - $(use_enable gnome gconf) - $(use_enable gtk gtk3) - $(use_enable libsamplerate samplerate) - $(use_enable orc) - $(use_enable X x11) - $(use_enable test default-build-tests) - $(use_enable udev) - $(use_with sox soxr) - $(use_enable systemd systemd-daemon) - $(use_enable systemd systemd-login) - $(use_enable systemd systemd-journal) - $(use_enable ipv6) - $(use_enable ssl openssl) - $(use_enable webrtc-aec) - $(use_enable xen) - $(use_with caps) - $(use_with equalizer fftw) - --disable-adrian-aec - --disable-esound - --localstatedir="${EPREFIX}"/var - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - --with-systemduserunitdir=$(systemd_get_userunitdir) - ) - - if ! multilib_is_native_abi; then - # disable all the modules and stuff - myconf+=( - --disable-oss-output - --disable-alsa - --disable-lirc - --disable-jack - --disable-avahi - --disable-gconf - --disable-gtk3 - --disable-samplerate - --disable-bluez4 - --disable-bluez5 - --disable-udev - --disable-openssl - --disable-orc - --disable-webrtc-aec - --disable-xen - --without-fftw - --without-soxr - - # tests involve random modules, so just do them for the native - --disable-default-build-tests - - # hack around unnecessary checks - # (results don't matter, we're not building anything using it) - ac_cv_lib_ltdl_lt_dladvise_init=yes - --with-database=simple - LIBSPEEX_CFLAGS=' ' - LIBSPEEX_LIBS=' ' - ) - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - use doc && emake doxygen - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la - fi -} - -multilib_src_test() { - # We avoid running the toplevel check target because that will run - # po/'s tests too, and they are broken. Officially, it should work - # with intltool 0.41, but that doesn't look like a stable release. - if multilib_is_native_abi; then - emake -C src check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install - use doc && dohtml -r doxygen/html/ - else - local targets=( libpulse.la libpulse-simple.la ) - use glib && targets+=( libpulse-mainloop-glib.la ) - emake DESTDIR="${D}" install-pkgconfigDATA - emake DESTDIR="${D}" -C src \ - install-libLTLIBRARIES \ - install-padsplibLTLIBRARIES \ - lib_LTLIBRARIES="${targets[*]}" \ - install-pulseincludeHEADERS - fi -} - -multilib_src_install_all() { - # Drop the script entirely if X is disabled - use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 - - if use system-wide; then - newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio - - use_define() { - local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} - - use "$1" && echo "-D$define" || echo "-U$define" - } - - unifdef $(use_define zeroconf AVAHI) \ - $(use_define alsa) \ - $(use_define bluetooth) \ - $(use_define udev) \ - "${FILESDIR}/pulseaudio.init.d-5" \ - > "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - - systemd_dounit "${FILESDIR}/${PN}.service" - fi - - use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc NEWS README todo - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - - # We need /var/run/pulse, bug #442852 - use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" - - # Prevent warnings when system-wide is not used, bug #447694 - use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf - - prune_libtool_files --all -} - -pkg_postinst() { - if use system-wide; then - elog "You have enabled the 'system-wide' USE flag for pulseaudio." - elog "This mode should only be used on headless servers, embedded systems," - elog "or thin clients. It will usually require manual configuration, and is" - elog "incompatible with many expected pulseaudio features." - elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." - elog "For more information, see" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" - elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" - elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - fi - - if use equalizer && ! use qt4; then - elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." - elog "This will build the equalizer module, but the 'qpaeq' tool" - elog "which is required to set equalizer levels will not work." - fi - - if use native-headset && use ofono-headset; then - elog "You have enabled both native and ofono headset profiles. The runtime decision" - elog "which to use is done via the 'headset' argument of module-bluetooth-discover." - fi - - if use libsamplerate; then - elog "The libsamplerate based resamplers are now deprecated, because they offer no" - elog "particular advantage over speex. Upstream suggests disabling them." - fi - - # Needed for pulseaudio-6.0 update from older versions - if use udev; then - if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then - udevadm control --reload && udevadm trigger - fi - fi -} diff --git a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-8.0.ebuild index 284d4f05056d..ef090e542b40 100644 --- a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-8.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal +inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal DESCRIPTION="A networked sound server with an advanced plugin system" HOMEPAGE="http://www.pulseaudio.org/" diff --git a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff index 603901868e6f..3a5335bdbb81 100644 --- a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff +++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff @@ -1,5 +1,5 @@ ---- splay.cc~ 2005-04-03 19:56:37.000000000 -0300 -+++ splay.cc 2005-04-03 19:58:24.000000000 -0300 +--- splay-0.9.5.2/apps/splay.cc ++++ splay-0.9.5.2/apps/splay.cc @@ -184,9 +184,11 @@ delete mytag; diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch new file mode 100644 index 000000000000..286228af449f --- /dev/null +++ b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch @@ -0,0 +1,211 @@ +--- splay-0.9.5.2/apps/common.cc ++++ splay-0.9.5.2/apps/common.cc +@@ -34,7 +34,7 @@ + int splay_threadnum=50; + #endif + +-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= ++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= + { "Failed to open sound device.", + "Sound device is busy.", + "Buffersize of sound device is wrong.", +--- splay-0.9.5.2/apps/splay.cc ++++ splay-0.9.5.2/apps/splay.cc +@@ -16,20 +16,23 @@ + + #include <sys/types.h> + #include <sys/wait.h> +-#include <iostream.h> ++#include <iostream> + + #ifdef HAVE_LIBID3 + #include <id3/tag.h> + #include <id3/misc_support.h> + #endif /* HAVE_LIBID3 */ + +-#include <iomanip.h> ++#include <iomanip> ++ ++using std::cout; ++using std::endl; + + #include "mpegsound.h" + + #include "splay.h" + +-static char *help= ++static const char *help= + "\t-2 : playing with half frequency.\n" + "\t-e : exit when playing is done. (only XSPLAY)\n" + "\t-f : display frame and time info (played and remaining).\n" +--- splay-0.9.5.2/apps/splay.h ++++ splay-0.9.5.2/apps/splay.h +@@ -20,7 +20,7 @@ + splay_forcetomonoflag, + splay_frameinfo; + +-extern char *splay_Sounderrors[]; ++extern const char *splay_Sounderrors[]; + + #ifdef PTHREADEDMPEG + extern int splay_threadnum; +--- splay-0.9.5.2/apps/xsplay.cc ++++ splay-0.9.5.2/apps/xsplay.cc +@@ -29,8 +29,8 @@ + #include <fcntl.h> + #include <string.h> + #include <unistd.h> +-#include <iostream.h> +-#include <iomanip.h> ++#include <iostream> ++#include <iomanip> + + #include "mpegsound.h" + #include "xsplay.h" +--- splay-0.9.5.2/libs/fileplayer.cc ++++ splay-0.9.5.2/libs/fileplayer.cc +@@ -10,7 +10,7 @@ + #endif + + #include <string.h> +-#include <iostream.h> ++#include <iostream> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -18,6 +18,10 @@ + + #include "mpegsound.h" + ++using std::cout; ++using std::cerr; ++using std::endl; ++ + // File player superclass + Fileplayer::Fileplayer() + { +@@ -43,7 +47,7 @@ + if(server)delete server; + } + +-bool Mpegfileplayer::openfile(char *filename,char *device) ++bool Mpegfileplayer::openfile(char *filename, const char *device) + { + // Player + if(device==NULL){ +@@ -188,7 +192,7 @@ + + void Mpegfileplayer::showverbose(int ) + { +- static char *modestring[4]={"stereo","joint stereo","dual channel","mono"}; ++ static const char *modestring[4]={"stereo","joint stereo","dual channel","mono"}; + + fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ", + server->getversion()+1, +--- splay-0.9.5.2/libs/mpegsound.h ++++ splay-0.9.5.2/libs/mpegsound.h +@@ -230,7 +230,7 @@ + Soundplayer() {__errorcode=SOUND_ERROR_OK;}; + virtual ~Soundplayer(); + +- virtual bool initialize(char *filename) =0; ++ virtual bool initialize(const char *filename) =0; + virtual void abort(void); + virtual int getprocessed(void); + +@@ -255,7 +255,7 @@ + public: + ~Rawtofile(); + +- bool initialize(char *filename); ++ bool initialize(const char *filename); + bool setsoundtype(int stereo,int samplesize,int speed); + bool putblock(void *buffer,int size); + +@@ -270,7 +270,7 @@ + public: + ~Rawplayer(); + +- bool initialize(char *filename); ++ bool initialize(const char *filename); + void abort(void); + int getprocessed(void); + +@@ -284,7 +284,7 @@ + void setquota(int q){quota=q;}; + int getquota(void) {return quota;}; + +- static char *defaultdevice; ++ static const char *defaultdevice; + static int setvolume(int volume); + + private: +@@ -573,7 +573,7 @@ + + int geterrorcode(void) {return __errorcode;}; + +- virtual bool openfile(char *filename,char *device)=0; ++ virtual bool openfile(char *filename, const char *device)=0; + virtual void setforcetomono(bool flag) =0; + virtual bool playing(int verbose,bool frameinfo, int startframe) =0; + +@@ -593,7 +593,7 @@ + Mpegfileplayer(); + ~Mpegfileplayer(); + +- bool openfile(char *filename,char *device); ++ bool openfile(char *filename, const char *device); + void setforcetomono(bool flag); + void setdownfrequency(int value); + bool playing(int verbose, bool frameinfo, int startframe); +--- splay-0.9.5.2/libs/mpegtoraw.cc ++++ splay-0.9.5.2/libs/mpegtoraw.cc +@@ -552,7 +552,7 @@ + #endif + + +-#include <iostream.h> ++#include <iostream> + // Convert mpeg to raw + bool Mpegtoraw::run(int frames) + { +--- splay-0.9.5.2/libs/rawplayer.cc ++++ splay-0.9.5.2/libs/rawplayer.cc +@@ -24,7 +24,7 @@ + #define IOCTL(a,b,c) (c = ioctl(a,b,c) ) + #endif + +-char *Rawplayer::defaultdevice="/dev/dsp"; ++const char *Rawplayer::defaultdevice="/dev/dsp"; + + /* Volume */ + int Rawplayer::setvolume(int volume) +@@ -57,7 +57,7 @@ + close(audiohandle); + } + +-bool Rawplayer::initialize(char *filename) ++bool Rawplayer::initialize(const char *filename) + { + int flag; + +@@ -172,7 +172,7 @@ + + if(quota) + while(getprocessed()>quota)usleep(3); +- write(audiohandle,buffer,modifiedsize); ++ if(write(audiohandle,buffer,modifiedsize)) {} + + return true; + } +--- splay-0.9.5.2/libs/rawtofile.cc ++++ splay-0.9.5.2/libs/rawtofile.cc +@@ -20,7 +20,7 @@ + close(filehandle); + } + +-bool Rawtofile::initialize(char *filename) ++bool Rawtofile::initialize(const char *filename) + { + if(filename==NULL)filehandle=1; + else if((filehandle=creat(filename,0644))==-1) diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r1.ebuild new file mode 100644 index 000000000000..711310617779 --- /dev/null +++ b/media-sound/splay/splay-0.9.5.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +DESCRIPTION="An audio player, primarily for the console" +HOMEPAGE="http://splay.sourceforge.net/" +SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +PATCHES=( + "${FILESDIR}/${P}-external-id3lib.diff" + "${FILESDIR}/${P}-gcc43-2.patch" + "${FILESDIR}/${P}-modernize-cpp.patch" +) + +src_prepare() { + mv configure.{in,ac} || die + default + eautoreconf +} diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest index c85b8d0afed4..55fc42df221f 100644 --- a/media-sound/wavegain/Manifest +++ b/media-sound/wavegain/Manifest @@ -1,2 +1 @@ -DIST wavegain-1.3.0srcs.zip 75536 SHA256 0845abed38d361b240ecc061eb9fdf60c7d61908fec943e4c181930ae519c214 SHA512 00c30e37c157cb31e9cc3220a06e9687205fe74f6fe73f81efcdc31fa8ca4abb2654845cdc405edcb7104fbd295ad4e3aff9e61dec12b1706950b53791365e12 WHIRLPOOL 95865bca2cf7223de89dc45e690eda862b105722c5d52de4958e170c8ef4c21e6c0b2a0c04afe83cd2c3afa7abfe386858f3071d4f570917d374b0f37fadff94 DIST wavegain-1.3.1srcs.zip 72180 SHA256 773aaa8e18a0c130714f4bf21afb9ee0ba29d6c5742002191bfdf52f25b48da0 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054 WHIRLPOOL 2a36c8b8b076e0250547041ff7fff01c240677376992aab1edb7a2e09971c39c5b33aa6731d8d34b108a55cdbb666f0bebf165daffcd6ebff59f4cdcbff271d4 diff --git a/media-sound/wavegain/wavegain-1.3.0.ebuild b/media-sound/wavegain/wavegain-1.3.0.ebuild deleted file mode 100644 index 1ab07bbe554d..000000000000 --- a/media-sound/wavegain/wavegain-1.3.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs - -DESCRIPTION="ReplayGain for WAVE audio files" -HOMEPAGE="http://www.rarewares.org/files/others/" -SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - app-arch/unzip" - -S=${WORKDIR}/${P/wavegain/WaveGain} - -src_compile(){ - $(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \ - -DHAVE_CONFIG_H -lm || die "build failed" -} - -src_install(){ - dobin ${PN} -} diff --git a/net-ftp/lftp/lftp-4.6.5.ebuild b/net-ftp/lftp/lftp-4.6.5.ebuild index 01871bd74ae9..fe621812b019 100644 --- a/net-ftp/lftp/lftp-4.6.5.ebuild +++ b/net-ftp/lftp/lftp-4.6.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file" LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW ) diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild b/net-libs/http-parser/http-parser-2.6.0.ebuild index 7a5bcfe0dd05..c1239eefcc13 100644 --- a/net-libs/http-parser/http-parser-2.6.0.ebuild +++ b/net-libs/http-parser/http-parser-2.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos ~x64-solaris" IUSE="static-libs" # https://github.com/nodejs/http-parser/pull/272 diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest index 87ef05266a59..c0b0a8cab5c4 100644 --- a/net-libs/rb_libtorrent/Manifest +++ b/net-libs/rb_libtorrent/Manifest @@ -4,3 +4,4 @@ DIST libtorrent-rasterbar-1.0.4.tar.gz 3297242 SHA256 1f567823133b1493b9717afc83 DIST libtorrent-rasterbar-1.0.5.tar.gz 3302804 SHA256 474a43da2147bec7e333c10f70b07221f4732dd67e071d5e90acc7edb8f657b0 SHA512 1ec54dfac1555ac1a843d12e239d781e940ef81ca13a943c58812b0fb62686e89bc5e0135feb94267fb624077cb0ad9971d496d8474b91f3687ef3b90a524df6 WHIRLPOOL a84f7895fdfda2020630c387eedd9b5a82ddc51af6b35fe8a2e7216495baaf9901a58ef2335c254fa3c2e0c713c7e6a1d9f976984fa5998329e47bc95ae22a63 DIST libtorrent-rasterbar-1.0.6.tar.gz 3307491 SHA256 c97de804b77f44591801631aca3869567671df2d3e2afe7f5453d8db2478fd61 SHA512 798529f877dc94aa8eb635677a2fffb6deead3937153e78ac5344fd81422f9fd9594e227db3ec0ae954dfc59e4dd5f3b8f6dbed2e3aa1f9a710c32b0622f54ee WHIRLPOOL 250651925c4d09b6e73c3c3e4b1e1f9131b49dbf3bdbeda3d683f204d4cebbcb865b694aa5e079072a73be922a25a2378094744bf4dd3bc4e220e9b0115342b6 DIST libtorrent-rasterbar-1.0.7.tar.gz 3298005 SHA256 3e16e024b175fefada17471c659fdbcfab235f9619d4f0913faa13cb02ca8d83 SHA512 d60736af4b7c38317821810995dd9bec21688a9506e9b908394c2a1a87acd2abf23000856dedcad487b9ecc7b5680f83cfc09ff9db79af00fe21e94337daeacf WHIRLPOOL aff289e3ca85eedf688e8a898f0164a4d692e8c813b04dbae6323bc56003f5c3af862167a1d00a8bfe193dfda15d20a18a48bcbeac9313e29d6f2de35d20e621 +DIST rb_libtorrent-1.0.8.tar.gz 2977324 SHA256 24498625d946b80b2269789fb666196240fe805a0b6417d83d1f4dd9ee5f9a7a SHA512 7ab98712225e19224c969fe4c6cd2f21f0aff3f5130dc1b3a0ea1b339b23b3cd303e76aeec9ac23e253c77865c60fd6623f7c8cd4e336c5a16fdf3d4627b88e2 WHIRLPOOL 23c3f84f304e642c7c25239a8a209d37afde41454f8688ef1b24c680d0d268e9163244dc06b973a49a8173f7e1cd7b7bf4f359fb89294cee5868060a64dbb2eb diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild new file mode 100644 index 000000000000..69fdcfad59ba --- /dev/null +++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE="threads" +DISTUTILS_OPTIONAL=true +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils multilib distutils-r1 versionator + +MY_PV=$(replace_all_version_separators '_' ) +S=${WORKDIR}/libtorrent-libtorrent-${MY_PV} + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="http://libtorrent.org" +SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${MY_PV}.tar.gz -> rb_libtorrent-${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc examples python ssl static-libs test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.53:=[threads] + sys-libs/zlib + examples? ( !net-p2p/mldonkey ) + ssl? ( dev-libs/openssl:0= ) + python? ( + ${PYTHON_DEPS} + dev-libs/boost:=[python,${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2" + +RESTRICT="test" + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp || die + ./autotool.sh +} + +src_configure() { + if use python_targets_python3_3 ;then + boost_py3="--with-boost-python=3.3" + elif use python_targets_python3_4 ;then + boost_py3="--with-boost-python=3.4" + elif use python_targets_python3_5 ;then + boost_py3="--with-boost-python=3.5" + else + boost_py3="" + fi + + if use python_targets_python2_7 ;then + boost_py2="--with-boost-python=2.7" + else + boost_py2="" + fi + + local myeconfargs=( + --disable-silent-rules # bug 441842 + --with-boost-system=mt + $(use_enable debug) + $(use_enable test tests) + $(use_enable examples) + $(use_enable ssl encryption) + $(use_enable python python-binding) + $(usex debug "--enable-logging=verbose" "") + ${boost_py3} + ${boost_py2} + ) + + if use python ;then + python_setup + fi + + autotools-utils_src_configure + + if use python ;then + cd "${BUILD_DIR}"/bindings/python || die && \ + distutils-r1_src_configure + fi +} + +src_compile() { + autotools-utils_src_compile + + if use python ;then + cd "${BUILD_DIR}"/bindings/python || die && \ + distutils-r1_src_compile + fi +} + +src_install() { + if use doc ;then + HTML_DOCS=( "${S}"/docs/. ) + fi + + autotools-utils_src_install + + if use python ;then + cd "${BUILD_DIR}"/bindings/python || die && \ + distutils-r1_src_install + fi +} diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild index 92ee3ffd5467..8fe5d334f5b4 100644 --- a/net-mail/notmuch/notmuch-0.21.ebuild +++ b/net-mail/notmuch/notmuch-0.21.ebuild @@ -18,7 +18,7 @@ LICENSE="GPL-3" # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is # meant to be binary backward compatible. SLOT="0/4" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" REQUIRED_USE=" nmbug? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) diff --git a/net-misc/tor/tor-0.2.7.6.ebuild b/net-misc/tor/tor-0.2.7.6.ebuild index cdd4563dfda8..10f4b6e9e2e3 100644 --- a/net-misc/tor/tor-0.2.7.6.ebuild +++ b/net-misc/tor/tor-0.2.7.6.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~sparc ~x86 ~ppc-macos" IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web" DEPEND=" diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index bc14e43007f3..91b6d7941aa2 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -2,3 +2,4 @@ DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca4 DIST cups-filters-1.4.0.tar.xz 1373724 SHA256 0aa63f82a3feb5c46136b917722ee1565b4c1e2e533db4716f62d31e29c6579a SHA512 c1f8b45ef79747405cbe114fc35f14cf30d3a7f13753bbfb524cb2ce7c7e4f10a4af8cd1df978a231c119d0e893efed946b25183f8898253b5be72ed9c926963 WHIRLPOOL ebce525e81f2ce6b040b154111e71df49f341337073795a156ac20b502352f2711034a651e1910cde7266de2177f02dabcf9efd86ab1d2afc57140dd4a697d9e DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e +DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3 diff --git a/net-print/cups-filters/cups-filters-1.8.1.ebuild b/net-print/cups-filters/cups-filters-1.8.1.ebuild new file mode 100644 index 000000000000..a46c8794f3ab --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.8.1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +inherit base eutils perl-module autotools systemd + +if [[ "${PV}" == "9999" ]] ; then + inherit bzr + EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" + KEYWORDS="" +else + SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" +fi +DESCRIPTION="Cups PDF filters" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat" + +LICENSE="MIT GPL-2" +SLOT="0" +IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf" + +RDEPEND=" + >=app-text/ghostscript-gpl-9.09 + app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] + >=app-text/qpdf-3.0.2:= + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + >=net-print/cups-1.7.3 + !<=net-print/cups-1.5.9999 + sys-devel/bc + sys-libs/zlib + dbus? ( sys-apps/dbus ) + foomatic? ( !net-print/foomatic-filters ) + jpeg? ( virtual/jpeg:0 ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:0= ) + tiff? ( media-libs/tiff:0 ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen +" + +src_prepare() { + base_src_prepare + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die + eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable dbus) \ + $(use_enable zeroconf avahi) \ + $(use_enable static-libs static) \ + --with-fontdir="fonts/conf.avail" \ + --with-pdftops=pdftops \ + --enable-imagefilters \ + $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) \ + --with-rcdir=no \ + --with-browseremoteprotocols=DNSSD,CUPS \ + --without-php +} + +src_compile() { + MAKEOPTS=-j1 default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_configure + perl-module_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null + perl-module_src_install + perl_delete_localpod + popd > /dev/null + fi + + # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 + dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster + dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl + + prune_libtool_files --all + + cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die + + if ! use zeroconf ; then + sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die + sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die + fi + + if ! use foomatic ; then + # this needs an upstream solution / configure switch + rm -v "${ED}/usr/bin/foomatic-rip" || die + rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die + rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die + fi + + doinitd "${T}"/cups-browsed + systemd_dounit "${S}/utils/cups-browsed.service" +} + +pkg_postinst() { + if ! use foomatic ; then + ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." + ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." + fi +} diff --git a/profiles/package.mask b/profiles/package.mask index 2c298217e2e0..c8ec61ea9203 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -861,11 +861,6 @@ virtual/python-imaging # the suggested replacement for the meantime. sys-fs/bedup -# ChÃ-Thanh Christopher Nguyá»…n <chithanh@gentoo.org> (29 Oct 2015) -# Mask until it is decided how to address xorg-server file collisions #564358 -=x11-drivers/xf86-input-evdev-2.10.0 -=x11-drivers/xf86-input-evdev-2.10.1 - # Ian Delaney <idella4@gentoo.org> (27 Oct 2015) # fails to build dev-lisp/sbcl-1.2.16 #563812 # mgorny: dev-lisp/uiop as version-bound revdep diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest index 967f52c1efcd..96e69cfbc981 100644 --- a/ros-meta/audio_common/Manifest +++ b/ros-meta/audio_common/Manifest @@ -1,3 +1,4 @@ +DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42 diff --git a/ros-meta/audio_common/audio_common-0.2.10.ebuild b/ros-meta/audio_common/audio_common-0.2.10.ebuild new file mode 100644 index 000000000000..618c77ecf99b --- /dev/null +++ b/ros-meta/audio_common/audio_common-0.2.10.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/audio_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Common code for working with audio in ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/audio_capture + dev-ros/audio_common_msgs + dev-ros/audio_play + dev-ros/sound_play +" +DEPEND="${RDEPEND}" diff --git a/ros-meta/image_common/Manifest b/ros-meta/image_common/Manifest index 9f4e04e22607..41fb70890369 100644 --- a/ros-meta/image_common/Manifest +++ b/ros-meta/image_common/Manifest @@ -1,3 +1,4 @@ +DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441 DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e diff --git a/ros-meta/image_common/image_common-1.11.10.ebuild b/ros-meta/image_common/image_common-1.11.10.ebuild new file mode 100644 index 000000000000..37bda88f6397 --- /dev/null +++ b/ros-meta/image_common/image_common-1.11.10.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/image_common" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Common code for working with images in ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/camera_calibration_parsers + dev-ros/camera_info_manager + dev-ros/image_transport + dev-ros/polled_camera +" +DEPEND="${RDEPEND}" diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild index 787c58215946..dfdd7bb03935 100644 --- a/sci-libs/geos/geos-3.5.0.ebuild +++ b/sci-libs/geos/geos-3.5.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 arm ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="doc php python ruby static-libs" RDEPEND=" diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest index 82b44837cb2a..488365d659fe 100644 --- a/sci-mathematics/coq/Manifest +++ b/sci-mathematics/coq/Manifest @@ -1,2 +1,3 @@ DIST coq-8.4pl5.tar.gz 4070062 SHA256 35815ab78a58d72799eacaab155427620ab071677882ca6c98d7bfec97d25245 SHA512 0965ff409933d601a5c96963ea805ce20dd22f1fd9a9473898de1b376403b4e7a9a86b36b58eb1480cfb3a25970626e1dcd225899c089f5a301f4809e7f8f242 WHIRLPOOL 6dea97e7fe655a33757e8f031b28f91f98558e53205890d6b9d928d5641c05814f8d743cb02c39b26dcf93aa4076c5bbd9710a7dfd9f6a3456e38039b0cb8220 DIST coq-8.4pl6.tar.gz 4099815 SHA256 a540a231a9970a49353ca039f3544616ff86a208966ab1c593779ae13c91ebd6 SHA512 238bc6e28348f40f5619aa28d2e871179d9edeb6eb3f2521af6f407e24a889c8c68fa11c8b12e026f016f0fb7d5006447c3ab7eeae0804fc082d65774aefe0ef WHIRLPOOL 2120dcddce773d90ba024e97fc00df3d563edf398eaf0bbb3dc1df1265b5e657cb4044d334f598898c30a88f0579b35b38f1d6bad4ea5e373a0a30826b245e99 +DIST coq-8.5.tar.gz 5346653 SHA256 89a92fb8b91e7cb0797d41c87cd13e4b63bee76c32a6dcc3d7c8055ca6a9ae3d SHA512 28835a9dc4c926f97b14d23fe746e45e17942003e29807ec59f301eb0b697d704f05afc4cccd31b83bc27e9877d079d00e94a2101ba16ae32f4134e90ad011fb WHIRLPOOL 30925b92f71ba606e43f1b46368822e8d6f6e6c1ae500c8fe1fc912c4ef0608c6db3c070d37ffabbd0e054eac0ff7d1b1e46eae33b73149bf238101b20a0f6d2 diff --git a/sci-mathematics/coq/coq-8.5.ebuild b/sci-mathematics/coq/coq-8.5.ebuild new file mode 100644 index 000000000000..1dffb390cc78 --- /dev/null +++ b/sci-mathematics/coq/coq-8.5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils multilib + +MY_PV=${PV/_p/pl} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Proof assistant written in O'Caml" +HOMEPAGE="http://coq.inria.fr/" +SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gtk debug +ocamlopt doc camlp5" + +RDEPEND=" + >=dev-lang/ocaml-3.11.2:=[ocamlopt?] + camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) + !camlp5? ( dev-ml/camlp4:= ) + gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )" +DEPEND="${RDEPEND} + doc? ( + media-libs/netpbm[png,zlib] + virtual/latex-base + dev-tex/hevea + dev-tex/xcolor + dev-texlive/texlive-pictures + dev-texlive/texlive-mathextra + dev-texlive/texlive-latexextra + )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch" + epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch" +} + +src_configure() { + ocaml_lib=$(ocamlc -where) + local myconf=( + -prefix /usr + -bindir /usr/bin + -libdir /usr/$(get_libdir)/coq + -mandir /usr/share/man + -emacslib /usr/share/emacs/site-lisp + -coqdocdir /usr/$(get_libdir)/coq/coqdoc + -docdir /usr/share/doc/${PF} + -configdir /etc/xdg/${PN} + -lablgtkdir ${ocaml_lib}/lablgtk2 + ) + + use debug && myconf+=( -debug ) + use doc || myconf+=( -with-doc no ) + + if use gtk; then + if use ocamlopt; then + myconf+=( -coqide opt ) + else + myconf+=( -coqide byte ) + fi + else + myconf+=( -coqide no ) + fi + + use ocamlopt || myconf+=( -byte-only ) + + if use camlp5; then + myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 ) + else + myconf+=( -usecamlp4 ) + fi + + export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/" + ./configure ${myconf[@]} || die "configure failed" +} + +src_compile() { + emake STRIP="true" -j1 world VERBOSE=1 +} + +src_test() { + emake STRIP="true" check VERBOSE=1 +} + +src_install() { + emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1 + dodoc README CREDITS CHANGES + + use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png" +} diff --git a/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch b/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch new file mode 100644 index 000000000000..37b05fd114db --- /dev/null +++ b/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch @@ -0,0 +1,19 @@ +Index: coq-8.5/Makefile.build +=================================================================== +--- coq-8.5.orig/Makefile.build ++++ coq-8.5/Makefile.build +@@ -787,14 +787,10 @@ endif + # it with libraries + -$(MKDIR) $(FULLCOQLIB)/plugins/micromega + $(INSTALLBIN) $(CSDPCERT) $(FULLCOQLIB)/plugins/micromega +- rm -f $(FULLCOQLIB)/revision +- -$(INSTALLLIB) revision $(FULLCOQLIB) + + install-library-light: + $(MKDIR) $(FULLCOQLIB) + $(INSTALLSH) $(FULLCOQLIB) $(LIBFILESLIGHT) $(INITPLUGINS) +- rm -f $(FULLCOQLIB)/revision +- -$(INSTALLLIB) revision $(FULLCOQLIB) + ifndef CUSTOM + $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB) + endif diff --git a/sci-mathematics/glpk/glpk-4.54.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild index 919ff4706dc3..22a6f1427ed1 100644 --- a/sci-mathematics/glpk/glpk-4.54.ebuild +++ b/sci-mathematics/glpk/glpk-4.54.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" sci-libs/amd:0= diff --git a/sci-mathematics/glpk/glpk-4.55.ebuild b/sci-mathematics/glpk/glpk-4.55.ebuild index 919ff4706dc3..22a6f1427ed1 100644 --- a/sci-mathematics/glpk/glpk-4.55.ebuild +++ b/sci-mathematics/glpk/glpk-4.55.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" sci-libs/amd:0= diff --git a/sci-mathematics/glpk/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild index 0ac569817c51..fc4451f9ac66 100644 --- a/sci-mathematics/glpk/glpk-4.57.ebuild +++ b/sci-mathematics/glpk/glpk-4.57.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0= diff --git a/sci-physics/lammps/lammps-20151207.ebuild b/sci-physics/lammps/lammps-20151207.ebuild index e692e6fc4cb5..2158b5f7de0b 100644 --- a/sci-physics/lammps/lammps-20151207.ebuild +++ b/sci-physics/lammps/lammps-20151207.ebuild @@ -21,7 +21,7 @@ SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc examples gzip lammps-memalign mpi python static-libs" DEPEND=" diff --git a/sys-apps/man-db/man-db-2.7.5.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild index 5af150cd4fae..95609d6f6d94 100644 --- a/sys-apps/man-db/man-db-2.7.5.ebuild +++ b/sys-apps/man-db/man-db-2.7.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux" IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib" CDEPEND=">=dev-libs/libpipeline-1.4.0 diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild index 4a580f9741bb..6dfae356faf3 100644 --- a/sys-apps/openrc/openrc-0.19.1.ebuild +++ b/sys-apps/openrc/openrc-0.19.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - 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" fi LICENSE="BSD-2" diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest index 8150a5b14d68..93c21280fdb4 100644 --- a/sys-block/di/Manifest +++ b/sys-block/di/Manifest @@ -1,4 +1,3 @@ DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929 -DIST di-4.36.tar.gz 212957 SHA256 eb03d2ac0a3df531cdcb64b3667dbaebede60a4d3a4626393639cecb954c6d86 SHA512 ce7d38d3e23e68caa70bc85b623b7f4f633e2abf11b5df66b7104be49f1a1b2e64754d51ed00dd9ae629409e2a4760424f781e0351697b077e6aafb64bedad78 WHIRLPOOL 8f2c486d02dbe3f41d74d8a4e1df006ef0fa690bd0e5f3d71c6c47813724a899088fe51da2cdbb5407c27626949b1d048dc0bc1f20a8d964288c0abd8bbdb058 -DIST di-4.37.tar.gz 213649 SHA256 10687963438be65fb150adc6e31d66c0892ded0f61ea67ec58455f7717ac4ad2 SHA512 60b3aae601d5b08bfddb2be3838872d7cbf17f9409c560b0725438a7d8d7b25b954a0c488815899d3cb8afd033662bff5780620448a935d58c7c239e10f99264 WHIRLPOOL ae7c70902d07004378eb22aa395f5a691d775880360f9a8d2650b527be1100e219a656192f50389c504a2a5a6ce181dcecc0b0f7c33bf72f60d05a514e4e3da7 DIST di-4.38.tar.gz 213584 SHA256 a8e721239ef16cd3645532be5788b47bd552c23491a688e06e633de10408d7f5 SHA512 a95ee5e7286ed755a4ef2e857831519f543c1432eb608fbb9dcf9cf3a979aa03e67cb765df19600149a59077c5db6c437fff61ac66e60a7b3c6160a2f59bf04f WHIRLPOOL 269e624696d7b82ade509f453fe1d26de70caa0a65095b62c7fbe4ccc13bde164dfb83076384b68ad86dcfc003b422b59032bd779e9a561ad73fb5cfb3e52177 +DIST di-4.40.tar.gz 219245 SHA256 cfff021f33cadcd8536967164ddbe2947c67b690b086b27e478540eedb002af1 SHA512 1f7aeed4f68b91dd6d2e0cfbafaa86d9b93d37c741b1087e3d9e788c34356878995485102f4018e48681925542a4814fa6245ccfa976c1c2ff406530715cde67 WHIRLPOOL fc2a6306a0c65dc16d1d3eee74630c272e4635df479b052376ea0030697dbe663c58c54cdffadf5930b8c69c7cd09430dcc90112ca19224de9048c422ef4ba3b diff --git a/sys-block/di/di-4.37.ebuild b/sys-block/di/di-4.37.ebuild deleted file mode 100644 index 5b4dc01395aa..000000000000 --- a/sys-block/di/di-4.37.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit eutils toolchain-funcs - -DESCRIPTION="Disk Information Utility" -HOMEPAGE="http://www.gentoo.com/di/" -SRC_URI="http://www.gentoo.com/di/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="" - -RESTRICT="test" #405205, #405471 - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.33-build.patch -} - -src_configure() { - emake checkbuild - emake -C C config.h -} - -src_compile() { - emake prefix=/usr CC="$(tc-getCC)" -} - -src_install() { - emake install prefix="${D}/usr" - # default symlink is broken - dosym di /usr/bin/mi - dodoc README -} diff --git a/sys-block/di/di-4.36.ebuild b/sys-block/di/di-4.40.ebuild index 5b4dc01395aa..42ea3cc89ab1 100644 --- a/sys-block/di/di-4.36.ebuild +++ b/sys-block/di/di-4.40.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 inherit eutils toolchain-funcs DESCRIPTION="Disk Information Utility" diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest index 5985734d25d8..d840164387c8 100644 --- a/sys-block/partitionmanager/Manifest +++ b/sys-block/partitionmanager/Manifest @@ -1,2 +1,3 @@ DIST partitionmanager-1.1.1.tar.xz 1738132 SHA256 4cf3fa71bd20b06755d36bb9aa7692fa4770a1d84ec8eb72654cb58fdea563de SHA512 3cae1d0c34c2d8a245094ff85131def5c48e4247462104a84c4dcac2230e115df61cc72b6acdf735b1755f921b8f17adb1b2a5f97a9b3fa9a0628619e7e34117 WHIRLPOOL b4bb73a8d7c5f157c7bd95ba1f907b81955206c283a09cd84397f5db5ad33ec25e55a9a5a0cb8742008396bb574b05a5b9df04030b24c0b76aaf064a31031bb2 DIST partitionmanager-1.2.1.tar.xz 1794200 SHA256 eb5b8b00ab6f0a2c5ef494b1c70441100ff70bf691006c4aa95f39d00b43e4e0 SHA512 9d33847e307df65081966d4aea2b2efeb7e1befe911268c71e678d196bf0fb9160b9812c7df2021dca2a3a4a5e9efffcf435d242b3496e6e7c7b1d89fea15441 WHIRLPOOL 945676c27a5aa80b6551d75c8324ed3d85328fbfea6f2447e0345e0d1a5ba9d45165ce36332c444b3aea5076f80060b47f4568699fc5bb59e18222af0d7a56c7 +DIST partitionmanager-2.0.0.tar.xz 1488312 SHA256 26f880c0955797778612223d3cd68345bc47ec4903b4c541dd04e7998d3083c6 SHA512 20537c55004c353a903977a37077752a99a50c6b439699eb4b209c64e704c47de98645f77ab6efdebd70139c8af2226c8e431eb47cd1730a2060b643eb272705 WHIRLPOOL 4ee5b13015730f09aa050369fa5b65c9afa4d41e99711bfb7e6a4a1b9d3643a7d46834b5af5bd32dbd414843407514dc6df690a90fbbf52bc024053e15e8cd0d diff --git a/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild b/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild new file mode 100644 index 000000000000..cf3af5e6b5e9 --- /dev/null +++ b/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="KDE utility for management of partitions and file systems" +HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-apps/util-linux + sys-libs/kpmcore +" +RDEPEND="${DEPEND} + $(add_plasma_dep kde-cli-tools kdesu 5.5.2) + !sys-block/partitionmanager:0 +" + +src_prepare() { + kde5_src_prepare + + sed -i -e 's/"kdesu"/"kdesu5"/' src/util/guihelpers.cpp || die +} diff --git a/sys-fs/ddrescue/ddrescue-1.20.ebuild b/sys-fs/ddrescue/ddrescue-1.20.ebuild index 638980d95b7a..66ab44044d75 100644 --- a/sys-fs/ddrescue/ddrescue-1.20.ebuild +++ b/sys-fs/ddrescue/ddrescue-1.20.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux" IUSE="static" DEPEND="$(unpacker_src_uri_depends)" diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 00469a9143db..cb5bb097c6eb 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -1,2 +1,3 @@ DIST f2fs-tools-1.4.1.tar.gz 403406 SHA256 194fd86283b6242fbae9f639bc5e4cf746e0f0525de5a8cc7eead8a03d5e31aa SHA512 75a74999a8387c3793252b06638174866d243706f596f86d33f6c3921d52e854354364c98a4692c7aaad49121b71ad3e7a6a2e82702b5d6965e984500eeaf7ab WHIRLPOOL 5d3250dae07cdb17857bc341f38fc1c1832c8e30d5704d57f65e7f00cedc052684681577440dfd47a491f00a0f678a82d15e5907cdd0e9b92a624954114967c9 DIST f2fs-tools-1.5.0.tar.xz 274720 SHA256 3a680a0c5ab30b7c83ce98d2919b59516d31bf2e733848e1c6bab49b07d8026c SHA512 b6596224f6922d0ad3e6801aab0921200dffd686e2438a0ab945b4902ea27b6e0baf6dcfcb66fe90ee51ee4cf10b207b031e3ef1019823ac05abc4db22660459 WHIRLPOOL b471b4ded5a11a1ce50484316c272d814e36dc90dfc45e359567ea68e27b562a1905c1b4f0575dc3f5fcd9cb25059c1d0d598a4b75798c893b9a8aa30e4eb335 +DIST f2fs-tools-1.6.0.tar.xz 278644 SHA256 90459d4252958911a722a223e825f4d02e4539492e6a59ff8cdbf155c8ca1899 SHA512 043d4aa25798fa39e637def4e03b4a5e89c9ae4880832abf09805dfc851111045c3c779d36c1a91cb4ee74857b483f0ef2f8d9a541e3a695a8c5bc9bcfa46a8f WHIRLPOOL c8d3889d83f479f643a229f90c0151428a5a6c516820e579a8562bc701b7747385205732c1163dd6f1cfc2c47d5111133357af9a94f1c8d6f0218a70751a78a0 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.6.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.6.0.ebuild new file mode 100644 index 000000000000..793c43db22ce --- /dev/null +++ b/sys-fs/f2fs-tools/f2fs-tools-1.6.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib + +DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" +HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary" +SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="" + +src_configure() { + #This is required to install to /sbin, bug #481110 + econf --prefix=/ --includedir=/usr/include +} + +src_install() { + default + rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a + rm -f "${ED}"/$(get_libdir)/libf2fs_format.{,l}a +} diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest new file mode 100644 index 000000000000..7bb2cfd6b130 --- /dev/null +++ b/sys-libs/kpmcore/Manifest @@ -0,0 +1 @@ +DIST kpmcore-2.0.0.tar.xz 350352 SHA256 aa4a89c8a3745b2c06971f916aef30d87b3393a3b8c55ffc791cf46eb86b2454 SHA512 91e76bf5c7dc53f11c5cbd452ea6a1d08ea55c29024a48dde10936834b63640cb86d01376b9b5c4f4bd1b300aac9652867efd0517e34e846dd3c0202f6f925fc WHIRLPOOL b8c744b6a7b6d91d9d348910425a9b73f68e75a507690111ad4682b745797d25e59532ee27683f946a3c7987c5ee6d46a1967671322ab14a888fa33ad5f1cad6 diff --git a/sys-libs/kpmcore/kpmcore-2.0.0.ebuild b/sys-libs/kpmcore/kpmcore-2.0.0.ebuild new file mode 100644 index 000000000000..24f9a58f9616 --- /dev/null +++ b/sys-libs/kpmcore/kpmcore-2.0.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5 + +DESCRIPTION="Library for managing partitions" +HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-3" +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +CDEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + dev-libs/libatasmart + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-apps/util-linux + >=sys-block/parted-3 +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + !<sys-block/partitionmanager-2.0.0 +" diff --git a/sys-libs/kpmcore/metadata.xml b/sys-libs/kpmcore/metadata.xml new file mode 100644 index 000000000000..a23f444b67d6 --- /dev/null +++ b/sys-libs/kpmcore/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> +</pkgmetadata> diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest index 7e7fe9926546..d7ce4bed8460 100644 --- a/www-apps/jekyll-sitemap/Manifest +++ b/www-apps/jekyll-sitemap/Manifest @@ -1 +1,2 @@ +DIST jekyll-sitemap-0.10.0.tar.gz 63435 SHA256 143dcacd0556ef326380f16c2315827435282a760ec28e543ba10c8f8a523a85 SHA512 a609ab04d05a8ef947cf5de1a118eb4f28d00aa9392bbfb25b6a635ddb4ef8e45fbc50fc028ea8bdfe901605b2f20c5fcc1603281be861d1e9e4ee794a4aa975 WHIRLPOOL 64453bd112e766c6e0d84365d890b84412f98df8a509e3c5a2594ba3c3ffb62b4600cd4de7bf5f0c336082f1b1c6c22f2618058a130a7b09573c85a72792e4d2 DIST jekyll-sitemap-0.9.0.tar.gz 62710 SHA256 db437f1794ca32c13ef235becc3fffa53bb922ab0fc108f7c511dd04b3ce1107 SHA512 2c55f2869050c0e0d279e3974554dbdb03c6db25c5fa2997c12cd0c6615707ff8d53ef05cffed57dc8eb2e261677d5f86ebc889083989b7a7723e7d92922c1ba WHIRLPOOL d2e54098853f722e9052607425d7db735ed9604fcd24833cba8d13bb169c67a88368372e5795eb6c8419b60e3d1fc192ba2c03401bee0195607f8c83bfe68c3e diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.10.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.10.0.ebuild new file mode 100644 index 000000000000..63aa52cf2269 --- /dev/null +++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.10.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md History.markdown" + +inherit ruby-fakegem + +DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site" +HOMEPAGE="https://github.com/jekyll/jekyll-sitemap" +SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )" diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest index eea4c75cb247..347167aad818 100644 --- a/www-apps/jekyll-watch/Manifest +++ b/www-apps/jekyll-watch/Manifest @@ -1 +1,2 @@ DIST jekyll-watch-1.3.0.tar.gz 13882 SHA256 a87b9e76e575ec394525b6b804bf8aa430eb51df2e309f34b0f2f46129b9c353 SHA512 91950cdeba568ef368ea5f91f3ec3208073786f12e7a8587e2560c92be9108d5d97d9ddc517eb681df3335bcdc0f8b85c9425fbe289b39912c3c4c6ef8d641e2 WHIRLPOOL a5e18c641921f561e42557cbd902100fac085d2fd320771581d507122fa6fa77bf60cf9e26a7444eac0387227c1e131ab611cee814178cd1748c2e74912a67d1 +DIST jekyll-watch-1.3.1.tar.gz 14735 SHA256 6912621ac177c8ed09e4f79e15f7f378feddc5e14a500c82784c3da6704dc1cd SHA512 ce54f4367cd2c5a63ce823b234584a84798fe0234165cb038f3af301b7ddef39ef1a983aad41843e51d1af9366e495a83112f6b55bd58127d1c95eaf5600eee4 WHIRLPOOL c406990fd077c0cd46af8a36624d57c7dca91888d0305f25fb682fe4301c970b59fcc583aec637ec4bec13cca57b2a16891f1ec0b5336375a0dbd94732612f3f diff --git a/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild new file mode 100644 index 000000000000..9b6a4fea8645 --- /dev/null +++ b/www-apps/jekyll-watch/jekyll-watch-1.3.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md History.markdown" + +inherit ruby-fakegem + +DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch" +HOMEPAGE="https://github.com/jekyll/jekyll-watch" +SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/listen-3.0" +ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )" + +all_ruby_prepare() { + rm Rakefile || die +} diff --git a/www-apps/jekyll/jekyll-2.5.3.ebuild b/www-apps/jekyll/jekyll-2.5.3.ebuild index 56ba15507092..c1830aa2e267 100644 --- a/www-apps/jekyll/jekyll-2.5.3.ebuild +++ b/www-apps/jekyll/jekyll-2.5.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" inherit ruby-fakegem diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest index bc0276fd3d4d..65b978c5036e 100644 --- a/www-apps/redmine/Manifest +++ b/www-apps/redmine/Manifest @@ -1,2 +1 @@ -DIST redmine-2.4.6.tar.gz 3885107 SHA256 9dd35c9f50fcd20724c328860253c78fe0155a5f58bbf90357d72d44900a7601 SHA512 722bdb4e5dd5246dfdee2819c65d024c34368d4cbb34d27a2832909b2b82f6e677e7312fa085971c6fb78c2aa4d06552d06e2314e19c4e3d0b211fcc1ec4d911 WHIRLPOOL e1b4213f7aef6d97afadde194e6f99f6d7f61a5cc9775fb8619cda6fbe2b42a3b783039fdacfa80b40d0c86fa235d397f39f0d3d37b5a7626facfd70fe058f06 DIST redmine-2.6.9.tar.gz 2127454 SHA256 15cafc3983e0520c3ecc6105ef33031f55b1dc2b21270d092938562b47362d4c SHA512 c376e0096e35c0307960c5e186abe2d8618064564813873e30aa0c9f7f6fcbf41b22239cf54e7aed794a0a06de9cd8b931d5c130776d4818428f788d0ef9e866 WHIRLPOOL 85eba2d64896ba96698b4449a1580987d25b725011feac969a612eb932da99fdd701d5f5808f26efef80dec86ebcfc505445f185fc8dec08d5909d2ce8a0b2d4 diff --git a/www-apps/redmine/redmine-2.4.6.ebuild b/www-apps/redmine/redmine-2.4.6.ebuild deleted file mode 100644 index 216fd62e28f1..000000000000 --- a/www-apps/redmine/redmine-2.4.6.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20" -inherit eutils depend.apache ruby-ng user - -DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework" -HOMEPAGE="http://www.redmine.org/" -SRC_URI="http://www.redmine.org/releases/${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-2" -SLOT="0" -# All db-related USEs are ineffective since we depend on rails -# which depends on activerecord which depends on all ruby's db bindings -#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger" -IUSE="ldap imagemagick fastcgi passenger" - -#RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]" - -ruby_add_rdepend "virtual/ruby-ssl - virtual/rubygems - >=dev-ruby/rails-3.2.19:3.2 - >=dev-ruby/jquery-rails-2.0.2 - dev-ruby/i18n:0.6 - >=dev-ruby/coderay-1.0.9 - dev-ruby/builder:3 - dev-ruby/rake - ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 ) - >=dev-ruby/ruby-openid-2.3.0 - >=dev-ruby/rack-openid-0.2.1 - imagemagick? ( >=dev-ruby/rmagick-2 ) - fastcgi? ( dev-ruby/fcgi ) - passenger? ( www-apache/passenger )" -# ruby_targets_ruby19? ( -# postgres? ( >=dev-ruby/pg-0.11 ) -# sqlite3? ( dev-ruby/sqlite3 ) -# mysql? ( dev-ruby/mysql2:0.3 ) -# ) - -#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2 -# dev-ruby/yard -# test? ( -# >=dev-ruby/shoulda-3.3.2 -# >=dev-ruby/mocha-0.13.3 -# >=dev-ruby/capybara-2.0.0 -# <dev-ruby/nokogiri-1.6.0 -# )" - -REDMINE_DIR="/var/lib/${PN}" - -pkg_setup() { - enewgroup redmine - enewuser redmine -1 -1 "${REDMINE_DIR}" redmine -} - -all_ruby_prepare() { - rm -r log files/delete.me || die - - # bug #406605 - rm .gitignore .hgignore .travis.yml || die - - rm Gemfile config/preinitializer.rb || die - - echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}" - echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}" - - # remove ldap staff module if disabled to avoid #413779 - use ldap || rm app/models/auth_source_ldap.rb || die -} - -all_ruby_install() { - dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} - rm -r doc || die - dodoc README.rdoc - rm README.rdoc || die - - keepdir /var/log/${PN} - dosym /var/log/${PN}/ "${REDMINE_DIR}/log" - - insinto "${REDMINE_DIR}" - doins -r . - keepdir "${REDMINE_DIR}/files" - keepdir "${REDMINE_DIR}/public/plugin_assets" - - fowners -R redmine:redmine \ - "${REDMINE_DIR}/config" \ - "${REDMINE_DIR}/files" \ - "${REDMINE_DIR}/public/plugin_assets" \ - "${REDMINE_DIR}/tmp" \ - /var/log/${PN} - - fowners redmine:redmine "${REDMINE_DIR}" - - # protect sensitive data, see bug #406605 - fperms -R go-rwx \ - "${REDMINE_DIR}/config" \ - "${REDMINE_DIR}/files" \ - "${REDMINE_DIR}/tmp" \ - /var/log/${PN} - - if use passenger; then - has_apache - insinto "${APACHE_VHOSTS_CONFDIR}" - doins "${FILESDIR}/10_redmine_vhost.conf" - else - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}-2.initd" ${PN} - fi - doenvd "${T}/50${PN}" -} - -pkg_postinst() { - einfo - if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then - elog "Execute the following command to upgrade environment:" - elog - elog "# emerge --config \"=${CATEGORY}/${PF}\"" - elog - elog "For upgrade instructions take a look at:" - elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade" - else - elog "Execute the following command to initialize environment:" - elog - elog "# cd ${EPREFIX}${REDMINE_DIR}" - elog "# cp config/database.yml.example config/database.yml" - elog "# \${EDITOR} config/database.yml" - elog "# chown redmine:redmine config/database.yml" - elog "# emerge --config \"=${CATEGORY}/${PF}\"" - elog - elog "Installation notes are at official site" - elog "http://www.redmine.org/wiki/redmine/RedmineInstall" - fi - einfo -} - -pkg_config() { - if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then - eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml" - eerror "then edit this file in order to configure your database settings for \"production\" environment." - die - fi - - local RAILS_ENV=${RAILS_ENV:-production} - if [ ! -L /usr/bin/ruby ]; then - eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation." - eerror "Please update it via `eselect ruby`" - die - fi - if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr -d ' ' )* ]]; then - eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}." - eerror "Please update it via `eselect ruby`" - die - fi - local RUBY=${RUBY:-ruby} - - cd "${EPREFIX}${REDMINE_DIR}" || die - if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then - einfo - einfo "Generating secret token." - einfo - rm config/initializers/session_store.rb || die - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die - fi - if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then - einfo - einfo "Upgrading database." - einfo - - einfo "Migrating database." - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die - einfo "Upgrading the plugin migrations." - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die - einfo "Clear the cache and the existing sessions." - ${RUBY} -S rake tmp:cache:clear || die - ${RUBY} -S rake tmp:sessions:clear || die - else - einfo - einfo "Initializing database." - einfo - - einfo "Generating a session store secret." - ${RUBY} -S rake generate_secret_token || die - einfo "Creating the database structure." - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die - einfo "Populating database with default configuration data." - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die - chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log - einfo - einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files." - einfo - einfo "# cd \"${EPREFIX}${REDMINE_DIR}\"" - einfo "# chown redmine:redmine db/ db/*.sqlite3" - einfo - fi -} diff --git a/www-apps/redmine/redmine-2.6.9.ebuild b/www-apps/redmine/redmine-2.6.9.ebuild index 1249c70dc49a..53da0f19e703 100644 --- a/www-apps/redmine/redmine-2.6.9.ebuild +++ b/www-apps/redmine/redmine-2.6.9.ebuild @@ -6,7 +6,7 @@ EAPI=5 USE_RUBY="ruby20" inherit eutils depend.apache ruby-ng user -DESCRIPTION="A flexible project management web application written using Ruby on Rails framework" +DESCRIPTION="Flexible project management web application using the Ruby on Rails framework" HOMEPAGE="http://www.redmine.org/" SRC_URI="http://www.redmine.org/releases/${P}.tar.gz" diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild index 13f0d94ef1df..44bafc0a5221 100644 --- a/www-client/qupzilla/qupzilla-1.8.9.ebuild +++ b/www-client/qupzilla/qupzilla-1.8.9.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 arm ~ppc64 ~x86" +KEYWORDS="amd64 arm ~ppc64 ~x86" IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5" REQUIRED_USE="^^ ( qt4 qt5 ) kde? ( qt4 )" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18.ebuild new file mode 100644 index 000000000000..42bb8090fbfb --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-1.18.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_joystick + input_devices_keyboard + input_devices_libinput + input_devices_mouse + input_devices_mutouch + input_devices_penmount + input_devices_tslib + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_amdgpu + video_cards_apm + video_cards_ast + video_cards_chips + video_cards_cirrus + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_omapfb + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tegra + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_voodoo + video_cards_fglrx + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_acecad? ( x11-drivers/xf86-input-acecad ) + input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( x11-drivers/xf86-input-evdev ) + input_devices_fpit? ( x11-drivers/xf86-input-fpit ) + input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) + input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) + input_devices_libinput? ( x11-drivers/xf86-input-libinput ) + input_devices_mouse? ( x11-drivers/xf86-input-mouse ) + input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) + input_devices_penmount? ( x11-drivers/xf86-input-penmount ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + + video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_apm? ( x11-drivers/xf86-video-apm ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_chips? ( x11-drivers/xf86-video-chips ) + video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_i128? ( x11-drivers/xf86-video-i128 ) + video_cards_i740? ( x11-drivers/xf86-video-i740 ) + video_cards_intel? ( x11-drivers/xf86-video-intel ) + video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) + video_cards_mga? ( x11-drivers/xf86-video-mga ) + video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) + video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) + video_cards_nv? ( x11-drivers/xf86-video-nv ) + video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( x11-drivers/ati-drivers ) + video_cards_r128? ( x11-drivers/xf86-video-r128 ) + video_cards_radeon? ( x11-drivers/xf86-video-ati ) + video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) + video_cards_rendition? ( x11-drivers/xf86-video-rendition ) + video_cards_s3? ( x11-drivers/xf86-video-s3 ) + video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) + video_cards_savage? ( x11-drivers/xf86-video-savage ) + video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) + video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) + video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) + video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) + video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) + video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) + video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) + video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) + video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_tegra? ( x11-drivers/xf86-video-opentegra ) + video_cards_tga? ( x11-drivers/xf86-video-tga ) + video_cards_trident? ( x11-drivers/xf86-video-trident ) + video_cards_tseng? ( x11-drivers/xf86-video-tseng ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) + video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) + + !x11-drivers/xf86-input-citron + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-sunbw2 + !<=x11-drivers/xf86-video-ark-0.7.5 + !<=x11-drivers/xf86-video-newport-0.2.4 + !<=x11-drivers/xf86-video-sis-0.10.7 + !<=x11-drivers/xf86-video-v4l-0.2.0 + !<x11-drivers/xf86-input-evdev-2.10.0 + !<x11-drivers/xf86-video-ati-7.6.1 +" diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index f26dfacaf8c9..6c1c052c5ec4 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -4,3 +4,4 @@ DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492f DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab +DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9 diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch new file mode 100644 index 000000000000..0a611456a1f7 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch @@ -0,0 +1,53 @@ +See http://lists.x.org/archives/xorg-devel/2015-February/045755.html + +diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c +index 849bf92..5cc3ec7 100644 +--- a/hw/xfree86/parser/Files.c ++++ b/hw/xfree86/parser/Files.c +@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = { + #define CLEANUP xf86freeFiles + + XF86ConfFilesPtr +-xf86parseFilesSection(void) ++xf86parseFilesSection(XF86ConfFilesPtr ptr) + { + int i, j; + int k, l; + char *str; + int token; + +- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec) ++ if (!ptr) { ++ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) { ++ return NULL; ++ } ++ } + + while ((token = xf86getToken(FilesTab)) != ENDSECTION) { + switch (token) { +diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h +index 171f8e8..e8199fe 100644 +--- a/hw/xfree86/parser/configProcs.h ++++ b/hw/xfree86/parser/configProcs.h +@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr); + int xf86validateDevice(XF86ConfigPtr p); + + /* Files.c */ +-XF86ConfFilesPtr xf86parseFilesSection(void); ++XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr); + void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr); + void xf86freeFiles(XF86ConfFilesPtr p); + +diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c +index 327c02a..e0d6139 100644 +--- a/hw/xfree86/parser/read.c ++++ b/hw/xfree86/parser/read.c +@@ -110,7 +110,7 @@ xf86readConfigFile(void) + if (xf86nameCompare(xf86_lex_val.str, "files") == 0) { + free(xf86_lex_val.str); + xf86_lex_val.str = NULL; +- HANDLE_RETURN(conf_files, xf86parseFilesSection()); ++ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files)); + } + else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) { + free(xf86_lex_val.str); diff --git a/x11-base/xorg-server/xorg-server-1.18.0.ebuild b/x11-base/xorg-server/xorg-server-1.18.0.ebuild new file mode 100644 index 000000000000..d222570d4365 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.18.0.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.28 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.8 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild index 141404143932..d38eb2f470e1 100644 --- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild +++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.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$ @@ -9,7 +9,7 @@ DESCRIPTION="Generic Linux input driver" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="" -RDEPEND=">=x11-base/xorg-server-1.12[udev] +RDEPEND=">=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev" DEPEND="${RDEPEND} diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild index dcd1e1ebdb54..d38eb2f470e1 100644 --- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild +++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Generic Linux input driver" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" IUSE="" -RDEPEND=">=x11-base/xorg-server-1.12[udev] +RDEPEND=">=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev" DEPEND="${RDEPEND} diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest index 91464040fd11..d66df5025242 100644 --- a/x11-drivers/xf86-video-r128/Manifest +++ b/x11-drivers/xf86-video-r128/Manifest @@ -1,3 +1,3 @@ DIST xf86-video-r128-6.10.0.tar.bz2 494884 SHA256 80d531a07168230a408b88809a5440cfd48f9098666d12702d0012148a0d353d SHA512 1221e4a8e744557356eb7fd05d950e857f60eeab5f81707542d1446a983701a68838ee165a511242c67fa4e974ced7d8af12002ec581c636065a8c95325146ed WHIRLPOOL e3414e15e89c2c7d0db4f9270835486d8e87a477dac5971931b409a09242b301449c0b511f7c535fbb6be0d0e13214163ef95af9b799b6d5978f373b55636283 -DIST xf86-video-r128-6.9.1.tar.bz2 470750 SHA256 8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c SHA512 a1a4f171c3d6ecd935a485dfeacdc6c595f287b0227c2bd604a884295aef6e7eab92d5da8b9d2682f2c676d49bcabf92cb0a4f35c65494a580582ef9dd76f73e WHIRLPOOL 77d1f7381bb061ff8d665436b7cb7ada8f51ecff23c0946a0a27e77d5b0b725b19fbb0a61d03e56421644786402ec1ce2aafd6453ac95a6750497dd385e70113 +DIST xf86-video-r128-6.10.1.tar.bz2 495306 SHA256 5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea SHA512 c1c68e548357d9f9e357dcf6e2c1614a253cf0f19b23577720de51801ae2e6160306cdf8bdbf9976d0036910f46dc4fa0e562304d38c84560bb852d3e9dbdd0f WHIRLPOOL e64b7d2e88eecfd1ecbfeeabacd10df5d26eb91fa197bdbe0c80eab6583b11c7e7d134aed9bb544cebcfc8df3677565af17ae0a6f2d20ee29200993d4d474c73 DIST xf86-video-r128-6.9.2.tar.bz2 462266 SHA256 8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0 SHA512 7f8dc174ff8cff6d109a62610b255c3f3a99e6fbdc38373da3efb88a960a25fe3124dbdb6a9379de6b45edaedb3aae44a183a5604f80bbb488dbb98faebc2fb3 WHIRLPOOL 7d93884fc9e4da48fa6cbbd57208c945fa56905a33d1b96700e0084cc57b7e455732c50cc3204da9243e4ff2b401a2acfa559f0504d4fe83147ef536f276c805 diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild index 4dfa88ad0f84..5447ce12b202 100644 --- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild +++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 XORG_DRI=dri inherit xorg-2 DESCRIPTION="ATI Rage128 video driver" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="dri" RDEPEND=">=x11-base/xorg-server-1.2" diff --git a/x11-plugins/vicious/vicious-2.1.3.ebuild b/x11-plugins/vicious/vicious-2.1.3.ebuild index 6333f493e0a2..7b70ac70dc69 100644 --- a/x11-plugins/vicious/vicious-2.1.3.ebuild +++ b/x11-plugins/vicious/vicious-2.1.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="contrib" DEPEND="" diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild index 73c143066ebd..e74b9f26266c 100644 --- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild +++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch" - KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi LICENSE="LGPL-2+" |