diff --git a/Manifest.files.gz b/Manifest.files.gz index 49c62977ba88..5eb53037e4f3 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index b686c32b09fa..f06c1a7bee91 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild index 8ffe7fafe8bd..6f9b1bcde17f 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.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 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" RDEPEND=" diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild index 01ab3d27bb05..b5bcadc4bc7a 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.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 @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="2" IUSE="X +introspection" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" # x11-libs/libSM is needed until upstream #719808 is solved either # making the dep unneeded or fixing their configure diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest index ace56a5aa3e9..ce5754d8785b 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,2 +1 @@ -DIST speech-dispatcher-0.8.1.tar.gz 1309969 BLAKE2B 225a7b6a134cf0c82b1e08f961bad87a509ae7b4a9948c1e548c84a325b86b70ee66cd52dabd560f6640682385ea826fa4e67ec762a3da223a14303ddfdae5c2 SHA512 35f1ae547001a45d7945406ae5672829ff9ab6ac3f0cccb9eb3670dd92888a63c7cc4270ee90b5a166e6788afe3b117b5c3ef62c41a9df9f9af94dc4e0948fe8 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375 diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild deleted file mode 100644 index 120aa60f8b4b..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_4 python3_5 ) -PYTHON_REQ_USE="threads(+)" - -inherit eutils python-r1 - -DESCRIPTION="Speech synthesis interface" -HOMEPAGE="http://www.freebsoft.org/speechd" -SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="alsa ao +espeak flite nas pulseaudio python static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND="python? ( ${PYTHON_DEPS} ) - >=dev-libs/dotconf-1.3 - >=dev-libs/glib-2.28:2 - >=media-libs/libsndfile-1.0.2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) - flite? ( app-accessibility/flite ) - nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.0 - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" - -src_configure() { - local myeconfargs=( - --disable-python - $(use_enable static-libs static) - $(use_with alsa) - $(use_with ao libao) - $(use_with espeak) - $(use_with flite) - $(use_with pulseaudio pulse) - $(use_with nas) - ) - econf ${myeconfargs[@]} -} - -src_compile() { - use python && python_copy_sources - - emake - - if use python; then - building() { - cd src/api/python || die - emake \ - pyexecdir="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" - } - python_foreach_impl run_in_build_dir building - fi -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ANNOUNCE AUTHORS BUGS ChangeLog FAQ NEWS README* - - prune_libtool_files --all - - if use python; then - installation() { - cd src/api/python || die - emake \ - DESTDIR="${D}" \ - pyexecdir="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" \ - install - } - python_foreach_impl run_in_build_dir installation - python_replicate_script "${ED}"/usr/bin/spd-conf - fi -} - -pkg_postinst() { - local editconfig="n" - if ! use espeak; then - ewarn "You have disabled espeak, which is speech-dispatcher's" - ewarn "default speech synthesizer." - ewarn - editconfig="y" - fi - if ! use pulseaudio; then - ewarn "You have disabled pulseaudio support." - ewarn "pulseaudio is speech-dispatcher's default audio subsystem." - ewarn - editconfig="y" - fi - if [[ "${editconfig}" == "y" ]]; then - ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf" - ewarn "and make sure the settings there match your system." - ewarn - fi - elog "For festival support, you need to" - elog "install app-accessibility/festival-freebsoft-utils." -} diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 81bfb624eefe..1bd9d4c0ed0d 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest index f5caa90a1f11..5dc56c64c0db 100644 --- a/app-admin/github-backup-utils/Manifest +++ b/app-admin/github-backup-utils/Manifest @@ -6,6 +6,7 @@ DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d98 DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca DIST github-backup-utils-2.14.2.tar.gz 84628 BLAKE2B 579088448da16330083ee4ffbbd2d9e286eac7bf89bc9146bb4eaed8aee42971238ea997625da2e5c6f10097b329ffb7db876aab20acdbe7d17c1a8bcb9a3801 SHA512 6a93861441388866ba57c8be13ece0df6967e711fd643138c00490ce439fb74d29ceb5b482f6315d1a47df0cb90ab4a835bb25bdcc92172f5f200b5900108bd4 DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b48bf5b65e3c6127bbeb01064273e4bcc8e3f3b5fd8e439cd4717c4c8d103113b00eba4ed670737169ce6ffa7a8256b08386e01 SHA512 3294641c8220cd7d5e212e47b7011f188432e5e6437e6d97a9d6c38182fd451a0229588ee28872d5c1bb1b0cab93eb612586a268761d42cb763f38ad13ec0ab4 +DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843 DIST github-backup-utils-2.5.0.tar.gz 40850 BLAKE2B 34f16e290619a21edef11410a583357a15b57c9a6a0d20b188863f5c41a7a30bcc168a2337ff7203de6f5659c611178bed0e0cff3d802c1ec923d7c4d8e1ee3a SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d DIST github-backup-utils-2.6.0.tar.gz 45970 BLAKE2B 855c7e93aa4db136629db8ba109328d51b9e9ca82aef1190a9703be2cc456ac006cd6bacaf1d3ffe9ccd8d43fb83c15c30c9b514abd37fb2104e62b2e1ed51fa SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e DIST github-backup-utils-2.6.3.tar.gz 50884 BLAKE2B 43e8c398da11f891230a7910fc29d9fc702f5985c8bda5388f8415446e12a3408383ee5a76a26f2519625be3bf442600e4281a4e10e24b5a1143ac4ca1934442 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290 diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild new file mode 100644 index 000000000000..bc589b56f9aa --- /dev/null +++ b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# See https://github.com/github/backup-utils/issues/135 +PYTHON_COMPAT=(python2_7) +inherit python-any-r1 + +DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" +HOMEPAGE="https://github.com/github/backup-utils" +SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +DEPEND="test? ( + dev-util/checkbashisms + sys-apps/moreutils + ${PYTHON_DEPS} +)" + +RDEPEND="net-misc/rsync" + +MY_PN="${PN/#github-/}" +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { + :; +} + +src_install() { + dobin bin/* + insinto usr/share/${PN} + doins share/${PN}/version + + exeinto usr/share/${PN} + doexe share/${PN}/bm.sh + doexe share/${PN}/ghe-* + + insinto etc/${PN} + newins backup.config-example backup.config + +dodoc -r docs/* +} + +src_test() { + emake test +} diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest index ed870d00d723..61453a625185 100644 --- a/app-admin/pass-otp/Manifest +++ b/app-admin/pass-otp/Manifest @@ -1,2 +1 @@ -DIST pass-otp-1.1.0.tar.gz 32857 BLAKE2B 97ca197b251d9748c0ace5b40aca2547cd278e9eee9768b8882cdfbb23bd440792101ab82d2ade276cfc34de1364460a066adc8395336380b1ef6759f51804eb SHA512 3c880bcb7e7e984494796bc7a0c0fb5f70b052938f6ce5c0b1cbb745d0b30febab2ca51c264fac02f884699dc685400076f0065db0c3d08da436e93c27f075ce -DIST pass-otp-1.1.1.tar.gz 46283 BLAKE2B d2448a82b67a685e9df366dbec29fd4a3cedea03b0218714b95d5bc2663ac86b3fa79a4bba5157b6948111aa7bf06d5d48e320d9fecf1b23e71ff73d3b65d861 SHA512 8dfaafac08aa17a4ee1ae34bb47d26ca337fe05b69be19a3bcb3521e033631fde9dd559481c1512500775186ca08e26a4589dfc76b4dac718f64a33819c9b5b6 +DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5 diff --git a/app-admin/pass-otp/pass-otp-1.1.0.ebuild b/app-admin/pass-otp/pass-otp-1.1.0.ebuild deleted file mode 100644 index c314e589f5a0..000000000000 --- a/app-admin/pass-otp/pass-otp-1.1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens." -HOMEPAGE="https://github.com/tadfisher/pass-otp" -SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qrcode test" - -DEPEND="test? ( dev-tcltk/expect:* )" - -RDEPEND=">=app-admin/pass-1.7 - sys-auth/oath-toolkit - qrcode? ( media-gfx/qrencode )" - -src_compile() { - : -} diff --git a/app-admin/pass-otp/pass-otp-1.1.1.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild similarity index 77% rename from app-admin/pass-otp/pass-otp-1.1.1.ebuild rename to app-admin/pass-otp/pass-otp-1.2.0.ebuild index c4d4d19aa424..b93a38c51e23 100644 --- a/app-admin/pass-otp/pass-otp-1.1.1.ebuild +++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit bash-completion-r1 + DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens." HOMEPAGE="https://github.com/tadfisher/pass-otp" SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz" @@ -21,3 +23,7 @@ RDEPEND=">=app-admin/pass-1.7 src_compile() { : } + +src_install() { + emake install DESTDIR="${D}" BASHCOMPDIR="$(get_bashcompdir)" +} diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index d560e7125b41..ae08543be541 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild index 4bd0a66cafe4..32c897bac175 100644 --- a/app-arch/cabextract/cabextract-1.9-r2.ebuild +++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:=" else - KEYWORDS="amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz" diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index e27ae5a76e5b..e00391356dff 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild new file mode 100644 index 000000000000..019a34fdab16 --- /dev/null +++ b/app-backup/bacula/bacula-9.2.2-r1.ebuild @@ -0,0 +1,434 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop libtool qmake-utils systemd user + +MY_PV=${PV/_beta/-b} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="http://www.bacula.org/" +SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" + +DEPEND=" + !bacula-clientonly? ( + !bacula-nodir? ( virtual/mta ) + postgres? ( dev-db/postgresql:=[threads] ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) + sqlite? ( dev-db/sqlite:3 ) + ) + dev-libs/gmp:0 + qt5? ( + dev-qt/qtsvg:5 + x11-libs/qwt:6 + ) + logwatch? ( sys-apps/logwatch ) + readline? ( sys-libs/readline:0 ) + static? ( + dev-libs/lzo[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + acl? ( virtual/acl[static-libs] ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + ) + ) + !static? ( + dev-libs/lzo + sys-libs/ncurses:= + sys-libs/zlib + acl? ( virtual/acl ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) +" +RDEPEND="${DEPEND} + !bacula-clientonly? ( + !bacula-nosd? ( + app-arch/mt-st + sys-block/mtx + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +REQUIRED_USE=" + !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) + static? ( bacula-clientonly ) +" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + #XOR and !bacula-clientonly controlled by REQUIRED_USE + use mysql && export mydbtype="mysql" + use postgres && export mydbtype="postgresql" + use sqlite && export mydbtype="sqlite3" + + # create the daemon group and user + if [ -z "$(egetent group bacula 2>/dev/null)" ]; then + enewgroup bacula + einfo + einfo "The group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + fi + + if use bacula-clientonly && use static && use qt5; then + ewarn + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." + ewarn + fi + + if ! use bacula-clientonly; then + if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then + enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw + einfo + einfo "The user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + fi + fi +} + +src_prepare() { + # adjusts default configuration files for several binaries + # to /etc/bacula/ instead of ./ + pushd src >&/dev/null || die + for f in console/console.c dird/dird.c filed/filed.c \ + stored/bcopy.c stored/bextract.c stored/bls.c \ + stored/bscan.c stored/btape.c stored/stored.c \ + qt-console/main.cpp; do + sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ + || die "sed on ${f} failed" + done + popd >&/dev/null || die + + # bug 466688 drop deprecated categories from Desktop file + sed -i -e 's/Application;//' scripts/bat.desktop.in || die + + # bug 466690 Use CXXFLAGS instead of CFLAGS + sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + + # drop automatic install of unneeded documentation (for bug 356499) + eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch + + # bug #310087 + eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch + + # bug #311161 + eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch + + # bat needs to respect LDFLAGS and CFLAGS + eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch + + # bug #328701 + eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch + + eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch + + # fix soname in libbaccat.so bug #602952 + eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" + + # do not strip binaries + sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die + sed -i -e "s/strip /# strip /" src/console/Makefile.in || die + + # fix file not found error during make depend + eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch + + eapply_user + + # Fix systemd unit files: + # bug 497748 + sed -i -e '/Requires/d' platforms/systemd/*.service.in || die + sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die + # bug 504370 + sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die + # bug 584442 and 504368 + sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die + + # build 'bat' for Qt5 + export QMAKE="$(qt5_get_bindir)"/qmake + + # adapt to >=Qt-5.9 (see bug #644566) + # qmake needs an existing target file to generate install instructions + sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ + src/qt-console/bat.pro.in || die + mkdir src/qt-console/.libs || die + touch src/qt-console/.libs/bat || die + chmod 755 src/qt-console/.libs/bat || die + + # fix wrong handling of libressl version + # needs separate handling for =libressl2.7 + # (see bug #655520) + if has_version "&/dev/null || die + emake DESTDIR="${D}" install + popd >&/dev/null || die + fi + fi + + if ! use qt5; then + rm -vf "${D}"/usr/share/man/man1/bat.1* + fi + rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* + + if use bacula-clientonly || use bacula-nodir ; then + rm -vf "${D}"/usr/libexec/bacula/create_*_database + rm -vf "${D}"/usr/libexec/bacula/drop_*_database + rm -vf "${D}"/usr/libexec/bacula/make_*_tables + rm -vf "${D}"/usr/libexec/bacula/update_*_tables + rm -vf "${D}"/usr/libexec/bacula/drop_*_tables + rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges + rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup + fi + if use bacula-clientonly || use bacula-nosd; then + rm -vf "${D}"/usr/libexec/bacula/disk-changer + rm -vf "${D}"/usr/libexec/bacula/mtx-changer + rm -vf "${D}"/usr/libexec/bacula/dvd-handler + fi + + # documentation + dodoc ChangeLog ReleaseNotes SUPPORT + + # Install all man pages + doman "${S}"/manpages/* + + # install examples (bug #457504) + if use examples; then + docinto examples/ + dodoc -r examples/* + fi + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins scripts/bacula.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins scripts/filetype.vim bacula_ft.vim + fi + + # setup init scripts + myscripts="bacula-fd" + if ! use bacula-clientonly; then + if ! use bacula-nodir; then + myscripts="${myscripts} bacula-dir" + fi + if ! use bacula-nosd; then + myscripts="${myscripts} bacula-sd" + fi + fi + for script in ${myscripts}; do + # copy over init script and config to a temporary location + # so we can modify them as needed + cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" + cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" + + # now set the database dependancy for the director init script + case "${script}" in + bacula-dir) + case "${mydbtype}" in + sqlite3) + # sqlite databases don't have a daemon + sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die + ;; + *) + # all other databases have daemons + sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die + ;; + esac + ;; + *) + ;; + esac + + # install init script and config + newinitd "${T}/${script}".initd "${script}" + newconfd "${T}/${script}".confd "${script}" + done + + systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bacula + + # make sure bacula group can execute bacula libexec scripts + fowners -R root:bacula /usr/libexec/bacula +} + +pkg_postinst() { + if use bacula-clientonly; then + fowners root:bacula /var/lib/bacula + else + fowners bacula:bacula /var/lib/bacula + fi + + if ! use bacula-clientonly && ! use bacula-nodir; then + einfo + einfo "If this is a new install, you must create the ${mydbtype} databases with:" + einfo " /usr/libexec/bacula/create_${mydbtype}_database" + einfo " /usr/libexec/bacula/make_${mydbtype}_tables" + einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" + einfo + + ewarn "ATTENTION!" + ewarn "The format of the database may have changed." + ewarn "If you just upgraded from a version below 9.0.0 you must run" + ewarn "'update_bacula_tables' now." + ewarn "Make sure to have a backup of your catalog before." + ewarn + fi + + if use sqlite; then + einfo + einfo "Be aware that Bacula does not officially support SQLite database anymore." + einfo "Best use it only for a client-only installation. See Bug #445540." + einfo + fi + + einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" + einfo "you have to enable 'USE=qt5'." + einfo + einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" + einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." +} diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml index 1ebf5f232fac..ed8ab4a85425 100644 --- a/app-backup/bacula/metadata.xml +++ b/app-backup/bacula/metadata.xml @@ -10,6 +10,7 @@ client Disable building of director Disable building of storage daemon + Enable batch insert into data base Install support files for logwatch diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz index 749dec206c1c..87e96725d752 100644 Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest index 308dc3575941..691aebe1768f 100644 --- a/app-dicts/gnome-dictionary/Manifest +++ b/app-dicts/gnome-dictionary/Manifest @@ -1 +1,2 @@ DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3 +DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27 diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild new file mode 100644 index 000000000000..d5ced459001d --- /dev/null +++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Dictionary utility for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary" + +LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" +SLOT="0" # does not provide a public libgdict-1.0.so anymore +IUSE="ipv6" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + >=dev-libs/glib-2.42:2 + >=x11-libs/gtk+-3.21.2:3 +" +RDEPEND="${COMMON_DEPEND} + gnome-base/gsettings-desktop-schemas +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.3 + dev-libs/libxslt + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use ipv6 use_ipv6) + -Dbuild_man=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 0d55c5c66200..99f53d45720e 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest index e1c4177539a3..392361c2ccf6 100644 --- a/app-emulation/libguestfs-appliance/Manifest +++ b/app-emulation/libguestfs-appliance/Manifest @@ -1,3 +1,2 @@ -DIST appliance-1.26.0.tar.xz 94753208 BLAKE2B f3d264d07130a79dd74a1a069cade87b72a36b4cf6bd4326379bf948eaa8e6e45de564cfabdb82bd15106fc1bfdb478941974f06b73b630d23fc66b70c6c11c3 SHA512 5d493ed6e8601dde8d5a45debfee71696b96a36d0f69d428388a6f2a2d49e12c0a66bcee210fe606fc9b2b41cb42d0d2a9f5d12425f2b234423194b2609f081f -DIST appliance-1.28.1.tar.xz 100065044 BLAKE2B 2950377bf9aa31ce68ae7127126456a018c303c483308ac9deab9e40b1e991c4d4a02ee55b65385b5a5fd1e94fa3119a8a1a8718dad0d066f21c679239158ca1 SHA512 f13c556953d3542f92c2c007d3e97c3568382a1879e7a558471dbeac8962bd2809e446bbf0f4647002967112abe8f9a9a06910b74e9b7d72694cf49859a26330 DIST appliance-1.36.1.tar.xz 91514476 BLAKE2B 4cb328178e93b2430c85d1eb23450633220cabfa16e4dbbb11e0e5b75f7fc4c33daabc171dd19aee46ce385ec06665010e52d8dafac7581695cf40ff5d194dcb SHA512 2af550078a0e6b37e97988018f579df0e19072d06cbb53eccd85c2873850b472cabf34bbfb4e0ef5f43b5a1af4155f014eeefb85a1b05035d7916c7b1187d722 +DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082 diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild deleted file mode 100644 index b49125430174..000000000000 --- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -CHECKREQS_DISK_USR=500M -CHECKREQS_DISK_BUILD=500M - -inherit check-reqs - -DESCRIPTION="VM appliance disk image used in libguestfs package" -HOMEPAGE="http://libguestfs.org/" -SRC_URI="http://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-arch/xz-utils" -# Mixing libguestfs versions causes weird problems. #501588 -RDEPEND="! +Date: Fri, 7 Dec 2018 11:21:25 +0100 +Subject: [PATCH 3/4] Fix install failure when not built with OCaml support + +Makefile rules in po/ require builder/index-parse.c to be generated to +allow translation utilities to work on it, however builder/ is +completely masked behind OCaml conditional build even if some tools do +not require it and proper guards are in place already. + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502 +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 7eefacbeb..c0a68151f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -155,7 +155,6 @@ if HAVE_OCAML + SUBDIRS += \ + mllib \ + customize \ +- builder builder/templates \ + get-kernel \ + resize \ + sparsify \ +@@ -169,6 +168,9 @@ SUBDIRS += dib + endif + endif + ++# Tools mixed with more OCAML based tools ++SUBDIRS += builder builder/templates ++ + # Perl tools. + if HAVE_TOOLS + SUBDIRS += tools +-- +2.19.2 + diff --git a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch new file mode 100644 index 000000000000..9bce9b05b051 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch @@ -0,0 +1,45 @@ +From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 7 Dec 2018 12:14:15 +0100 +Subject: [PATCH 4/5] Loosen build time requirement on bash-completion + +Distributions might avoid pulling bash-completion during build as it is +an optional feature and would only make sense at runtime anyway. Since +this setting is well-known across a given distribution, allow them to +provide the value and avoid the dependency. +--- + m4/guestfs_bash_completion.m4 | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4 +index 1f171b79d..9e877f6ab 100644 +--- a/m4/guestfs_bash_completion.m4 ++++ b/m4/guestfs_bash_completion.m4 +@@ -16,14 +16,13 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + dnl Bash completion. +-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ +- bash_completion=yes +- AC_MSG_CHECKING([for bash-completions directory]) +- BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" +- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) +- AC_SUBST([BASH_COMPLETIONS_DIR]) +-],[ +- bash_completion=no +- AC_MSG_WARN([bash-completion not installed]) +-]) +-AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) ++AC_ARG_WITH([bashcompletiondir], ++ AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), ++ [], ++ [AS_IF([$($PKG_CONFIG --exists bash-completion)], [ ++ with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion) ++ ] , [ ++ with_bashcompletiondir=${datadir}/bash-completion/completions ++ ])]) ++AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir]) ++AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"]) +-- +2.19.2 + diff --git a/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch new file mode 100644 index 000000000000..cb608beca08f --- /dev/null +++ b/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch @@ -0,0 +1,40 @@ +From 3b06e1cbb25615495ef108d6ee194bb718e46408 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 7 Dec 2018 11:21:25 +0100 +Subject: [PATCH 1/2] Fix install failure when not built with OCaml support + +Makefile rules in po/ require builder/index-parse.c to be generated to +allow translation utilities to work on it, however builder/ is +completely masked behind OCaml conditional build even if some tools do +not require it and proper guards are in place already. + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502 +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cc363341f..5d96093a1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -164,7 +164,6 @@ SUBDIRS += common/mlvisit + SUBDIRS += common/mlxml + SUBDIRS += common/mltools + SUBDIRS += customize +-SUBDIRS += builder builder/templates + SUBDIRS += get-kernel + SUBDIRS += resize + SUBDIRS += sparsify +@@ -178,6 +177,9 @@ SUBDIRS += dib + endif + endif + ++# Tools mixed with more OCAML based tools ++SUBDIRS += builder builder/templates ++ + # Perl tools. + if HAVE_TOOLS + SUBDIRS += tools +-- +2.19.2 + diff --git a/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch new file mode 100644 index 000000000000..e68a4b0bded4 --- /dev/null +++ b/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch @@ -0,0 +1,45 @@ +From b8a31fcfe81a680ffed1fa0879ac20a3e0e8753a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 7 Dec 2018 12:14:15 +0100 +Subject: [PATCH 2/2] Loosen build time requirement on bash-completion + +Distributions might avoid pulling bash-completion during build as it is +an optional feature and would only make sense at runtime anyway. Since +this setting is well-known across a given distribution, allow them to +provide the value and avoid the dependency. +--- + m4/guestfs-bash-completion.m4 | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/m4/guestfs-bash-completion.m4 b/m4/guestfs-bash-completion.m4 +index 1975b8c03..9a38ab2d6 100644 +--- a/m4/guestfs-bash-completion.m4 ++++ b/m4/guestfs-bash-completion.m4 +@@ -16,14 +16,13 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + dnl Bash completion. +-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ +- bash_completion=yes +- AC_MSG_CHECKING([for bash-completions directory]) +- BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" +- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) +- AC_SUBST([BASH_COMPLETIONS_DIR]) +-],[ +- bash_completion=no +- AC_MSG_WARN([bash-completion not installed]) +-]) +-AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) ++AC_ARG_WITH([bashcompletiondir], ++ AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), ++ [], ++ [AS_IF([$($PKG_CONFIG --exists bash-completion)], [ ++ with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion) ++ ] , [ ++ with_bashcompletiondir=${datadir}/bash-completion/completions ++ ])]) ++AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir]) ++AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"]) +-- +2.19.2 + diff --git a/app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild similarity index 63% rename from app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild rename to app-emulation/libguestfs/libguestfs-1.36.15.ebuild index afc70750da9f..4fda3526f90b 100644 --- a/app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild @@ -1,17 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -WANT_LIBTOOL=latest -WANT_AUTOMAKE=1.14 -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit python-single-r1 autotools versionator linux-info perl-module +inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils -MY_PV_1="$(get_version_component_range 1-2)" -MY_PV_2="$(get_version_component_range 2)" -[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development" +MY_PV_1="$(ver_cut 1-2)" +MY_PV_2="$(ver_cut 2)" +[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" HOMEPAGE="http://libguestfs.org/" @@ -21,14 +19,13 @@ LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" KEYWORDS="~amd64" -IUSE="bash-completion erlang +fuse debug ocaml doc +perl python ruby static-libs -selinux systemtap introspection inspect-icons test lua" +IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # Failures - doc -# Failures - bash-completion, see GBZ #486306 +# FIXME: selinux support is automagic COMMON_DEPEND=" sys-libs/ncurses:0= sys-devel/gettext @@ -40,7 +37,7 @@ COMMON_DEPEND=" >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file - app-emulation/libvirt + libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 @@ -52,7 +49,8 @@ COMMON_DEPEND=" app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] - perl? ( virtual/perl-ExtUtils-MakeMaker + perl? ( + virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper @@ -63,30 +61,41 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} ) fuse? ( sys-fs/fuse:= ) introspection? ( + >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= - dev-libs/gjs ) - selinux? ( sys-libs/libselinux sys-libs/libsemanage ) + selinux? ( + sys-libs/libselinux + sys-libs/libsemanage + ) systemtap? ( dev-util/systemtap ) - ocaml? ( dev-lang/ocaml[ocamlopt] + ocaml? ( + >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext + >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) - inspect-icons? ( media-libs/netpbm + inspect-icons? ( + media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) - >=app-shells/bash-completion-2.0 - dev-libs/yajl + >=dev-libs/yajl-2.0.4 + gtk? ( + sys-apps/dbus + x11-libs/gtk+:3 + ) + net-libs/libtirpc + sys-libs/libxcrypt " - DEPEND="${COMMON_DEPEND} dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) + test? ( introspection? ( dev-libs/gjs ) ) " RDEPEND="${COMMON_DEPEND} app-emulation/libguestfs-appliance @@ -94,6 +103,13 @@ RDEPEND="${COMMON_DEPEND} DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) +PATCHES=( + "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch + "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch + "${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch + "${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch +) + pkg_setup () { CONFIG_CHECK="~KVM ~VIRTIO" [ -n "${CONFIG_CHECK}" ] && check_extra_config; @@ -102,11 +118,9 @@ pkg_setup () { } src_prepare() { - eapply "${FILESDIR}"/${MY_PV_1} - eapply_user - eaclocal - eautomake - eautoconf + default + xdg_environment_reset + eautoreconf } src_configure() { @@ -119,9 +133,8 @@ src_configure() { export vmchannel_test=no econf \ - $(use_enable test werror) \ - --with-libvirt \ - --with-default-backend=libvirt \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + $(use_with libvirt) \ --disable-appliance \ --disable-daemon \ --with-extra="-gentoo" \ @@ -136,23 +149,30 @@ src_configure() { --disable-haskell \ --disable-golang \ $(use_enable introspection gobject) \ + $(use_enable introspection) \ $(use_enable erlang) \ + $(use_enable static-libs static) \ $(use_enable systemtap probes) \ - $(use_enable lua) + $(use_enable lua) \ + --with-gtk=$(usex gtk 3 no) \ + $(usex doc '' PO4A=no) } src_install() { strip-linguas -i po emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" - + find "${ED}" -name '*.la' -delete || die use perl && perl_delete_localpod } pkg_postinst() { - if ! use perl ; then - einfo "Perl based tools NOT build" + if ! use gtk ; then + einfo "virt-p2v NOT installed" fi if ! use ocaml ; then einfo "Ocaml based tools ( sysprep , ... ) NOT installed" fi + if ! use perl ; then + einfo "Perl based tools NOT build" + fi } diff --git a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild similarity index 74% rename from app-emulation/libguestfs/libguestfs-1.36.5.ebuild rename to app-emulation/libguestfs/libguestfs-1.38.6.ebuild index 941ac259350e..7da9fbcf7a2b 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit autotools linux-info perl-module python-single-r1 versionator +inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils -MY_PV_1="$(get_version_component_range 1-2)" -MY_PV_2="$(get_version_component_range 2)" -[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development" +MY_PV_1="$(ver_cut 1-2)" +MY_PV_2="$(ver_cut 2)" +[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" HOMEPAGE="http://libguestfs.org/" @@ -19,13 +19,11 @@ LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" KEYWORDS="~amd64" -IUSE="bash-completion erlang +fuse debug doc +perl python ruby static-libs -selinux systemtap introspection inspect-icons test lua gtk" +IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # Failures - doc -# Failures - bash-completion, see GBZ #486306 # FIXME: selinux support is automagic COMMON_DEPEND=" @@ -39,10 +37,10 @@ COMMON_DEPEND=" >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file - app-emulation/libvirt + libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 - >=app-admin/augeas-1.0.0 + >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= @@ -65,17 +63,13 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= - dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) - >=dev-lang/ocaml-4.02[ocamlopt] - dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext - >=dev-ml/ounit-2 + ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm @@ -84,18 +78,23 @@ COMMON_DEPEND=" virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) - >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) + net-libs/libtirpc + sys-libs/libxcrypt " DEPEND="${COMMON_DEPEND} dev-util/gperf - >=dev-util/gtk-doc-am-1.14 + >=dev-lang/ocaml-4.03[ocamlopt] + dev-ml/findlib[ocamlopt] + dev-ml/ocaml-gettext + >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) + test? ( introspection? ( dev-libs/gjs ) ) " RDEPEND="${COMMON_DEPEND} app-emulation/libguestfs-appliance @@ -103,6 +102,10 @@ RDEPEND="${COMMON_DEPEND} DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) +PATCHES=( + "${FILESDIR}"/${MY_PV_1}/ +) + pkg_setup () { CONFIG_CHECK="~KVM ~VIRTIO" [ -n "${CONFIG_CHECK}" ] && check_extra_config; @@ -111,8 +114,8 @@ pkg_setup () { } src_prepare() { - eapply "${FILESDIR}"/${MY_PV_1} - eapply_user + default + xdg_environment_reset eautoreconf } @@ -126,9 +129,8 @@ src_configure() { export vmchannel_test=no econf \ - $(use_enable test werror) \ - --with-libvirt \ - --with-default-backend=libvirt \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + $(use_with libvirt) \ --disable-appliance \ --disable-daemon \ --with-extra="-gentoo" \ @@ -138,12 +140,14 @@ src_configure() { --without-java \ $(use_enable perl) \ $(use_enable fuse) \ - --enable-ocaml \ + $(use_enable ocaml) \ $(use_enable ruby) \ --disable-haskell \ --disable-golang \ $(use_enable introspection gobject) \ + $(use_enable introspection) \ $(use_enable erlang) \ + $(use_enable static-libs static) \ $(use_enable systemtap probes) \ $(use_enable lua) \ --with-gtk=$(usex gtk 3 no) \ @@ -153,15 +157,18 @@ src_configure() { src_install() { strip-linguas -i po emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" - + find "${ED}" -name '*.la' -delete || die use perl && perl_delete_localpod } pkg_postinst() { + if ! use gtk ; then + einfo "virt-p2v NOT installed" + fi + if ! use ocaml ; then + einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed" + fi if ! use perl ; then einfo "Perl based tools NOT build" fi - if ! gtk ; then - einfo "virt-p2v NOT installed" - fi } diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml index 8a1be2d16af7..5978f915af33 100644 --- a/app-emulation/libguestfs/metadata.xml +++ b/app-emulation/libguestfs/metadata.xml @@ -17,9 +17,10 @@ Libguestfs is a library and tool set for accessing and modifying virtual machine (VM) disk images - Enable image mount support via fuse Build Erlang bindings + Enable image mount support via fuse + Use media-gfx/icoutils for acces icon file in image and inspect it + Use app-emulation/libvirt to manipulate VMs Use dev-util/systemtap to inspect VM via "probes" way - Use media-gfx/icoutilsfor acces icon file in image and inspect it diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest index f30ed5db0084..95d2fab1af84 100644 --- a/app-emulation/virt-what/Manifest +++ b/app-emulation/virt-what/Manifest @@ -1 +1,2 @@ DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613 +DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820 diff --git a/app-emulation/virt-what/virt-what-1.19.ebuild b/app-emulation/virt-what/virt-what-1.19.ebuild new file mode 100644 index 000000000000..bbc7f8023ffc --- /dev/null +++ b/app-emulation/virt-what/virt-what-1.19.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Detects if the current machine is running in a virtual machine" +HOMEPAGE="https://people.redhat.com/~rjones/virt-what/" +SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="dmi" + +DEPEND="dev-lang/perl" +RDEPEND="app-shells/bash + dmi? ( sys-apps/dmidecode )" + +src_prepare() { + default + + # Pretends to be POSIX sh while it is not + sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die +} diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper new file mode 100644 index 000000000000..af8090dd09af --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper @@ -0,0 +1,119 @@ +#!/bin/sh +## @file +# Oracle VM VirtualBox startup script, Linux hosts. +# + +# +# Copyright (C) 2006-2017 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +PATH="/usr/bin:/bin:/usr/sbin:/sbin" +CONFIG="/etc/vbox/vbox.cfg" + +test -r "${CONFIG}" && + . "${CONFIG}" +test -z "${INSTALL_DIR}" && + if test -f /usr/lib/virtualbox/VirtualBox && + test -x /usr/lib/virtualbox/VirtualBox; then + INSTALL_DIR=/usr/lib/virtualbox + else + echo "Could not find VirtualBox installation. Please reinstall." + exit 1 + fi + +# Note: This script must not fail if the module was not successfully installed +# because the user might not want to run a VM but only change VM params! + +if [ "$1" = "shutdown" ]; then + SHUTDOWN="true" +elif ! lsmod|grep -q vboxdrv; then + cat << EOF +WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to + load. Please recompile the kernel module and install it by + + for m in vbox{drv,netadp,netflt}; do modprobe \$m; done + + You will not be able to start VMs until this problem is fixed. +EOF +elif [ ! -c /dev/vboxdrv ]; then + cat << EOF +WARNING: The character device /dev/vboxdrv does not exist. + Please try to reload all the needed kernel modules by: + + for m in vbox{netflt,netadp,drv}; do rmmod \$m; done + for m in vbox{drv,netadp,netflt}; do modprobe \$m; done + + and if that is not successful, try to re-install the package by: + + emerge -1av app-emulation/virtualbox-modules + + You will not be able to start VMs until this problem is fixed. +EOF +fi + +SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'` +if [ -z "$SERVER_PID" ]; then + # Server not running yet/anymore, cleanup socket path. + # See IPC_GetDefaultSocketPath()! + if [ -n "$LOGNAME" ]; then + rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1 + else + rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1 + fi +fi + +if [ "$SHUTDOWN" = "true" ]; then + if [ -n "$SERVER_PID" ]; then + kill -TERM $SERVER_PID + sleep 2 + fi + exit 0 +fi + +APP=`basename $0` +case "$APP" in + VirtualBox|virtualbox) + exec "$INSTALL_DIR/VirtualBox" "$@" + ;; + VirtualBoxVM|virtualboxvm) + exec "$INSTALL_DIR/VirtualBoxVM" "$@" + ;; + VBoxManage|vboxmanage) + exec "$INSTALL_DIR/VBoxManage" "$@" + ;; + VBoxSDL|vboxsdl) + exec "$INSTALL_DIR/VBoxSDL" "$@" + ;; + VBoxVRDP|VBoxHeadless|vboxheadless) + exec "$INSTALL_DIR/VBoxHeadless" "$@" + ;; + VBoxAutostart|vboxautostart) + exec "$INSTALL_DIR/VBoxAutostart" "$@" + ;; + VBoxBalloonCtrl|vboxballoonctrl) + exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@" + ;; + VBoxBugReport|vboxbugreport) + exec "$INSTALL_DIR/VBoxBugReport" "$@" + ;; + VBoxDTrace|vboxdtrace) + exec "$INSTALL_DIR/VBoxDTrace" "$@" + ;; + vboxwebsrv) + exec "$INSTALL_DIR/vboxwebsrv" "$@" + ;; + *) + echo "Unknown application - $APP" + exit 1 + ;; +esac +exit 0 diff --git a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild index 8aa9d0a6b2f5..cd98a4875fd2 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild @@ -262,7 +262,7 @@ src_install() { use debug && binpath="debug" cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile + local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile vbox_inst() { local binary="${1}" @@ -289,7 +289,7 @@ src_install() { # Install the wrapper script exeinto ${vbox_inst_path} - newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox" + newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" fowners root:vboxusers ${vbox_inst_path}/VBox fperms 0750 ${vbox_inst_path}/VBox @@ -302,7 +302,7 @@ src_install() { if use amd64 && ! has_multilib_profile ; then rcfiles="" fi - for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin rdesktop-vrdp ; do vbox_inst ${each} done @@ -312,11 +312,9 @@ src_install() { done # Install EFI Firmware files (bug #320757) - pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die - for fwfile in VBoxEFI{32,64}.fd ; do - vbox_inst ${fwfile} 0644 + for each in VBoxEFI{32,64}.fd ; do + vbox_inst ${each} 0644 done - popd &>/dev/null || die # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) # VBoxXPCOMIPCD (bug #524202) @@ -325,7 +323,7 @@ src_install() { done # Symlink binaries to the shipped wrapper - for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do + for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} done dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl @@ -348,15 +346,18 @@ src_install() { done if use qt5 ; then - vbox_inst VirtualBox - pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox + vbox_inst Virtualbox + vbox_inst VirtualboxVM 4750 + for each in VirtualBox{,VM} ; do + pax-mark -m "${ED%/}"${vbox_inst_path}/${each} + done if use opengl ; then vbox_inst VBoxTestOGL pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL fi - for each in virtualbox VirtualBox ; do + for each in virtualbox{,vm} VirtualBox{,VM} ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} done @@ -364,7 +365,7 @@ src_install() { doins -r nls doins -r UnattendedTemplates - newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop + domenu ${PN}.desktop fi pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz index b3bef0dd6453..bad983d4c404 100644 Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild index 4746a34aa7d3..97bbf3897ad9 100644 --- a/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild +++ b/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit multilib diff --git a/app-eselect/eselect-metasploit/files/msfloader-0.16 b/app-eselect/eselect-metasploit/files/msfloader-0.16 index 231275a9b1f6..6c617165c588 100644 --- a/app-eselect/eselect-metasploit/files/msfloader-0.16 +++ b/app-eselect/eselect-metasploit/files/msfloader-0.16 @@ -20,7 +20,7 @@ if ls -A ~/.msf4/*.gemspec > /dev/zero 2>&1; then rm ~/.msf4/*.gemspec fi -#fetch the latest Gemfile and gemspecsfrom the selected version of msf +#fetch the latest Gemfile and gemspecs from the selected version of msf cp /usr/lib/metasploit/Gemfile ~/.msf4/ if ls -A /usr/lib/metasploit/*.gemspec > /dev/zero 2>&1; then cp /usr/lib/metasploit/*.gemspec ~/.msf4/ diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz index d0c7bb25e764..6cfe88799b55 100644 Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml index 45016f6358c5..e4b22975b67b 100644 --- a/app-laptop/thinkfan/metadata.xml +++ b/app-laptop/thinkfan/metadata.xml @@ -1,7 +1,10 @@ - + + zlogene@gentoo.org + Mikle Kolyada + include libatasmart support to get disc temperature diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz index 8c27d57c947e..44c6d1218dff 100644 Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest index 70b2683ee33a..6d4ee37a2d5a 100644 --- a/app-metrics/blackbox_exporter/Manifest +++ b/app-metrics/blackbox_exporter/Manifest @@ -1 +1,2 @@ DIST blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6 +DIST blackbox_exporter-0.13.0.tar.gz 668255 BLAKE2B 08c772175fa911ced04576c43b03b8594a1e6d30767742cea6630561045dd0440e1cd26847f2e7e506fb4fefc603a9a3e1b4228e46735f8d559a55462c0d11e4 SHA512 49290860e5e1713cc0e1edd93fd193d6e23aebe55a6f62778da89450f5ba79787d4ac3fd6ca3aae37f4941c16976db4570f2d4888534f2ce2c86e25e250b12f1 diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild new file mode 100644 index 000000000000..52be350e039e --- /dev/null +++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit fcaps user golang-build golang-vcs-snapshot + +EGO_PN="github.com/prometheus/blackbox_exporter" +EGIT_COMMIT="v${PV/_rc/-rc.}" +BLACKBOX_EXPORTER_COMMIT="1cfb751" +ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP" +HOMEPAGE="https://github.com/prometheus/blackbox_exporter" +SRC_URI="${ARCHIVE_URI}" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND=">=dev-lang/go-1.11 + dev-util/promu" + +FILECAPS=( + cap_net_raw usr/bin/blackbox_exporter +) + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + default + sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die +} + +src_compile() { + pushd src/${EGO_PN} || die + mkdir -p bin || die + GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin blackbox_exporter/blackbox_exporter + dodoc {README,CONFIGURATION}.md blackbox.yml + insinto /etc/blackbox_exporter + newins example.yml blackbox.yml.example + popd || die + keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter + fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index f90ece51ed26..5ebce43476bc 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild b/app-misc/mosquitto/mosquitto-1.5.3.ebuild index ffc14bbf4dbd..46cf3f99a9ee 100644 --- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild +++ b/app-misc/mosquitto/mosquitto-1.5.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz" LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 arm x86" IUSE="bridge examples +persistence +srv ssl tcpd test websockets" REQUIRED_USE="test? ( bridge )" diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 2b5d85975c7f..28bb7bb61004 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild index 5722f8c59ac6..1f0bc867fb56 100644 --- a/app-portage/eix/eix-0.33.5.ebuild +++ b/app-portage/eix/eix-0.33.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" 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="debug doc nls sqlite" BOTHDEPEND="nls? ( virtual/libintl ) diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index e999610fa1b3..9ae04b838422 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/mksh/mksh-56c.ebuild b/app-shells/mksh/mksh-56c.ebuild index 4d2d0ec03977..cd64d6660fed 100644 --- a/app-shells/mksh/mksh-56c.ebuild +++ b/app-shells/mksh/mksh-56c.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://mirbsd.de/mksh" SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="static" DEPEND="static? ( dev-libs/klibc )" RDEPEND="" diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild index 1c257caebb3e..e4c29c9d2be9 100644 --- a/app-shells/zsh/zsh-5.6.2.ebuild +++ b/app-shells/zsh/zsh-5.6.2.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://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.xz https://www.zsh.org/pub/old/${P}.tar.xz doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index ad0a05c397d4..875dfdd5c8e5 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild index 7271af94503b..640c0c057de4 100644 --- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild +++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc x86" +KEYWORDS="~alpha ~amd64 ppc x86" IUSE="unicode vim-syntax" DEPEND=">=app-dicts/migemo-dict-200812[unicode=] diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest index 5809c06a7b09..45a03b613da5 100644 --- a/app-text/gtranslator/Manifest +++ b/app-text/gtranslator/Manifest @@ -1 +1,2 @@ DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5 +DIST gtranslator-3.30.1.tar.xz 3060168 BLAKE2B e2e238ffc461b99be9df679c431d7cae85c70ca9db7aea4e7c51d9bd12aa417fab0d53d6c512555992dfb2d40f55d6d0dba8c3aacd043ad8c2ebe690de8ac562 SHA512 5f6384bec8bb23afa9aefe5928260b7ccb408d41b8a363d85277435428ca34fe544068526b11801e534911753c95b3049892e647938bee755b37f3f5cbf94f41 diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild index 7e68b60a02a3..3c0c5abed813 100644 --- a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild +++ b/app-text/gtranslator/gtranslator-2.91.7-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 @@ -29,7 +29,7 @@ COMMON_DEPEND=" gnome-base/gsettings-desktop-schemas - gnome-dictionary? ( app-dicts/gnome-dictionary:= ) + gnome-dictionary? ( app-dicts/gnome-dictionary:0/10 ) gucharmap? ( ${PYTHON_DEPS} ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) spell? ( app-text/gtkspell:3= ) @@ -43,8 +43,10 @@ RDEPEND="${COMMON_DEPEND} x11-libs/gtk+:3[introspection] ) " DEPEND="${COMMON_DEPEND} + dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50.1 + dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig " diff --git a/app-text/gtranslator/gtranslator-3.30.1.ebuild b/app-text/gtranslator/gtranslator-3.30.1.ebuild new file mode 100644 index 000000000000..88e7d00a7c7a --- /dev/null +++ b/app-text/gtranslator/gtranslator-3.30.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME Translation Editor" +HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gtk-doc" + +RDEPEND=" + >=dev-libs/glib-2.36.0:2 + >=x11-libs/gtk+-3.22.20:3 + >=app-text/iso-codes-0.35 + gnome-extra/libgda:5= + gnome-base/gsettings-desktop-schemas + >=app-text/gspell-1.2.0:= + >=x11-libs/gtksourceview-4.0.2:4 + >=dev-libs/libxml2-2.4.12:2 +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=dev-util/meson-0.46.0 + gtk-doc? ( dev-util/gtk-doc ) + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml index a6e15044678b..fac790dbf919 100644 --- a/app-text/gtranslator/metadata.xml +++ b/app-text/gtranslator/metadata.xml @@ -9,6 +9,15 @@ Enable plugin for dictionary lookups using app-dicts/gnome-dictionary. Enable plugin for unicode symbols selection using gnome-extra/gucharmap. + + Gtranslator is an enhanced gettext po file editor for the GNOME desktop + environment. + It handles all forms of gettext po files and includes very useful features + like find/replace, translation memory, different translator profiles, + messages table (for having an overview of the translations/messages in the + po file), easy navigation and editing of translation messages and comments + of the translation where accurate. + gtranslator diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index e82c9c07968a..f27735636f48 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,3 +1,2 @@ -DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch deleted file mode 100644 index 6a75ce3fb8c0..000000000000 --- a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- hunspell-1.6.0/src/tools/chmorph.cxx -+++ hunspell-1.6.0/src/tools/chmorph.cxx -@@ -58,11 +58,11 @@ - if (!argv[i]) { - fprintf( - stderr, -- "chmorph - change affixes by morphological analysis and generation\n" -- "correct syntax is:\nchmorph affix_file " -+ "hunspell-chmorph - change affixes by morphological analysis and generation\n" -+ "correct syntax is:\nhunspell-chmorph affix_file " - "dictionary_file file_to_convert STRING1 STRING2\n" - "STRINGS may be arbitrary parts of the morphological descriptions\n" -- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 " -+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 " - " (convert informal Hungarian second person texts to formal third " - "person texts)\n"); - exit(1); ---- hunspell-1.6.0/src/tools/example.cxx -+++ hunspell-1.6.0/src/tools/example.cxx -@@ -53,9 +53,9 @@ - /* first parse the command line options */ - - if (argc < 4) { -- fprintf(stderr, "example (now it works with more dictionary files):\n"); -+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n"); - fprintf(stderr, -- "example affix_file dictionary_file(s) file_of_words_to_check\n"); -+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n"); - exit(1); - } - ---- hunspell-1.6.0/src/tools/Makefile.am -+++ hunspell-1.6.0/src/tools/Makefile.am -@@ -1,4 +1,4 @@ --bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip -+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip - - INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers - -@@ -6,8 +6,8 @@ - hunzip_SOURCES=hunzip.cxx - hunzip_LDADD = ../hunspell/libhunspell-1.6.la - --munch_SOURCES=munch.cxx munch.h --unmunch_SOURCES=unmunch.cxx unmunch.h -+hunspell_munch_SOURCES=munch.cxx munch.h -+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h - - example_SOURCES=example.cxx - example_LDADD = ../hunspell/libhunspell-1.6.la -@@ -16,11 +16,11 @@ - hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \ - ../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@ - --analyze_SOURCES=analyze.cxx --analyze_LDADD = ../hunspell/libhunspell-1.6.la -+hunspell_analyze_SOURCES=analyze.cxx -+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la - --chmorph_SOURCES=chmorph.cxx --chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la -+hunspell_chmorph_SOURCES=chmorph.cxx -+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la - - noinst_PROGRAMS=example - ---- hunspell-1.6.0/src/tools/munch.cxx -+++ hunspell-1.6.0/src/tools/munch.cxx -@@ -81,14 +81,14 @@ - wf = mystrdup(argv[1]); - } else { - fprintf(stderr, "correct syntax is:\n"); -- fprintf(stderr, "munch word_list_file affix_file\n"); -+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n"); - exit(1); - } - if (argv[2]) { - af = mystrdup(argv[2]); - } else { - fprintf(stderr, "correct syntax is:\n"); -- fprintf(stderr, "munch word_list_file affix_file\n"); -+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n"); - exit(1); - } - ---- hunspell-1.6.0/src/tools/unmunch.cxx -+++ hunspell-1.6.0/src/tools/unmunch.cxx -@@ -76,14 +76,14 @@ - wf = mystrdup(argv[1]); - } else { - fprintf(stderr, "correct syntax is:\n"); -- fprintf(stderr, "unmunch dic_file affix_file\n"); -+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n"); - exit(1); - } - if (argv[2]) { - af = mystrdup(argv[2]); - } else { - fprintf(stderr, "correct syntax is:\n"); -- fprintf(stderr, "unmunch dic_file affix_file\n"); -+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n"); - exit(1); - } - ---- hunspell-1.6.0/tests/test.sh -+++ hunspell-1.6.0/tests/test.sh -@@ -74,7 +74,7 @@ - shopt -s expand_aliases - - alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell' --alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze' -+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze' - - if [ "$VALGRIND" != "" ]; then - rm -f $TEMPDIR/test.pid* -@@ -83,7 +83,7 @@ - fi - - alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell' -- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze' -+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze' - fi - - # Tests good words diff --git a/app-text/hunspell/hunspell-1.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild deleted file mode 100644 index 2788a1246fa9..000000000000 --- a/app-text/hunspell/hunspell-1.6.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils multilib autotools flag-o-matic versionator - -MY_P=${PN}-${PV/_beta/b} - -DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/hunspell" - -SLOT="0/$(get_version_component_range 1-2)" -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -IUSE="ncurses nls readline static-libs" -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 ~x64-solaris ~x86-solaris" - -RDEPEND=" - ncurses? ( sys-libs/ncurses:0= ) - readline? ( sys-libs/readline:= )" -DEPEND="${RDEPEND} - sys-devel/gettext" - -LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id -is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk -zu" - -PDEPEND="app-dicts/myspell-en" -for lang in ${LANGS}; do - IUSE+=" l10n_${lang}" - case ${lang} in - de-1901) dict="de_1901" ;; - pt-BR) dict="pt-br" ;; - *) dict="${lang}" ;; - esac - PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )" -done -unset dict lang LANGS - -S=${WORKDIR}/${MY_P} - -DOCS=( - AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell - AUTHORS.myspell README.myspell license.myspell README.md -) - -PATCHES=( - # Upstream package creates some executables which names are too generic - # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'. - # It modifies a Makefile.am file, hence eautoreconf. - "${FILESDIR}/${PN}-1.6.0-renameexes.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # missing somehow, and I am too lazy to fix it properly - [[ ${CHOST} == *-darwin* ]] && append-libs -liconv - - # I wanted to put the include files in /usr/include/hunspell. - # You can do that, libreoffice can find them anywhere, just - # ping me when you do so ; -- scarabeus - econf \ - $(use_enable nls) \ - $(use_with ncurses ui) \ - $(use_with readline readline) \ - $(use_enable static-libs static) -} - -src_install() { - default - - einstalldocs - - prune_libtool_files --all - - #342449 - pushd "${ED}"/usr/$(get_libdir)/ >/dev/null - ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so} - popd >/dev/null -} diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild index 7e697cc05e17..c477f99dfe26 100644 --- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild +++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla" RDEPEND=" diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild index 68d65fbb7543..8a59c0c00a1c 100644 --- a/app-text/unrtf/unrtf-0.21.10.ebuild +++ b/app-text/unrtf/unrtf-0.21.10.ebuild @@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index 1aac9200ccaa..9c97fd3a34fd 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest index f231a4f1c0b0..89e500ea2345 100644 --- a/dev-cpp/gtkmm/Manifest +++ b/dev-cpp/gtkmm/Manifest @@ -1,2 +1,3 @@ DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e DIST gtkmm-3.22.2.tar.xz 12341028 BLAKE2B cac55d0358be4be50ff2d603b245a34af4bab0a046332ac6a7159ea7dece8bce8cd53c532ce499cf3172e8f69455de0378946640ad363e33ddd2a5c38e6843ca SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2 +DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac diff --git a/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild new file mode 100644 index 000000000000..fbaba03f10f9 --- /dev/null +++ b/dev-cpp/gtkmm/gtkmm-3.24.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 multilib-minimal virtualx + +DESCRIPTION="C++ interface for GTK+" +HOMEPAGE="https://www.gtkmm.org" + +LICENSE="LGPL-2.1+" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +IUSE="aqua doc test wayland X" +REQUIRED_USE="|| ( aqua wayland X )" + +RDEPEND=" + >=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}] + >=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}] + >=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}] + >=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}] + >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + dev-libs/libxslt + app-doc/doxygen ) +" +# eautoreconf needs mm-common + +src_prepare() { + if ! use test; then + # don't waste time building tests + sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed 1 failed" + fi + + # don't waste time building examples + sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed 2 failed" + + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" gnome2_src_configure \ + --enable-api-atkmm \ + $(multilib_native_use_enable doc documentation) \ + $(use_enable aqua quartz-backend) \ + $(use_enable wayland wayland-backend) \ + $(use_enable X x11-backend) +} + +multilib_src_test() { + virtx emake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + einstalldocs + + find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null + find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null + dodoc -r demos +} diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index bad2d87bfe3c..dfb65307850c 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/pdfbox/pdfbox-1.8.15.ebuild b/dev-java/pdfbox/pdfbox-1.8.15.ebuild index c4ea10907b66..850c40532bd3 100644 --- a/dev-java/pdfbox/pdfbox-1.8.15.ebuild +++ b/dev-java/pdfbox/pdfbox-1.8.15.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}" LICENSE="Apache-2.0" SLOT="1.8" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" IUSE="test" RESTRICT="test" # Explosive even when manually using unmodified build.xml. diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index cb6dd149f14a..003beb98e3b4 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,3 +1,4 @@ DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9 DIST tomcat-native-1.2.18-src.tar.gz 411789 BLAKE2B 16f1ecff3abfa6bf1f88c44af4a6ba58addac69bec1c257325c429fe6eec6a522fd2ae7932d68afa9bb442b0cf248731ce3e1a9db2b383f502093bf0ea5bfd23 SHA512 66481c1f36dc7ea909bf8d55075a232bf6dea3300b56d36415b13da4aefbee16cb52456f3d44b4a2b09b43cd8c7df628145a0623b9cdfa322bc2432e6c44827f +DIST tomcat-native-1.2.19-src.tar.gz 418183 BLAKE2B cab8621bca4dc41e87ebf6418337da8a86d56a0717aacd62c6e4fb2d039e413cb29e8f169abbd353719ce083d302613d3e0f64cd54f1bc8e57f26a523a828025 SHA512 7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba diff --git a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild new file mode 100644 index 000000000000..bb3b879154d2 --- /dev/null +++ b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Allows Tomcat to use certain native resources for better performance" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" + +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="static-libs test" + +RDEPEND="dev-libs/apr:1= + dev-libs/openssl:0= + >=virtual/jre-1.8" + +DEPEND=">=virtual/jdk-1.8 + test? ( dev-java/ant-junit:0 )" + +S=${WORKDIR}/${P}-src + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +src_configure() { + local myeconfargs=( + --with-apr="${EPREFIX}"/usr/bin/apr-1-config + --with-ssl="${EPREFIX}"/usr + ) + + cd native || die + econf "${myeconfargs[@]}" +} + +src_compile() { + eant jar + + cd native || die + default +} + +src_install() { + java-pkg_newjar "dist/${P}.jar" "${PN}.jar" + + cd native || die + default + + ! use static-libs && find "${D}" -name '*.la' -delete || die +} + +src_test() { + java-pkg-2_src_test +} + +pkg_postinst() { + elog "For more information, please visit" + elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" +} diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 1ab2cef7444e..aa5bb36db56e 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/mono/mono-4.8.0.524.ebuild b/dev-lang/mono/mono-4.8.0.524.ebuild index 2e12a8843385..3381396041ef 100644 --- a/dev-lang/mono/mono-4.8.0.524.ebuild +++ b/dev-lang/mono/mono-4.8.0.524.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 @@ -12,7 +12,7 @@ SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2" LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux" IUSE="nls minimal pax_kernel xen doc" diff --git a/dev-lang/mono/mono-5.14.0.177.ebuild b/dev-lang/mono/mono-5.14.0.177.ebuild index 057c8e099f0a..da0226a8437e 100644 --- a/dev-lang/mono/mono-5.14.0.177.ebuild +++ b/dev-lang/mono/mono-5.14.0.177.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" RESTRICT="mirror" SLOT="0" diff --git a/dev-lang/mono/mono-5.16.0.220.ebuild b/dev-lang/mono/mono-5.16.0.220.ebuild index b14fe5b5f89b..be71a2df69b4 100644 --- a/dev-lang/mono/mono-5.16.0.220.ebuild +++ b/dev-lang/mono/mono-5.16.0.220.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" SLOT="0" diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 85c5b575c987..5bbb1b756bd7 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild index 7dc26bdf904a..fd209d0b9ce0 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86" IUSE="doc +introspection stemmer" RDEPEND=" diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index fc967ef55554..68f4f428e762 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,3 +1 @@ -DIST AppStream-0.12.2.tar.xz 1938868 BLAKE2B 968853e9d5f87ca2c1f894a6ffe5439f7fce611459243cd96d3859a15e225243585a1a43e90d8eca8271b91e1237d94eb4615b5c3c0543d9a37646b5fbd7d2fe SHA512 d5c95309d4fddb961f4a5b9ac460840e34d4bae0e256bd0be09ceeab0d45a3ac5254c9e9c183a1e6cb3983ce0a9d6d0e519908f612a5b135ed578ec26556e53d DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9 -DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256 diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild deleted file mode 100644 index 02eef9f850b9..000000000000 --- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ximion/${PN}" -else - inherit versionator - MY_PV="$(replace_all_version_separators '_')" - MY_P="APPSTREAM_${MY_PV}" - SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" - S="${WORKDIR}/${PN}-${MY_P}" -fi - -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" - -LICENSE="LGPL-2.1+ GPL-2+" -# check APPSTREAM_LIB_API_LEVEL -SLOT="0/4" -IUSE="apt doc qt5 test" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/gobject-introspection - dev-libs/libxml2:2 - dev-libs/libyaml - dev-libs/snowball-stemmer - qt5? ( dev-qt/qtcore:5 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - dev-util/itstool - sys-devel/gettext - test? ( - qt5? ( dev-qt/qttest:5 ) - ) -" - -src_prepare() { - cmake-utils_src_prepare - - if ! use test; then - pushd qt > /dev/null || die - cmake_comment_add_subdirectory tests - popd > /dev/null || die - fi -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DSTEMMING=ON - -DL18N=ON - -DVAPI=OFF - -DMAINTAINER=OFF - -DSANITIZERS=OFF - -DDOCUMENTATION=OFF - -DAPT_SUPPORT=$(usex apt) - -DINSTALL_PREBUILT_DOCS=$(usex doc) - -DQT=$(usex qt5) - ) - - cmake-utils_src_configure -} diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild deleted file mode 100644 index ff514c29496c..000000000000 --- a/dev-libs/appstream/appstream-0.12.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson xdg-utils - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ximion/${PN}" -else - MY_PN="AppStream" - SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem" -HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/" - -LICENSE="LGPL-2.1+ GPL-2+" -# check as_api_level -SLOT="0/4" -IUSE="apt +introspection qt5 test" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libyaml - dev-libs/snowball-stemmer - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - qt5? ( dev-qt/qtcore:5 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.5 - dev-libs/appstream-glib - dev-util/itstool - >=dev-util/meson-0.42.0 - >=sys-devel/gettext-0.19.8 - qt5? ( - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 ) - ) -" - -PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" ) - -src_prepare() { - default - sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die -} - -src_configure() { - xdg_environment_reset - - local emesonargs=( - -Dapidocs=false - -Ddocs=false - -Dmaintainer=false - -Dstemming=true - -Dvapi=false - -Dapt-support=$(usex apt true false) - -Dgir=$(usex introspection true false) - -Dqt=$(usex qt5 true false) - ) - - meson_src_configure -} diff --git a/dev-libs/appstream/appstream-0.12.3.ebuild b/dev-libs/appstream/appstream-0.12.3.ebuild index 689abd87733b..71095f75c025 100644 --- a/dev-libs/appstream/appstream-0.12.3.ebuild +++ b/dev-libs/appstream/appstream-0.12.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then else MY_PN="AppStream" SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" S="${WORKDIR}/${MY_PN}-${PV}" fi diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch deleted file mode 100644 index 3eb8b0db877d..000000000000 --- a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Sat, 20 Oct 2018 20:20:09 +0200 -Subject: [PATCH] Explicitly include string.h in as-tag.c - -This apparently is necessary to fix an FTBFS issue with older GCC -releases. Resolves #207 ---- - src/as-tag.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/as-tag.c b/src/as-tag.c -index 6afba621..91076e69 100644 ---- a/src/as-tag.c -+++ b/src/as-tag.c -@@ -32,6 +32,8 @@ - - #include "as-tag.h" - -+#include -+ - #ifdef __clang__ - #pragma clang diagnostic ignored "-Wmissing-field-initializers" - #endif diff --git a/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild similarity index 55% rename from dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild rename to dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild index f507682f32d4..644a49823e32 100644 --- a/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild +++ b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils multilib +inherit cmake-utils multilib toolchain-funcs DESCRIPTION="Suffix-sorting library (for BWT)" HOMEPAGE="https://github.com/y-256/libdivsufsort" @@ -11,7 +11,15 @@ SRC_URI="https://github.com/y-256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="openmp" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} src_prepare() { cmake-utils_src_prepare @@ -20,3 +28,8 @@ src_prepare() { sed -i -e "s:\(DESTINATION \)lib:\1$(get_libdir):" \ */CMakeLists.txt || die } + +src_configure() { + local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)") + cmake-utils_src_configure +} diff --git a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild index 9dcaf6470b58..d6c33d70a4c5 100644 --- a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild +++ b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 EGIT_REPO_URI="https://github.com/y-256/${PN}" -inherit cmake-utils multilib git-r3 +inherit cmake-utils multilib toolchain-funcs git-r3 DESCRIPTION="Suffix-sorting library (for BWT)" HOMEPAGE="https://github.com/y-256/libdivsufsort" @@ -12,7 +12,15 @@ SRC_URI="" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="openmp" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} src_prepare() { cmake-utils_src_prepare @@ -21,3 +29,8 @@ src_prepare() { sed -i -e "s:\(DESTINATION \)lib:\1$(get_libdir):" \ */CMakeLists.txt || die } + +src_configure() { + local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)") + cmake-utils_src_configure +} diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild index d3021260722f..1e98fcbf3f45 100644 --- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild +++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 MY_P="${PN}-9999" else - KEYWORDS="amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86" + KEYWORDS="amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild index 641a25172807..12dc11e488e4 100644 --- a/dev-libs/re2/re2-0.2018.10.01.ebuild +++ b/dev-libs/re2/re2-0.2018.10.01.ebuild @@ -18,7 +18,7 @@ LICENSE="BSD" # https://abi-laboratory.pro/tracker/timeline/re2/ SONAME="gentoo-2017-03-01" SLOT="0/${SONAME}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="icu" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch new file mode 100644 index 000000000000..f1a847c55699 --- /dev/null +++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch @@ -0,0 +1,770 @@ +--- /dev/null 2018-12-04 16:29:46.857790926 -0500 ++++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg 2018-12-07 14:18:19.183422991 -0500 +@@ -0,0 +1,767 @@ ++$quote " ++$set 1 ++2 notation '{0}' has already been declared ++3 attribute '{0}' has already been declared for element '{1}' ++4 encoding '{0}' from XML declaration or manually set contradicts the auto-sensed encoding; ignoring ++5 element '{0}' is referenced in a content model but was never declared ++6 element '{0}' is referenced in an ATTLIST but was never declared ++7 {0} ++8 unable to include document '{0}' ++9 unable to open text file target '{0}' ++10 unable to include resource '{0}' ++13 '{0}' is not allowed for the content of simpleType; only list, union, and restriction are allowed ++14 globally-defined complex type must have a name ++15 globally-declared attribute must have a name ++16 attribute declaration must have name or 'ref' attribute ++17 element declaration must have name or 'ref' attribute ++18 group declaration must have name or a 'ref' attribute ++19 attributeGroup declaration must have name or 'ref' attribute ++20 anonymous complexType in element '{0}' has name ++21 anonymous simpleType in element '{0}' has name ++22 content of element declaration must match (annotation?, (simpleType | complexType)?, (unique | key | keyref)*) ++23 invalid content in simple type '{0}'; only list, union, and restriction are allowed ++24 expected simpleType in list definition for type '{0}' ++25 list, union, or restriction content is invalid for type '{0}' ++26 invalid content in list definition for type '{0}' ++27 expected simpleType in restriction definition for type '{0}' ++28 facet '{0}' is already defined ++29 expected simpleType in union definition for type '{0}' ++30 content in simpleType definition is empty ++31 expected restriction or extension in simpleContent definition ++32 base attribute must be specified for restriction or extension definition ++33 expected restriction or extension in complexContent definition ++34 invalid content in 'schema' element ++35 invalid content for type '{0}' ++36 unknown simpleType '{0}' ++37 unknown complexType '{0}' ++38 prefix '{0}' can not be resolved to namespace URI ++39 referenced element '{0}' not found ++40 type '{0}:{1}' not found ++41 attribute '{0}' not found ++42 invalid element '{0}' in complex type definition ++43 base type '{0}' not found ++44 unable to create validator for '{0}' ++45 invalid element following simpleContent definition in complexType ++46 invalid element following complexContent definition in complexType ++47 attribute '{0}' cannot have both fixed and default values ++48 attribute '{0}' with default value must be optional ++49 attribute '{0}' declared more than once in the same scope ++50 attribute '{0}' cannot have both 'type' attribute and simpleType definition ++51 simpleType '{0}:{1}' for attribute '{2}' not found ++52 element '{0}' cannot have both fixed and default values ++53 invalid {0} name '{1}' ++54 element '{0}' cannot have both 'type' attribute and simpleType/complexType definition ++55 element '{0}' has fixed or default value and must have mixed simple or simple content model ++56 simpleType '{0}' that '{1}' extends has a value of the final attribute that does not permit extension ++57 type '{0}' specified as the base in simpleContent definition must not have complex content ++58 type '{0}' is a simple type and cannot be used in derivation by restriction in complexType definition ++59 invalid element following restriction or extension definition in simpleContent ++60 invalid element following restriction or extension definition in complexContent ++61 duplicate annotation in type '{0}' ++62 type '{0}' cannot be used in its own union, list, or restriction definition ++63 block value '{0}' is invalid ++64 final value '{0}' is invalid ++65 element '{0}' cannot be part of the substitution group headed by '{1}' ++66 element '{0}' has a type which does not derive from the type of the element at the head of the substitution group ++67 element '{0}' declared more than once in the same scope ++68 value '{0}' invalid for attribute '{1}' ++69 attribute '{0}' has both 'ref' attribute and inline simpleType definition or 'form' or 'type' attribute ++70 duplicate reference attribute '{0}:{1}' in complexType definition ++71 derivation by restriction is forbidden by either base type '{0}' or globally ++72 derivation by extension is forbidden by either base type '{0}' or globally ++73 base type specified in complexContent definition must be a complex type ++74 imported schema '{0}' has different target namespace '{1}'; expected '{2}' ++75 'schemaLocation' attribute must be specified in element '{0}' ++76 included schema '{0}' has different target namespace '{1}' ++77 at most one annotation is allowed ++78 content of attribute '{0}' must match (annotation?, simpleType?) ++79 attribute '{0}' must appear in global {1} declarations ++80 attribute '{0}' must appear in local {1} declarations ++81 attribute '{0}' cannot appear in global {1} declarations ++82 attribute '{0}' cannot appear in local {1} declarations ++83 minOccurs value '{0}' must not be greater than maxOccurs value '{1}' ++84 duplicate annotation in anyAttribute declaration ++85 global {0} declaration must have name ++86 circular definition in '{0}' ++87 global type '{0}:{1}' declared more than once or also declared as {2} ++88 global {0} '{1}' declared more than once ++89 invalid value '{0}' for whiteSpace facet; expected 'collapse' ++90 namespace of import declaration must be different from target namespace of importing schema ++91 importing schema must have target namespace if namespace in import declaration is not present ++92 element '{0}' cannot have value constraint '{1}' if its type is derived from ID ++93 element/attribute '{0}' is of NOTATION type ++94 element '{0}' has mixed content type and the content type's particle must be emptiable ++95 complexType definition has empty content but base type is not empty or does not have emptiable particle ++96 content types of base type '{0}' and derived type '{1}' must both be mixed or element-only ++97 derived content type is not a valid restriction of base content type ++98 derivation by extension or restriction is forbidden by either base type '{0}' or globally ++99 item type definition must have variety of atomic or union where all member types must be atomic ++100 group '{0}' must contain all, choice, or sequence compositor ++101 content of attributeGroup '{0}' must match (annotation?, ((attribute | attributeGroup)*, anyAttribute?)) ++102 top-level compositor in a group must not have 'minOccurs' or 'maxOccurs' attribute ++103 {0} '{1}:{2}' not found ++104 group with the all compositor must only appear as content type of a complex type ++105 group with the all compositor constituting the content type of a complex type must have both minOccurs and maxOccurs equal 1 ++106 element declaration in the all compositor must have minOccurs and maxOccurs equal 0 or 1 ++107 attribute '{0}' is already defined in base ++108 intensional intersection of attribute wildcards must be expressible ++109 base type does not have any attributes ++110 attribute '{0}' has incompatible use value in the base ++111 type of attribute '{0}' must be derived by restriction from type of the corresponding attribute in the base ++112 attribute '{0}' does not have a fixed value or has a different fixed value from that of the base ++113 attribute '{0}' has invalid target namespace with respect to the base wildcard constraint or base has no wildcard ++114 attribute wildcard is present in the derived type but not in the base ++115 attribute wildcard in the derived type is not a valid subset of that in the base ++116 attribute '{0}' cannot have different use value in the derived type if the base attribute use value is 'prohibited' ++117 attribute wildcard in the derived type must be identical to or stricter than the one in the base ++118 unexpected '{0}' in the content of the all compositor; only elements are allowed ++119 redefined schema '{0}' has a different target namespace '{1}' ++120 simpleType in redefine must have a restriction definition ++121 simpleType base attribute in redefine must reference the original type with the same name ++122 complexType in redefine must have a restriction or extension definition ++123 complexType base attribute in redefine must reference the original type with the same name ++124 group '{0}' must have minOccurs and maxOccurs equal 1 ++125 unable to find declaration in the schema being redefined corresponding to '{0}' ++126 group declaration in redefine may only contain one reference to itself ++127 attributeGroup declaration in redefine may only contain one reference to itself ++128 redefine declaration cannot contain '{0}' ++129 notation declaration '{0}:{1}' not found ++130 more than one identity constraint has name '{0}' ++131 identity constraint declaration must match (annotation?, selector, field+) ++132 key reference declaration '{0}' refers to unknown key '{1}' ++133 field cardinalities for keyref '{0}' and key '{1}' must match ++134 XPath expression is missing or empty ++135 fixed value in attribute reference is not set or differs from the fixed value of '{0}' ++136 attribute '{0}' is of ID type or type derived from ID and cannot have default/fixed value constraint ++137 attribute '{0}' is a subsequent attribute in this complex type with a type derived from ID ++138 attribute '{0}' is a subsequent attribute in this attribute group with a type derived from ID ++139 empty value illegal for 'targetNamespace' attribute; target namespace must be absent or contain non-empty value ++140 {0} ++141 '{0}' has already been included or redefined ++142 namespace '{0}' is referenced without import declaration ++143 all compositor that is part of a complex type definition must constitute the entire content of the definition ++144 annotation can only contain appinfo and documentation declarations ++145 invalid facet name '{0}' ++146 root element name of XML Schema document must be 'schema' ++147 circular substitution group in element '{0}' ++148 element '{0}' must be from the XML Schema namespace ++149 target namespace of attribute '{0}' cannot be http://www.w3.org/2001/XMLSchema-instance ++150 invalid namespace declaration ++151 namespace fix-up cannot be performed on DOM Level 1 node ++152 more than one anyAttribute declaration found in complex type declaration ++153 anyAttribute must not be followed by other declarations ++156 parser has encountered more than '{0}' entity expansions in the document; this is the limit imposed by the application ++157 expected comment or CDATA section ++158 attribute name expected ++159 notation name expected ++160 illegal repetition of elements in mixed content model ++161 default attribute declaration expected ++162 equal sign expected ++163 element name expected ++164 comment must start with