diff options
34 files changed, 196 insertions, 517 deletions
diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild index a12ab1d4170d..2c53653c7a7d 100644 --- a/app-crypt/gnupg/gnupg-2.2.10.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server" COMMON_DEPEND_LIBS=" diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild index a57139475d57..8df4d5ed9b47 100644 --- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild +++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static" CDEPEND=" diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild index d36a0f2712da..501591706280 100644 --- a/app-shells/zsh/zsh-5.5.1-r1.ebuild +++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-r3 autotools EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" else - 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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SRC_URI="https://www.zsh.org/pub/${P}.tar.gz https://www.zsh.org/pub/old/${P}.tar.gz doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" diff --git a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild index 3732f69675ff..8ee23dc4fa10 100644 --- a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="static-libs test" src_configure() { diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild index 8159f5ec52f3..ff1fcb439859 100644 --- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild +++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/18" # subslot is based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="cddb +cxx minimal static-libs test" RDEPEND=" diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild index 72af297f3435..615dcc036953 100644 --- a/dev-python/paramiko/paramiko-2.4.2.ebuild +++ b/dev-python/paramiko/paramiko-2.4.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" 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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris" IUSE="doc examples server test" RDEPEND=" diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild index e29e9b5a46f0..0b6b69f81686 100644 --- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild +++ b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2 Unlicense" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="dev-libs/gmp:0 diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild index 40178ede2560..58a84f0a168b 100644 --- a/dev-vcs/git/git-2.19.2.ebuild +++ b/dev-vcs/git/git-2.19.2.ebuild @@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest index 9392d06a50fd..2f7a1c136e52 100644 --- a/media-plugins/kodi-audiodecoder-sidplay/Manifest +++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest @@ -1 +1,2 @@ DIST kodi-audiodecoder-sidplay-1.1.0.tar.gz 9120 BLAKE2B aad141a6b3b6145906fd482149ab72345c86c692cea0b7cf92c52cf015d158aa54de0644f83080f5a25b5690c0e4d12c008924fe78793ac5fc1cbc8c555f114f SHA512 a6874cd7de1c3b0e33593b5c349f64303690f0d56a881bd399c300f8d22ea361ebc995b38f97be39af6bc006a6f0e11b905e70cc671857bcb989dcff90a2d0ee +DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67986609b40f31308c4e914f332420c8ce855c1d594b0bdd112689e874a663f189c722db6811ec12bfa64eb1e9b8907045776821d515 SHA512 8d3f43746328999ea817cd52e4e8f0f1454ffb1e243de4941752cfd7ea6f48848fe7d0855e7a9207934cb61e633389fed79379d3302d58c7c9e8c53784fc2adc diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild index e96f8120dfe6..882888415e09 100644 --- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0.ebuild +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,8 +27,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + =media-tv/kodi-17* + =media-libs/kodi-platform-17* media-libs/libsidplay:2 " diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild new file mode 100644 index 000000000000..6d68262da236 --- /dev/null +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils kodi-addon + +DESCRIPTION="SidPlay decoder addon for Kodi" +HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay" +SRC_URI="" + +case ${PV} in +9999) + SRC_URI="" + EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git" + inherit git-r3 + ;; +*) + CODENAME="Leia" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}" + ;; +esac + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=" + =media-tv/kodi-18* + =media-libs/kodi-platform-18* + media-libs/libsidplay:2 + " + +RDEPEND=" + ${DEPEND} + " diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild index e96f8120dfe6..092cc74d4d6d 100644 --- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,9 +16,10 @@ case ${PV} in inherit git-r3 ;; *) + CODENAME="Leia" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/audiodecoder.sidplay-${PV}" + SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}" ;; esac @@ -27,8 +28,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + ~media-tv/kodi-9999 + ~media-libs/kodi-platform-9999 media-libs/libsidplay:2 " diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest index d012b1ebd070..f44a06a0fc96 100644 --- a/media-plugins/kodi-audiodecoder-snesapu/Manifest +++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest @@ -1 +1,2 @@ DIST kodi-audiodecoder-snesapu-1.1.0.tar.gz 38567 BLAKE2B 461164cfc9f81c5c4e644e7905b40a475cb19aeb2b9c91912d8a8e7fd2505141fe7d513e4986922c374226025226257b00415953379ec071f95c37ea2db0fb1e SHA512 f58d87ddc2da1734399872543f18a1a77f5bfd2b3adce42c8e4211a7e4e199a51a59aaccfbd7dff24e4599c9457276014233ab6213c231e2be7e6c7d09e08ffe +DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724 diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild index ee49d0f34147..f549197c1b8c 100644 --- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0.ebuild +++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,8 +27,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + =media-tv/kodi-17* + =media-libs/kodi-platform-17* " RDEPEND=" ${DEPEND} diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.0.ebuild new file mode 100644 index 000000000000..36a879f7b682 --- /dev/null +++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils kodi-addon + +DESCRIPTION="SPC decoder addon for Kodi" +HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu" +SRC_URI="" + +case ${PV} in +9999) + SRC_URI="" + EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git" + inherit git-r3 + ;; +*) + CODENAME="Leia" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}" + ;; +esac + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=" + =media-tv/kodi-18* + =media-libs/kodi-platform-18* + " +RDEPEND=" + ${DEPEND} + " diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild index ee49d0f34147..4f9e8c3888ec 100644 --- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild +++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,9 +16,10 @@ case ${PV} in inherit git-r3 ;; *) + CODENAME="Leia" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/audiodecoder.snesapu-${PV}" + SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}" ;; esac @@ -27,8 +28,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + ~media-tv/kodi-9999 + ~media-libs/kodi-platform-9999 " RDEPEND=" ${DEPEND} diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest index 76c89ae19904..155dfa24a4b6 100644 --- a/media-plugins/kodi-audiodecoder-stsound/Manifest +++ b/media-plugins/kodi-audiodecoder-stsound/Manifest @@ -1 +1,2 @@ DIST kodi-audiodecoder-stsound-1.1.0.tar.gz 62033 BLAKE2B 1aaf55b732ae2ac0a647963979afc3db79fc58ef0baee42ba15245c6a8d353cffd24bc9101113cbf302e7cf73bc504c621b480bcf3a09bd543601e0fbd691602 SHA512 462403bc3221cef4b64b12f25765fe89567e873a0aa9df7dfb4e649132500b5fec43f0551f7d359c2b4ee38ab8fcf03bc010e84d20bdd4b8665ad254568f9f60 +DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9 diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild index 4ce3334dd26a..bcb6ded7e4ca 100644 --- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0.ebuild +++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,8 +27,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + =media-tv/kodi-17* + =media-libs/kodi-platform-17* " RDEPEND=" ${DEPEND} diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.0.ebuild new file mode 100644 index 000000000000..e88939d30e43 --- /dev/null +++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils kodi-addon + +DESCRIPTION="SPC decoder addon for Kodi" +HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound" +SRC_URI="" + +case ${PV} in +9999) + SRC_URI="" + EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git" + inherit git-r3 + ;; +*) + CODENAME="Leia" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}" + ;; +esac + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=" + =media-tv/kodi-18* + =media-libs/kodi-platform-18* + " +RDEPEND=" + ${DEPEND} + " diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild index 4ce3334dd26a..09c82e122719 100644 --- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild +++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,9 +16,10 @@ case ${PV} in inherit git-r3 ;; *) + CODENAME="Leia" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/audiodecoder.stsound-${PV}" + SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}" ;; esac @@ -27,8 +28,8 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi - media-libs/kodi-platform + ~media-tv/kodi-9999 + ~media-libs/kodi-platform-9999 " RDEPEND=" ${DEPEND} diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild index 79e49b72338f..1646b899e334 100644 --- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0.ebuild +++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi + =media-tv/kodi-17* virtual/opengl " diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild index 79e49b72338f..e0bb237b4e91 100644 --- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild +++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi + ~media-tv/kodi-9999 virtual/opengl " diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild index 494532324f6a..c3e77106f082 100644 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0.ebuild +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ SLOT="0" IUSE="" DEPEND=" - media-tv/kodi + =media-tv/kodi-17* virtual/opengl " diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 3104e3b18829..594c43ddce25 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1,2 +1 @@ -DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4 diff --git a/media-sound/cantata/cantata-2.2.0.ebuild b/media-sound/cantata/cantata-2.2.0.ebuild deleted file mode 100644 index 388cff4d5613..000000000000 --- a/media-sound/cantata/cantata-2.2.0.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN" -inherit cmake-utils gnome2-utils l10n qmake-utils xdg - -DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" -HOMEPAGE="https://github.com/CDrummond/cantata" -SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks" -REQUIRED_USE=" - ?? ( cdda cdio ) - cdda? ( udisks || ( cddb musicbrainz ) ) - cddb? ( || ( cdio cdda ) taglib ) - cdio? ( udisks || ( cddb musicbrainz ) ) - mtp? ( taglib udisks ) - musicbrainz? ( || ( cdio cdda ) taglib ) - replaygain? ( taglib ) -" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) - sys-libs/zlib - virtual/libudev:= - cdda? ( media-sound/cdparanoia ) - cddb? ( media-libs/libcddb ) - cdio? ( dev-libs/libcdio-paranoia ) - mtp? ( media-libs/libmtp ) - musicbrainz? ( media-libs/musicbrainz:5= ) - replaygain? ( - media-libs/libebur128 - media-sound/mpg123 - virtual/ffmpeg - ) - streaming? ( media-video/vlc:0= ) - taglib? ( - media-libs/taglib[asf(+),mp4(+)] - media-libs/taglib-extras - udisks? ( sys-fs/udisks:2 ) - ) -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - dev-qt/linguist-tools:5 -" - -# cantata has no tests -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${P}-headers.patch" ) - -src_prepare() { - remove_locale() { - rm "translations/${PN}_${1}".ts || die - } - - cmake-utils_src_prepare - - # Unbundle 3rd party libs - rm -r 3rdparty/{ebur128,qtsingleapplication} || die - - l10n_find_plocales_changes "translations" "${PN}_" ".ts" - l10n_for_each_disabled_locale_do remove_locale -} - -src_configure() { - local mycmakeargs=( - -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" - -DENABLE_CDPARANOIA=$(usex cdda) - -DENABLE_CDDB=$(usex cddb) - -DENABLE_CDIOPARANOIA=$(usex cdio) - -DENABLE_HTTP_SERVER=$(usex http-server) - -DENABLE_MTP=$(usex mtp) - -DENABLE_MUSICBRAINZ=$(usex musicbrainz) - -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" - -DENABLE_FFMPEG=$(usex replaygain) - -DENABLE_MPG123=$(usex replaygain) - -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) - -DENABLE_TAGLIB=$(usex taglib) - -DENABLE_TAGLIB_EXTRAS=$(usex taglib) - -DENABLE_DEVICES_SUPPORT=$(usex udisks) - -DENABLE_REMOTE_DEVICES=OFF - -DENABLE_UDISKS2=ON - ) - - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist - xdg_pkg_preinst -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_pkg_postinst - - has_version media-sound/mpd || \ - elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_pkg_postrm -} diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index cc028f32619b..d65817bcc812 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz LICENSE="OPENLDAP GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE_DAEMON="crypt samba slp tcpd experimental minimal" IUSE_BACKEND="+berkdb" diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index 922670cf0cfb..52dffdbc97cc 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -1,2 +1 @@ -DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch deleted file mode 100644 index 1f37eace7602..000000000000 --- a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- opencascade-6.8.0/Makefile.am -+++ opencascade-6.8.0/Makefile.am -@@ -82,27 +82,27 @@ - cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw - - install-exec-local: -- $(INSTALL) -d $(prefix)/$(platform) -- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \ -- cd $(prefix)/$(platform) && ln -s ../bin bin; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform) -+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \ - fi -- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \ -- cd $(prefix)/$(platform) && ln -s ../lib lib; \ -+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \ - fi -- buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \ -+ buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \ - if [ "$$installd" != "$$sourced" ]; then \ -- $(INSTALL) -d $(prefix)/inc; \ -- cp -frL $(top_srcdir)/inc $(prefix); \ -- cp -frL $$buildd/config.h $(prefix); \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \ -+ cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \ -+ cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \ - for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \ -- $(INSTALL) -d $(prefix)/src/$$d; \ -- cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ -+ cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ - done; \ - fi -- if [ -e $(prefix)/inc/config.h ]; then \ -- rm -f $(prefix)/inc/config.h; \ -+ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ -+ rm -f $(DESTDIR)$(prefix)/inc/config.h; \ - fi -- cd $(prefix)/inc && ln -s ../config.h config.h -- cd $(top_srcdir) && cp *.sh $(prefix) -+ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h -+ cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix) - --.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw -\ No newline at end of file -+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch deleted file mode 100644 index 8e1d3361dde6..000000000000 --- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- opencascade-6.9.1/configure.ac -+++ opencascade-6.9.1/configure.ac -@@ -1044,7 +1044,7 @@ - fi - if test "x$vtk_lib" != "x"; then - CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms " -- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle " -+ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2 -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle " - else - HAVE_VTK=no - fi ---- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx -+++ opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx -@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP - myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0); - myRenderer->DisplayToWorld(); - -- vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint(); -+ double* const aCoords = myRenderer->GetWorldPoint(); - if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates - { - return false; ---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx -+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx -@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const - // Method: convertDisplayToWorld - // Purpose: Convert display coordinates to world coordinates - //============================================================================ --bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer, -- vtkFloatingPointType theDisplayCoord[3], -- vtkFloatingPointType theWorldCoord[3]) -+bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer, -+ double theDisplayCoord[3], -+ double theWorldCoord[3]) - { - // Convert the selection point into world coordinates. - theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]); - theRenderer->DisplayToWorld(); - -- vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint(); -+ double* const aCoords = theRenderer->GetWorldPoint(); - if (aCoords[3] == 0.0) - { - return false; ---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx -+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx -@@ -124,8 +124,8 @@ protected: - - //! Convert display coordinates to world coordinates - static bool convertDisplayToWorld (vtkRenderer *theRenderer, -- vtkFloatingPointType theDisplayCoord[3], -- vtkFloatingPointType theWorldCoord[3] ); -+ double theDisplayCoord[3], -+ double theWorldCoord[3] ); - - private: // not copyable - IVtkTools_ShapePicker (const IVtkTools_ShapePicker&); ---- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx -+++ opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx -@@ -124,8 +124,8 @@ - - //! Convert display coordinates to world coordinates - static bool convertDisplayToWorld (vtkRenderer *theRenderer, -- vtkFloatingPointType theDisplayCoord[3], -- vtkFloatingPointType theWorldCoord[3] ); -+ double theDisplayCoord[3], -+ double theWorldCoord[3] ); - - private: // not copyable - IVtkTools_ShapePicker (const IVtkTools_ShapePicker&); diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch deleted file mode 100644 index d1f560320c6c..000000000000 --- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx -+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx -@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID, - vtkIdType aPointIdVTK = thePointId; - myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } - - //================================================================ -@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID, - vtkIdType aPoints[2] = { thePointId1, thePointId2 }; - myPolyData->InsertNextCell (VTK_LINE, 2, aPoints); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } - - //================================================================ -@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID, - - myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - anIdList->Delete(); - } - } -@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType theShapeID, - vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 }; - myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch deleted file mode 100644 index 3c2711d3813e..000000000000 --- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- opencascade-6.9.1/configure.ac -+++ opencascade-6.9.1/configure.ac -@@ -1043,8 +1043,8 @@ - HAVE_VTK=no - fi - if test "x$vtk_lib" != "x"; then -- CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 " -- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1 -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 " -+ CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms " -+ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle " - else - HAVE_VTK=no - fi diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch new file mode 100644 index 000000000000..fc572a4f5bca --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch @@ -0,0 +1,38 @@ +Author: jbeich +Date: Wed May 2 13:25:55 UTC 2018 +New revision: 468831 + +src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ +src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + ^ + +--- a/src/Image/Image_VideoRecorder.cxx 2017-08-30 13:28:21 UTC ++++ b/src/Image/Image_VideoRecorder.cxx +@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream ( + // some formats want stream headers to be separate + if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER) + { +- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + return Standard_True; + #else +@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + AVPacket aPacket; + memset (&aPacket, 0, sizeof(aPacket)); + av_init_packet (&aPacket); ++#ifdef AVFMT_RAWPICTURE + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + && !theToFlush) + { +@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + aResAv = av_interleaved_write_frame (myAVContext, &aPacket); + } + else ++#endif + { + // encode the image + myFrame->pts = myFrameCount; diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild deleted file mode 100644 index b8abc59a41a3..000000000000 --- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator - -DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="http://www.opencascade.org/" -SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz" - -LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc examples freeimage gl2ps java +tbb +vtk" - -DEPEND=" - app-eselect/eselect-opencascade - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/itcl - dev-tcltk/itk - dev-tcltk/tix - media-libs/ftgl - virtual/glu - virtual/opengl - x11-libs/libXmu - freeimage? ( media-libs/freeimage ) - gl2ps? ( x11-libs/gl2ps ) - java? ( >=virtual/jdk-0:= ) - tbb? ( dev-cpp/tbb ) - vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )" -RDEPEND="${DEPEND}" -CHECKREQS_MEMORY="256M" -CHECKREQS_DISK_BUILD="3584M" - -PATCHES=( - "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch - "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch - "${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch -) - -pkg_setup() { - check-reqs_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - MY_VTK_P=$(best_version sci-libs/vtk) - MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-} - MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV}) - if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304 - eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch - fi - - java-pkg-opt-2_src_prepare - - # Feed environment variables used by Opencascade compilation - my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros - local my_env_install="#!/bin/sh -f -if [ -z \"\$PATH\" ]; then - export PATH=VAR_CASROOT/Linux/bin -else - export PATH=VAR_CASROOT/Linux/bin:\$PATH -fi -if [ -z \"\$LD_LIBRARY_PATH\" ]; then - export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib -else - export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH -fi" - local my_sys_lib=${EROOT}usr/$(get_libdir) - local my_env="CASROOT=VAR_CASROOT -CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT -CSF_LANGUAGE=us -MMGT_CLEAR=1 -CSF_EXCEPTION_PROMPT=1 -CSF_SHMessage=VAR_CASROOT/src/SHMessage -CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures -CSF_XSMessage=VAR_CASROOT/src/XSMessage -CSF_StandardDefaults=VAR_CASROOT/src/StdResource -CSF_PluginDefaults=VAR_CASROOT/src/StdResource -CSF_XCAFDefaults=VAR_CASROOT/src/StdResource -CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource -CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so -CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat -CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat -CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource -CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource -CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource -CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt -TCLHOME=${EROOT}usr/bin -TCLLIBPATH=${my_sys_lib} -ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/') -ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/') -TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/') -TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') -TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')" - - ( echo "${my_env_install}" - echo "${my_env}" | sed -e "s:^:export :" ) \ - | sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die - source env.sh - - ( echo "PATH=${my_install_dir}/lin/bin" - echo "LDPATH=${my_install_dir}/lin/$(get_libdir)" - echo "${my_env}" | sed \ - -e "s:VAR_CASROOT:${my_install_dir}/lin:g" \ - -e "s:/Linux/lib/:/$(get_libdir)/:g" || die - ) > 50${PN} - - append-cxxflags "-fpermissive" - - sed -e "/^AM_C_PROTOTYPES$/d" \ - -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \ - -e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \ - -i configure.ac || die - - # no longer needed https://tracker.dev.opencascade.org/view.php?id=28971 - if has_version ">=sys-libs/glibc-2.26" ; then - sed -e '/#include <xlocale.h>/d' \ - -i inc/Standard_CLocaleSentry.hxx || die - fi - - eautoreconf -} - -src_configure() { - econf \ - --prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \ - --with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \ - --with-freetype="${EROOT}usr" \ - --with-ftgl="${EROOT}usr" \ - --without-qt \ - $(usex freeimage "--with-freeimage=${EROOT}usr" "") \ - $(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \ - $(usex tbb "--with-tbb-include=${EROOT}usr" "") \ - $(usex tbb "--with-tbb-library=${EROOT}usr" "") \ - $(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \ - $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK_SUB}" "") \ - $(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \ - $(use_enable debug) \ - $(use_enable !debug production) -} - -src_install() { - emake DESTDIR="${D}" install - - prune_libtool_files - - # Symlinks for keeping original OpenCascade folder structure and - # add a link lib to $(get_libdir) if we are e.g. on amd64 multilib - if [ "$(get_libdir)" != "lib" ]; then - dosym "$(get_libdir)" "${my_install_dir}/lin/lib" - fi - - insinto /etc/env.d/${PN} - newins 50${PN} ${PV} - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins -r data - doins -r samples - fi - if use doc; then - insinto /usr/share/doc/${PF} - doins -r doc/{overview,pdf,refman} - fi -} - -pkg_postinst() { - eselect ${PN} set ${PV} - elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it." - elog "You get a list by running \"equery depends sci-libs/opencascade\"" - elog "revdep-rebuild does NOT suffice." -} diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild index 48f4c0775e4d..6d40cf35bba6 100644 --- a/sci-libs/opencascade/opencascade-7.3.0.ebuild +++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}" PATCHES=( "${FILESDIR}/${P}-vtk-compat.patch" "${FILESDIR}/${P}-fixed-DESTDIR.patch" + "${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248 ) pkg_setup() { |