diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild index 5fae6b632252..1cf84d96521a 100644 --- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild +++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="ssl" RESTRICT="test" diff --git a/app-admin/apache-tools/apache-tools-2.4.27.ebuild b/app-admin/apache-tools/apache-tools-2.4.27.ebuild index f339aa29bab5..d1a471c0e14a 100644 --- a/app-admin/apache-tools/apache-tools-2.4.27.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.27.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" IUSE="libressl ssl" RESTRICT="test" diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild b/app-admin/collectd/collectd-5.6.2-r4.ebuild index 598b6d4c9ea1..58308c78b1dd 100644 --- a/app-admin/collectd/collectd-5.6.2-r4.ebuild +++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild @@ -87,7 +87,7 @@ COMMON_DEPEND=" collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) - collectd_plugins_gps? ( sci-geosciences/gpsd ) + collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) diff --git a/app-admin/collectd/collectd-5.7.1.ebuild b/app-admin/collectd/collectd-5.7.1.ebuild index 28d98616e030..89191111c74e 100644 --- a/app-admin/collectd/collectd-5.7.1.ebuild +++ b/app-admin/collectd/collectd-5.7.1.ebuild @@ -90,7 +90,7 @@ COMMON_DEPEND=" collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) - collectd_plugins_gps? ( sci-geosciences/gpsd ) + collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) diff --git a/app-admin/collectd/collectd-5.7.2.ebuild b/app-admin/collectd/collectd-5.7.2.ebuild index 95c6b9e022a7..f062bc9c363a 100644 --- a/app-admin/collectd/collectd-5.7.2.ebuild +++ b/app-admin/collectd/collectd-5.7.2.ebuild @@ -90,7 +90,7 @@ COMMON_DEPEND=" collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) - collectd_plugins_gps? ( sci-geosciences/gpsd ) + collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) diff --git a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild index 6c2a245ff188..409382855e3c 100644 --- a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild +++ b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc" CDEPEND="bzip2? ( app-arch/bzip2 ) diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild index 77d252956f9e..152094031176 100644 --- a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild +++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild @@ -14,7 +14,7 @@ SLOT="0" IUSE="gtk +introspection vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm64 ~ia64 x86" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc64 x86" RDEPEND=" >=app-arch/libarchive-3.2.0 diff --git a/app-backup/dar/dar-2.5.11.ebuild b/app-backup/dar/dar-2.5.11.ebuild index ba822cd261d2..8816e9f258ba 100644 --- a/app-backup/dar/dar-2.5.11.ebuild +++ b/app-backup/dar/dar-2.5.11.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux" IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr" RESTRICT="test" # need to be run as root diff --git a/app-crypt/gnupg/gnupg-2.2.0.ebuild b/app-crypt/gnupg/gnupg-2.2.0.ebuild index bda0de24a3b8..ba5fbde5fcc9 100644 --- a/app-crypt/gnupg/gnupg-2.2.0.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" COMMON_DEPEND_LIBS=" diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index dfd1adceeab6..6d548429ccbd 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -7,7 +7,6 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884 DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5 DIST emacs-24.5-patches-4.tar.xz 13632 SHA256 3b2d7c2034711d114494745780b6521150aa0c524966cbaceeb8d4d053dcbdd3 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 WHIRLPOOL 1855ac4178faafcc2d86141e023ff2626246c87e7ff2e7bfbaf9a989e9a48d2767acb9f7af99924cd7db04d34913a42764490831b7b45a34bcd131999180ff28 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3 -DIST emacs-25.1.tar.xz 42498944 SHA256 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33 SHA512 67442b9027869c44430e1d4c3e92e74601e667c9aef7e3da16f20a562b5e3fa8c64efdd4b4055919550523093d32eac73c094b644f6573fed41b4e0938668922 WHIRLPOOL 77cf4e126580634ec5aa2d2252a5d3334b6880a2abc32c54543b8df1a7dc9687bf41c54994044be7517b397bcfc2fc1094286ff4c05a7d6f64a8ef8376a4abfb DIST emacs-25.2-patches-1.tar.xz 2104 SHA256 ea0ba1cf1fb06eb76907cc034acb440af1147bdc0fa849ba8185d016fe58e4ff SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a WHIRLPOOL 97c49266b7be18f028ae939dbdcfd3933637770506f108fcd9d08fa33c63f376fbb6fe520e42ec28adb6d4527c298173bffe596af774748946a3d8a130aa90f7 DIST emacs-25.2.tar.xz 46900336 SHA256 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c WHIRLPOOL 98de8ad164cf65b21e5fbfdbd7fcee84da32e3de66715d2f03f3c4d03cfa68d49aff2124e5da331282bb5fd9c2b2fbac4ddfd0985e907d2354994c783dddd83f DIST emacs-25.3.tar.xz 42854740 SHA256 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f WHIRLPOOL 603ec6b203523a22556e48616b4a5ab227c32d3653ac4b713e6cb0357e3556964bc92a1818b417bbf9037cca7dac55935da9458dc3d29b3bb24d66157e74c8df diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild index 577a5505c14f..20e96bc4b628 100644 --- a/app-editors/emacs/emacs-23.4-r16.ebuild +++ b/app-editors/emacs/emacs-23.4-r16.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="23" -KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" REQUIRED_USE="?? ( aqua X )" diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild index 39455cc06306..13146cb0888c 100644 --- a/app-editors/emacs/emacs-24.5-r4.ebuild +++ b/app-editors/emacs/emacs-24.5-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" -KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" diff --git a/app-editors/emacs/emacs-25.1.ebuild b/app-editors/emacs/emacs-25.1.ebuild deleted file mode 100644 index af48de4087cb..000000000000 --- a/app-editors/emacs/emacs-25.1.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit elisp-common flag-o-matic multilib readme.gentoo-r1 - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.xz" - -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="25" -KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" -REQUIRED_USE="?? ( aqua X )" - -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] - net-libs/liblockfile - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - gpm? ( sys-libs/gpm ) - hesiod? ( net-dns/hesiod ) - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - kerberos? ( virtual/krb5 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - ssl? ( net-libs/gnutls:0= ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - cairo? ( >=x11-libs/cairo-1.12.18 ) - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( - xwidgets? ( - x11-libs/gtk+:3 - net-libs/webkit-gtk:3= - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - gzip-el? ( app-arch/gzip ) - pax_kernel? ( sys-apps/attr )" - -RDEPEND="${RDEPEND} - !. - If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid or the - Motif toolkit instead. - EOF - if use xwidgets; then - myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" - else - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - myconf+=" --without-xwidgets" - fi - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - elif use aqua; then - einfo "Configuring to build with Nextstep (Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --without-x --without-ns" - fi - - # Save version information in the Emacs binary. It will be available - # in variable "system-configuration-options". - myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser=":gamestat" \ - --without-compress-install \ - --with-file-notification=$(usev inotify || usev gfile || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with gpm) \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake -} - -src_install () { - emake DESTDIR="${D}" NO_BIN_LINK=t install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{appdata,applications,icons} - rm -rf "${ED}"/var - - # remove unused /site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS CONTRIBUTE - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - fi - - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs - through the Emacs eselect module, which also redirects man and info - pages. Therefore, several Emacs versions can be installed at the - same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is - strongly recommended that you use app-admin/emacs-updater to rebuild - all byte-compiled elisp files of the installed Emacs packages." - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild index a7cb28d504bc..69bb218fd30b 100644 --- a/app-editors/emacs/emacs-25.3.ebuild +++ b/app-editors/emacs/emacs-25.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" -KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" diff --git a/app-emulation/libvirt/libvirt-3.6.0.ebuild b/app-emulation/libvirt/libvirt-3.6.0.ebuild index 136bd8740f09..8bac314f5706 100644 --- a/app-emulation/libvirt/libvirt-3.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-3.6.0.ebuild @@ -18,7 +18,7 @@ else else SRC_URI="http://libvirt.org/sources/${P}.tar.xz" fi - KEYWORDS="amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" SLOT="0/${PV}" fi diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index dfb6633c8a09..633257973bd4 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,31 +1,33 @@ DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz 15087 SHA256 727e3b7d4ed0df94b96c99ca69c3505303d4f93173c31b5afce20e6813d6a270 SHA512 7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3 WHIRLPOOL 857821556293492db1bd1cfbaf6c376846a94e6a13d0c021051827e4be0defdafe4b0c81f4823620b619d04a9fdea077341376d9f4665964475ecd092aa9b343 +DIST github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz 15127 SHA256 9fd221710230927063fe8380d9986d4225e9f69a8dd049c678020f7c75ce9dea SHA512 0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d WHIRLPOOL d7a223573dc16d445e1f197b576a18f0682d2c3bffb07f34b4c8ef764070c2d234c3bb2935109c05ea975fb0d719a44c1653f14a5234c791f67d8c6748897c41 DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 SHA256 f80d8b1dd92d7f2ea4b48d2e4b20d726156d0920e90ae0d6e8ac540a0d156ba3 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee WHIRLPOOL e2a011888949ecdf0ecbce662ea30de731ce7393142d06b9a0116ebdbf46771dde7be89067785663ed93cc45bdc861122112cf8c3b8f6fa27018c0a100066b0a DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 SHA256 297ad610c697f409ae1fa434f09da1ba6acdf3bbfcdbe8079dc4b6a6668c12f0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729 WHIRLPOOL d3341fccb03237d8352c305ca1067449c0e00cc59297f9b14c98f38f2f6d463820469e6f13641dd5341ccc3d07a731b7436ed1a8eb3666e37a79e6447d336c1c DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 SHA256 2c03218436fdcebe9e9fd970055155a543ae06eb5a2c631911e2bc358fe52c58 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52 WHIRLPOOL 9829d90b0be2ab4b522ac6b95295627877229ba6db1055b9c33ddf404a2d02922837056096ac3a287353edbcddb14966ddb89f160e95c2aff46bc0e758419329 DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 SHA256 2379edcc225238167aa0d45cb28d3561c5193979b136a6cf3443a1fe3b85c78a SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d WHIRLPOOL fc39214f5e5d7063069f7173bfea57483d3a8f46c586c704d93a9af1ebb534493de343a9f2dbbd51eb22de118db2f0e3e9838ee4df2c414d2921545f2ed3ed7f DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 SHA256 11a6ce686bb70ab92020f2dffadc2e024e267a6564a62b0091e2974474c7f88d SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b WHIRLPOOL b2d18dc7354fa6e4819c2b1437e3dce55212fbf6e907361b82bfefc0b2306f12cbf70560c3819e2a81426e538949f05be01c6b8b3f3e53a3aa6daf828e95d537 DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 SHA256 2f35fb36301bdee6afa5d7ec41c8870bca370ee8300b4da157ee3336812b5c36 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 WHIRLPOOL 27c9123a8be869dbe6a15d1e69e39d511f44624fffd89aac37bf0e59c5d30f2b7932c6015fa055f3ffed9357873a2fb92c1f6522793a64b752722cd539bc2089 +DIST github.com-golang-crypto-7d9177d70076375b9a59c8fde23d52d9c4a7ecd5.tar.gz 1432665 SHA256 238c9ed9693ada60d89b1aea20007dcc1d29754ea25b537e3b9de6188151270d SHA512 d107abb176bf37a0a5a2487cb00b5d12e2247d41524a0651860c0a0b41b2b80926af024b78cc12aacafe254a1b8245980ab219a8357c8c2e17e9245f9027e570 WHIRLPOOL d448afb23308a8f7ea42b8bdec8ae182a7bff335800f91cd3c8e7398de87b4a30c71ac6083d8dee548a64db35f8158649420cc562a94ac9e4871e81dade404e4 DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 SHA256 0dc71491c29f8a217fadbced9ed7d9216f361b6d0fb09dfd030e6fe116e83be0 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02 WHIRLPOOL 3289466f54fb998d4ecc7b757a24e4f7aef88b29e16df75a0e47b5dcb84594462508161d06589a13099df72afa12b90b701efa412cbb352cb21f282b20c6361c -DIST github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz 1431191 SHA256 9a7d565a11c3bb0aa78156c3ab6c6d55c2c8ff9e0d7733574b7f2e67fef03ebf SHA512 6cae1da26b6d46c4f080f74b574f5b7d7e1e86eeb83532e19f42e6e098e9f6d0b113cd07e66f43806ace738583262e37cbb7dc229f8d61ad16a5f86372eb539a WHIRLPOOL b2a1b6d19ee5d72e4b38b403bc3142385d543c713fb4729333e1614b114fb81789a4c94974811f67e3c61c0f03aa8f3fc91e61558d85eb507a7812d43052b7e8 DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 SHA256 28950420102f0dc290b84a52f06bc5b12a0a2b411b1b4fe216ba4ffe3ec3754e SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914 WHIRLPOOL c85d338f87f5c418009497308ba28bd805769cb5350835dca35f77cce7ce456afe9cbcd66d9db3aea77e3eab0ed228260f7ec2e6825632624d9c80556ed15fbf -DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 SHA256 37d0bf101e8fc7e1dd8f1aa83ef106befe02fef11dc6a12ea1f7cebdf1a160e1 SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c WHIRLPOOL d344671f614f0d43a313d1409ba20cad711bf8d3be7b0c52e6d2a7db0a3efbd17369cea70136a095522122a3cbaada7de4d79e2f7ad784b9e7fd8e46d54ec443 +DIST github.com-golang-net-0744d001aa8470aaa53df28d32e5ceeb8af9bd70.tar.gz 920361 SHA256 03f6f00d1142924dfee5abd67e6a39801a1da5c9f372a122aaaaf3c65de58a39 SHA512 d308b4f872612287c29b815b6ac0c4c3efbda4c641940ed8553851b1e93c6654bf443367b5ec96166d68fc2759d7e90e46fd6f148f0a6d535bf057bb785627d7 WHIRLPOOL 3d058a51d06992f8c07640f2ff6e69c5a0c468251420857b26da30fb6dc9b15f169321a7a4a29849aa6f346122339a0758875d6afd31d8d85a0cf3be8bb481f2 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 SHA256 5140f8089da711f07bcdffd50b262cc9a6d53dc4c2ebeffd5bd6ef04d103775b SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 WHIRLPOOL b48dd92edf0ce8cb27b57132a888b0f7ac2b7b844f62aebe072e5fa3beb9921a409c547c6fd2701f1f4ba68a580e8c5988d915cc8cbeaee62356399d3848f2f6 DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 SHA256 a92f1314f40ff6e542ac6e6ea1346cefcfc74e5e5de4939a1baa67c4f86a482b SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052 WHIRLPOOL bdd305498d35c9ef3f1eb34878976e165117ec1c9d1eca8a28cb06a4616d54733e4e2504143990d0e74c6901bd5d6f717e2a0132fd0c4f74fdc305c7d983256d +DIST github.com-golang-protobuf-130e6b02ab059e7b717a096f397c5b60111cae74.tar.gz 268449 SHA256 b9d3381955d095b8c4b26d0464f87e3b32f65fee51c2f791338bcdfea21a1ad8 SHA512 3caefc21de9d57ee484e32d831997efe1e086af652fbbff210c2097db03f933be78446ceea9d004200939b6d48737d716fae0674e1e142179e8ccd1827f3a228 WHIRLPOOL 0155a8e9cd779b1d636edad7b95bd8064b179aaa4139d722e1e423eece8be5cc462a9feed4bc1134b1530d2b04b336cd363c5b5cdc24c8caac707d3c20e06bda DIST github.com-golang-protobuf-17ce1425424ab154092bbb43af630bd647f3bb0d.tar.gz 266836 SHA256 3f82e7552c325c68b728c17f5b7ebfed200ca376c39353abc2f896756e2291dd SHA512 e6f093a5a8231e8e51daa2c5adf1db8da9dbeddc42fb6d05cd1f0cc03e2f3c1a65647b5463f3d71d94361d8a31163ee4fcc32e57a3e2df9e0a557c06469d88a8 WHIRLPOOL a08ee48e3e9c18aa420d4f15aaa7a1b957e1be12b3db14805904a1e55eb832db4eca830c07ce39f9915a455b4269c63ef4c8cea2f3fd8d84f45dba3c05d4bc66 DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 SHA256 0f5d73fa192983fd67d0aa6b9f6e0c5fa64a966bfda42f7f4ffbd83163adf02b SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7 WHIRLPOOL 87685c46c8813b8d4882aadb0b37437782f509efd8e59068f524cd100e11693bce0939087b923acd5214a14edcf76cf0ad71636ff634989d6c9dd5b02667ecfa -DIST github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz 265243 SHA256 25454663aa8e0cf17f0bf273ce0e07703b75aadff9268707228fc76581b7d91e SHA512 25618656838aa0b20f5a4da59fa126d339fe8825a8cdea46ecbd05831751c3fbb86e496fc0930a38faf18760ebece510b505a2aae9b29ab659a081a02005099b WHIRLPOOL e61468e817d5ee34326ce795dd841922a00edc1ba5eb502a59fe095e100eee6273531823474f87b744a36007871a720d4312df921a1ccb9f30fedf986768c4cf DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 SHA256 25b869d922114e49906f2d9559c86b23b54f753986e58546d4ad816f426a9ad2 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61 WHIRLPOOL 91c3b07b66c56b0bce5f430f5e0573d30f57ebf83204cfcbadea5a88607f843c8176eadc2ebdae6020b4bc1144b9ae45ba03fb00c12070faa7505e4726f6b2e1 +DIST github.com-golang-sys-429f518978ab01db8bb6f44b66785088e7fba58b.tar.gz 769610 SHA256 62f47292c34506c5208b8fddab5e6c61ce65a557f5a2b167ba5953eb981fac15 SHA512 d3713f07cabdd7d25516a25ef4428de9bb5384970c28706887a952bc73fa7f99e6cb2b3a057195670b29fe447dffb3796e23e4863d5e28778609a799dffc1347 WHIRLPOOL 4e27190805038fa0ba24a1b01c194d239bdebde7036a48985cb0905705e042558c5067175df96b7852df1de8ebe89c4ea1e0645d0b0bd8b33aaeedc7156c4f2d DIST github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz 766292 SHA256 cb5b32b2d95a724f52104bcf9b9c2afa85b5d3eba0e31ec6cedb7381c90d26a2 SHA512 8d35c2b54cebae7f0f21916dd72be6132c22402829830f7b34805338f81e96da61977b346b72aadecec72c5eb1560998c7523fe0e6828813d635e06cf230934d WHIRLPOOL 8e2213c8dcb39d943ad77e7667d58afa26f550b7208103968a227b4e99d05f9a3e5767fa0c4f4b9198e6e113479505a32bc8d01eba67e06cf5e3b35e9edb1939 -DIST github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz 756878 SHA256 71c6138054b6ab517392e4f943183a12acf51c1abd9d4d1927563ffbdbf60812 SHA512 b1caae99c1575e588801e63775da86133f3f4f8380eddb148b9d38b34b21a20e1ad2e050c7a19bc7e1c77f5b450cafe67c06682d4cd4e7f7905f050f9f3cbabd WHIRLPOOL eadb6c57c7f82a684499d691874ae2e3bee7cbbef1a58f3cffdcee3f63fe5a7b0038ec12546283bfda575cdf99dc615be18bf4bdf4641800ed1dccfec8d3a044 +DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 SHA256 4a125a94d8cf95b12783cc29b13fbb821d9e06a5fce2122b1920e81d4ca63bda SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45 WHIRLPOOL f2f3c0498056de625a0e3d33e6cee84723b2934ae788512ef43e119be22bfc437fa590eea2ea3dbb5d14bdb3769adad59910c320f900d8763a8a1cf5b4078f41 DIST github.com-golang-text-bd91bbf73e9a4a801adbfb97133c992678533126.tar.gz 4610285 SHA256 650d045a890228f43211a2df5bc254d9cc80723bcc6ecf61fb9df2e81c75d35b SHA512 a57f839fef4b7fe086b4238c38396d3ead49be20674899cfef8d723028e9dbd7ccc8fe8b76a84d53137b7cea26aaa594e68b9cd7b0a2816fae71f5c3ad15ec13 WHIRLPOOL fe6bcbfb389a8041f28fefec9b65c71fba8c6025a71a82ed8325664b8870da5ca6e4a021c6d144a36d08775925ee77575096d4a7c50dd407b4b2d85fa0c392df DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 SHA256 5bdfdcc6c259710ca398c1b6da7967d18dcdb8c6aaa56501da3f0333767d38ce SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b WHIRLPOOL 870f029b29ed47881a1fbc71f4e903c43c215a56b0ce635956be6ef13fa4f379a793cfbd2dd9b70b031425245d5b3afbc84bb789fee7a2502575c472c0f3e0ba -DIST github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz 4604834 SHA256 17b5549b3463ad5f4adb10036294a521601de2c9d5e7bca946fef909b859c2a6 SHA512 26dd6fcf2c9e589f1fcdeef0197c0db12ddb2b3f526c1992b76954fde826aa01f86bf485ffefc312d9cfedd793d185475bb5d84c951e02e8df7586f0c6269749 WHIRLPOOL 9412e8790334e7558c3083f487aa257a38295ed325c183bfaca0b4d09c081353e368732d336808c32cdae9c0f183e4bfc8d90bdaa71aaeeb6c1c66b029c4ce10 DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 SHA256 33d0524e2173a3d1292ad2a280230c39bd3b4def2eccad5d4a058b5cb29a4c12 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70 WHIRLPOOL 7ef8bd2853654c99a9b38d3ea14418ea28834824392a67cc93513682ce260b15d970343773982e31e2b65029c19ffb6f562cf46f4b69b4a3e41acfdd525fc79d DIST github.com-golang-tools-3b1faeda9afbcba128c2d794b38ffe7982141139.tar.gz 2246286 SHA256 a9437023d0c7cc757cec3ab76abea815e424174698d3bfd1160ba3c82a6729a1 SHA512 d36353fcfb96947a5f50b768e19bba6a075d71e0bec2bb3103869ba33e023de9a0163b127ae303c9e4ed8b3226c831d63a6eb8cdbfdb4b7d17bbd9e86616497c WHIRLPOOL d2636f80821f770e43565470b2af306bf237fa55d8a2d0c25c97ca5341499ee7f2e7245bcf799209d5eb72f12e9b8d7d2249305a2145de940c0fecc6aabf4854 -DIST github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz 2244664 SHA256 26436026e569cc2f9ef07c11eab48ecfba2a11966fc5ddf2e534be29235031b1 SHA512 df4621cda50f01542eb4cb106bff05680137f21b91b5524348a72aec0682e547724183e698621e573e34622c45031f54a071181941be168aabe96dc52d6931a5 WHIRLPOOL f407a1280e81e88a12869fe22a1e31c61e4076cfe872b8a864d810251653bba6d46dae60a993168bb5d2f9eb8abbbcda86edeb71ce4d082ee58b4c5c40446457 +DIST github.com-golang-tools-e531a2a1c15f94033f6fa87666caeb19a688175f.tar.gz 2246266 SHA256 0f0d14775ca548663ec4dacbed4bf5c95529289717b4d6576ff2b78d1177f534 SHA512 5cfaa76a4d5a8fb35c7c39dc2a9f323e1d5a61fe21819eaf89dffc5f033f4d18c0a65255bcd8b35699f6a39bfc7411dcb7a42af9a043dc5a72d81d36f69f8f58 WHIRLPOOL 217d3cb9b12733c55dc497a5c17a48e5f0c4d50dba1ec59ac919a7ade0a47077caf0eca30df42db30dfde4090c5385e1f67915a741a9f00711127614ce33a5f9 DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 SHA256 f3fced6606c5e662aaef9d4cd71017438040af3ea419b3ac44dacf7c17dff91a SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e WHIRLPOOL e4bca82d6c672290c5aa0683de5d81c787fcdfaf09bc2dd2ffd67f5e17c6cbbe829bb58b8e01861b692518550d4e8de359b7fcea175719e020e5ed31774806a4 -DIST github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz 29594 SHA256 8e3af8f0a839ae14d9267660758128cccd5b6ab16595de786961b297d5ee1ac7 SHA512 442e6249d273440eb5f31ca14b1ce4f702ca363ce385f34ed58189f96aac6a8f5314318cbbb61ff5376f1c6b660a81cd3f53948d79c081eb0c0d9e47657fb447 WHIRLPOOL 6af297833cece2d375da506b7b67b13761c12901da28c5ee63021fae50c4c55b72bd0d0ba70d265fbe2b8b747c7bff044a7bc57b7ec1ab990e5d373bd291465e +DIST github.com-gorilla-mux-3f19343c7d9ce75569b952758bd236af94956061.tar.gz 30094 SHA256 db47181f2a79693d6441bf480ec4cc41f392b78681feadac5f68c6b61a728f73 SHA512 51d40186c3f216e27c487ea856d03047c89a21ed71819aaa8be366aa116e4227bd9db24293b7564ad5bd01799f275cf2d00f66cac9bf4162e9661c6ee91609d9 WHIRLPOOL 42dca254f258441c841bd681f1f60c1fb583ef787f26f5492dad83357cde4f63b9ba5b9d7b8e468a8cb31924a2e71d18376ecc8b15231c356461780f3a592a9b DIST github.com-gorilla-mux-bb285ea687c5c77bb6935fdb2402b121d8efcbec.tar.gz 30027 SHA256 ad86919422a108831e20551b67083c1c6c81d7fa2624779690c66bb5db2d6b3d SHA512 2aa87c84198dddd5e45dedda48ae6c885a9fc6e233d51ac275781a04a3ae6556d85b4c3255eb1e16e4ac7074eb4cedfd2a04d16ec785c5be24bf2548e1f379e7 WHIRLPOOL d5955dd449f5b314e0b203d1a4c4a3d164441506d6b54054fa35dc215d31392308378e84308b5ffc7dd91e1d58266d949a44acfb38c1c2f358b17d5f7c6fc89b +DIST github.com-gorilla-websocket-6f34763140ed8887aed6a044912009832b4733d7.tar.gz 42985 SHA256 456deca23b1bfa09f13bc2a57573ddc521552c4a5e7e677c4ff87c3aa206ade4 SHA512 aee494082f7d32a9c1d49c9975a8aaf9881ab57a917fc810f759ba79f038fadab564d2f6016a2f23a3f21798250a4b9a79cbeda600376eebdde2425d10bb77a3 WHIRLPOOL bf2a3343291e1bef424930638b717d47c5bd4d30addfb2f7d05e2f6cbb55277b42f84141c286c7f1dfe40b21b2dc776c58802f3a465c05355dd6933b1e41a4ec DIST github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz 42996 SHA256 b90c0b4117f2267a737b8573abbe139b706a6aa92257b346f6dd185d3135bde4 SHA512 95a107e3e8626bc17407b8ae14d8cf14b22be616a35e3a287aa9992bd952d0fd3e09668d8bd8e4af66bc7213dc2d1f0063c0c7edf7222a0e11423aba3a201d62 WHIRLPOOL 6a36def6799bcb77dab98c7a16818ab8db8c0c605c5fe9802c4026fa23cd7a761be55894c933e7683648af7177f9318b295d1b95c4510b0155a852c8356d9986 DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 SHA256 56858a67bb8b462f496e9b9795436824036ae17cc3a540284a4183a4c9ca3dcb SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c WHIRLPOOL 5f1181de9500b03fde03f6ff8406a65987e60eb7018bd76defa3065c85e6b1d79f674024aeb000d0cb5a0bada96b6d757a82edce203bb8ff0d1c79a176868783 DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 SHA256 23e121b4ea15818e26d840cba571fb1c165b785271b07f44d3b575e17070fc1a SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198 WHIRLPOOL 0e3c101756336766d38a5a8d80349b55378456f6241ee53a873edf5a23e44f557dc1125c12892aef6a5fa70797da47f1ab72b0f5acb4502c10aa2be8d6c1aaf4 @@ -33,7 +35,7 @@ DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.t DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 SHA256 6a46bc8a692a1153b12a889b357683aa2aa2254d162ddb1c38253d7988cf1030 SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1 WHIRLPOOL c6f230afc0467fb6d76a2da9867e8437833471a7c36073d74834a5af399e8e6cfef0bd40bc5ae9cce4fad15c8b1d03b03110ee20c86ca4c281b5204f9e28e0fd DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 SHA256 c67846e5532a92d3ee629bc67eed7a12bfefe0b837182daef51ebb9774697d25 SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8 WHIRLPOOL 59be6ddb176a25cdbd0a48ed829259c49911e76c63f9f1f3a4027a0f4e0ed7c7ae39b7b3a99cc49fec99fcec6b4941ab066da9795eeee41a168c63f7e8425786 DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 SHA256 eafa160a17919edabe61aed53ea7c129499ad9ee169134da8532b89c920d01d0 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a WHIRLPOOL 76989d50938b01ecad8f0fee239a3e5bd4a829e8fa78a4f9b6d9e0711ebef5fef7d8786e28cfc03477017a4b5b2b5e4659c05f98d7239a4d5251878004d010ff -DIST github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz 36338 SHA256 818389b46709ad9c248157d421219d2d04cc009ce43df6f173019e3d7dcf89df SHA512 92b69f1d6fe6dcbf67c4ec73be84dd066d6396c6f4be200ab3ec41654505870a94fe92c0d06d09c18c9ae634ee67377f79d6465b3640099409f25a6254fdae58 WHIRLPOOL 1e2b0b960a8f21e60455378dcc39f025e3dddee50a26c084cc2fc9eea506fe07a277c7a7810a273ade52378bed34acadc3f38563eebe4a4a81d7110c52ee660c +DIST github.com-lxc-go-lxc-89b06ca6fad6daea5a72a1f47e69e39716c46198.tar.gz 36894 SHA256 22bc63df7a27f2db7bf4e27bb286fe2a491f5b0d36ce02915fec7f6a63573537 SHA512 145168fb3defcc57785ae0b08d5386c098e6682fab2c48357a0e4dbdf4839ce1dc76a6818d77e620f542f452e31d075d817950a814c4e6d78781aae912587d96 WHIRLPOOL dccf7c2f88ca62f63e2ca86ca999cb50e9e34bd0680fe9eb53c068873304db94d91174a19d7a4f115bea63189146b1ae368631c58e198c7940db74616616cd1c DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 SHA256 7e794163a24488854f2ff48468e699577dcff82871717913cd7a079dc83d292c SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb WHIRLPOOL 61e8d12211a0ea1eebaba824f4adc2784f26ed0c8496e74d51f02a7647f526954001ced5d3559bd2e2de8fa4c6ab76dd6d15cb8cbf678ec36db5613fcce9accb DIST github.com-lxc-go-lxc-edfe59cec27b76afeb3b35c56f2948c27afac493.tar.gz 36344 SHA256 3c9f1a2ca36f10f08a5b4a5cddd4a17ac18dc6c85913e5e4e3b843e9b25ae40c SHA512 b21d17fad0ececf1d3d0e2bd4efedb11b976ef839de08f76cc0bf9c2fdc0490cd45d3ec3cf852726ba6cb1667e9d14f54a9b9b3f0a3a9bc471a90cf6eb531ab5 WHIRLPOOL 5ccb2839ad107ce84e336bbc1aeed31923d2bc09806a1c424a063b1fdfa8563b4fc7ec64b273126533d7a2ddcdda8d8165cc796aab8e157e86ae88d59af34ae4 DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 SHA256 ad1e8de71cee50acb8492bcaa9b1a7d0ebe175f76266a8f3dd4d7fb48d8e53be SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4 WHIRLPOOL e18e5c426b611f5ba102c2bfa935c26bf5be3b42e48c2b337d3827936361daa28ba1185337b1e25d5732063e0cd539661cb740028f811577cd0250ea24b4e0fe @@ -41,8 +43,8 @@ DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar. DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 SHA256 c013b75f090745e80bc5e3060a26d7053ebc63bd3d077177aa7a3e349bf151ca SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 WHIRLPOOL be9969d0cca83428e9f6eadfffd970d95ae8c0562c00005303eb8122b2cd737410372458e2cd8e6328ff65536d5b7d6b60e34f94fac8cb4d582202dae4e0b94a DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8 DIST github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz 2030395 SHA256 6253685c0e7ae8141e4b9f07c6fff664edac80b75b8c09b39965f7603850512b SHA512 0899042c28f4dec19f830155d1da03830ddf6c03c96fc10190184f1ad2ed5eb2d69b5b989c40f489846201ba664ed80554f76a03c9e1e291d7fb9636967aba52 WHIRLPOOL 9c7867e45d0dbbc2b9865f0215b7c2b747cfc2c2e35264ca2bf96adaaa71b59374f301548ccb8cf34ff989fbc688e787dde2ce6de770962ef365b6ff6c5328ef -DIST github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz 2028435 SHA256 650ece3ec45fe26df3879e3e67fc4e21f65547d441b4085f4910817dae54509e SHA512 743b713ff506517c05ea89fe744eebd5b67751305fc720459840ec6c2d0f2d1fff8437f668a38291b9686ecf940a5177c356c34e022fc020540e0f8c60a21ba8 WHIRLPOOL 840e78119db23b74a231d8f01c6f6a20ce5d5933aafa2dda9c2c1179c5f69f2c7e17fb59a5e5771252cc89b859bcc7ed32f777a5bf139f80e0fb6e026d9e2c6e DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 SHA256 f108517a1ef06a51044a869f4da473b5e3f5f664afeaf4eeb9956c4bc2ad059c SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec WHIRLPOOL 26747056149e68ed1c9b59cfe5e1a6b0b38cdcd06a2d28ea68fef09085969dc1d706be70438552854c35096d3ce6405b6450da6fa5beae911da0e4b8730df8d0 +DIST github.com-olekukonko-tablewriter-0fd34425a5aee40ff3f260b34e6c3b0d59f58c66.tar.gz 14765 SHA256 8e362aed0c169b6f0f1a1263aa7a04ec2208c70d0800a182706007b81ac02da2 SHA512 8006135ecba382466b8a283f1520ef052a909dacf7e4fc68f48549239675fc6225ee0382ef8008b051ac269eb827978dbd5a7e2391ad9f2cab99118189cf90f8 WHIRLPOOL 03c88724d658c62c5acc9d1b7016b891065789965955c9df02390e9eda94c6195b0e5c803152abe873cfcb3cd8d7f834890e8ed1d8a89922b03534ec9e603e51 DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064 DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 SHA256 080a2090ffb58f682a3b15aeccc866b8ff3acfa2020eaaf138b3d0b27f29d0db SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758 WHIRLPOOL ca608bae83163bfb2640d2956021f849cbfe6e827f40120b9151ba663fcf248b3157d3a0eb294747ae0f8b9510c79443d9e3193294b874578b2dd3e68cf9a3c2 DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 SHA256 54da54d54a914e569fb2b31132e0c458ece12d7cd70c14a33adf95731e07afe7 SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283 WHIRLPOOL fb245c1056abe69f7e3fa5a4ded80111777af2fdc107dee3fc36faa25bea8394eb30fda6000075cbdf124cb01c4165ed08fb154d70c30c8a1812988e2bd86619 @@ -52,5 +54,5 @@ DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 SHA256 e63800ecdd704541bafcf8788d651a73599cdead61cd5bccedd31418c4fe58bc SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae WHIRLPOOL ec73f593f37d28565f9efe9b21d17175353b922e144842666b81163538b5d464dcdb4857897f5c1a4362fb44637490c3994f958498672fc31054539f2b5c64e3 DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 SHA256 1c90570f690a5b753633bce84097942021893f180c9d27c0b83f7a1bddaf59d9 SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c WHIRLPOOL ce1a13e5374248ffccaa613d399447d619ad94156f6ebf198d9e63019bd698496d67770ef520b802c59451ff9ad95d9fd789e8c9f758d1df553e2432c3b29289 DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823 -DIST lxd-2.16.tar.gz 707146 SHA256 16d4b09f132f628dbacaa192c02ae27baf91a20a57e26cfea2a24b5af6077680 SHA512 63a870f3613f3e7e917bd06bc748d143586af543901cd4e2159015cb2f20fdf40ba7f04971d6dee2e8a5afd60fc1476cef29783ab5ec5e531c35360fdf83e70f WHIRLPOOL 74b8cdd09801840d87e81317e03d153afab833fff4b58efaf58c7c49703d447fd42d08892b83ef3f18635bdb61ebac0df1651ca99eb3d98710b032283b941b5f DIST lxd-2.17.tar.gz 703925 SHA256 e50da1ffd5c8c1758266ea193b68563dad57b0141adeb17f1a190c9b2c117d0d SHA512 4d2e2bdfb92c08025bf360b8b655300c0c01f3e249bab98b1d346daa6f995c638cbd0b6c48bcbb26c18c875de1ed223afe4b4004fe4c5589715779d53646be0d WHIRLPOOL d5afd3e3a6eb620aaf2b01b31fe918c36397b692df8c8df0b9140cd2a0fdeedda0aa1b495e8c35d4ebb986dbb354481f76a5e1b1cec76b2a7e7a0ab15cc234fc +DIST lxd-2.18.tar.gz 725957 SHA256 2ae07f56b451ffe78718aeb56b6016c8708b1ed8f1ac79dd9bb6a8916019fc22 SHA512 51116a41c4c13c85729e36047a9c36a997fb79abd383ecf2490be3160a39b90b05042aa0f4c979849c255b9630b03ed2c7acb92c26aed3c20aacce65ef0c70c5 WHIRLPOOL b34eb8f0fd8dc1690df4cf730258c30410f3959e31e6aaebdcddb499c47cdee9fd77dc3319ed9821e5368fa35360d8d9f6d3777c596124f7563e842efa157fbb diff --git a/app-emulation/lxd/files/lxd-2.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.18-dont-go-get.patch similarity index 100% rename from app-emulation/lxd/files/lxd-2.16-dont-go-get.patch rename to app-emulation/lxd/files/lxd-2.18-dont-go-get.patch diff --git a/app-emulation/lxd/files/lxd-2.16.confd b/app-emulation/lxd/files/lxd-2.18.confd similarity index 100% rename from app-emulation/lxd/files/lxd-2.16.confd rename to app-emulation/lxd/files/lxd-2.18.confd diff --git a/app-emulation/lxd/files/lxd-2.16.initd b/app-emulation/lxd/files/lxd-2.18.initd similarity index 96% rename from app-emulation/lxd/files/lxd-2.16.initd rename to app-emulation/lxd/files/lxd-2.18.initd index 51c8e7e06553..b1fa7caac546 100644 --- a/app-emulation/lxd/files/lxd-2.16.initd +++ b/app-emulation/lxd/files/lxd-2.18.initd @@ -13,7 +13,7 @@ depend() { } start() { - ebegin "Starting lxd server" + ebegin "Starting lxd service" start-stop-daemon --start \ --pidfile ${PIDFILE} \ diff --git a/app-emulation/lxd/files/lxd-2.16.service b/app-emulation/lxd/files/lxd-2.18.service similarity index 100% rename from app-emulation/lxd/files/lxd-2.16.service rename to app-emulation/lxd/files/lxd-2.18.service diff --git a/app-emulation/lxd/lxd-2.16.ebuild b/app-emulation/lxd/lxd-2.18.ebuild similarity index 81% rename from app-emulation/lxd/lxd-2.16.ebuild rename to app-emulation/lxd/lxd-2.18.ebuild index 17d8d477ef34..cfc21bd24259 100644 --- a/app-emulation/lxd/lxd-2.16.ebuild +++ b/app-emulation/lxd/lxd-2.18.ebuild @@ -10,32 +10,32 @@ EGO_PN="${EGO_PN_PARENT}/lxd" # Maintained with https://github.com/hsoft/gentoo-ego-vendor-update EGO_VENDOR=( - "github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74" - "github.com/golang/protobuf ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e" - "github.com/gorilla/mux ac112f7d75a0714af1bd86ab17749b31f7809640" - "github.com/gorilla/websocket a69d9f6de432e2c6b296a947d8a5ee88f68522cf" + "github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3" + "github.com/golang/protobuf 130e6b02ab059e7b717a096f397c5b60111cae74" + "github.com/gorilla/mux 3f19343c7d9ce75569b952758bd236af94956061" + "github.com/gorilla/websocket 6f34763140ed8887aed6a044912009832b4733d7" "github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b" "github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927" "github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b" "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d" - "github.com/mattn/go-sqlite3 6654e412c3c7eabb310d920cf73a2102dbf8c632" - "github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387" + "github.com/mattn/go-sqlite3 05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5" + "github.com/olekukonko/tablewriter 0fd34425a5aee40ff3f260b34e6c3b0d59f58c66" "github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53" "github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544" "github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16" "github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf" "github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe" "github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee" - "golang.org/x/crypto b176d7def5d71bdd214203491f89843ed217f420 github.com/golang/crypto" - "golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net" + "golang.org/x/crypto 7d9177d70076375b9a59c8fde23d52d9c4a7ecd5 github.com/golang/crypto" + "golang.org/x/net 0744d001aa8470aaa53df28d32e5ceeb8af9bd70 github.com/golang/net" "golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync" - "golang.org/x/text e56139fd9c5bc7244c76116c68e500765bb6db6b github.com/golang/text" - "golang.org/x/tools 84a35ef54dff3c5596983e180ec10919fc432242 github.com/golang/tools" - "golang.org/x/sys 9f7170bcd8e9f4d3691c06401119c46a769a1e03 github.com/golang/sys" + "golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text" + "golang.org/x/tools e531a2a1c15f94033f6fa87666caeb19a688175f github.com/golang/tools" + "golang.org/x/sys 429f518978ab01db8bb6f44b66785088e7fba58b github.com/golang/sys" "gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check" "gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2" "gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15" - "gopkg.in/lxc/go-lxc.v2 1a2cf29ce27f74298fe70acbf817ca2f46cf7457 github.com/lxc/go-lxc" + "gopkg.in/lxc/go-lxc.v2 89b06ca6fad6daea5a72a1f47e69e39716c46198 github.com/lxc/go-lxc" "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" "gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml" ) @@ -45,9 +45,9 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="+daemon nls test" +IUSE="+daemon +ipv6 +dnsmasq nls test" -inherit bash-completion-r1 golang-build linux-info systemd user golang-vcs-snapshot +inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}" @@ -68,9 +68,11 @@ RDEPEND=" daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] - net-dns/dnsmasq[dhcp,ipv6] + dnsmasq? ( + net-dns/dnsmasq[dhcp,ipv6?] + ) net-misc/rsync[xattr] - sys-apps/iproute2[ipv6] + sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl ) @@ -140,16 +142,14 @@ src_compile() { src_test() { if use daemon; then - # Go native tests should succeed - golang-build_src_test + export GOPATH="${S}" + cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir" + + emake check fi } src_install() { - # Installs all src,pkg to /usr/lib/go-gentoo - golang-build_src_install - - cd "${S}" || die "can't cd into ${S}" dobin bin/lxc if use daemon; then dosbin bin/lxd diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml index 15e487b88b1c..d4ab64b98a18 100644 --- a/app-emulation/lxd/metadata.xml +++ b/app-emulation/lxd/metadata.xml @@ -26,5 +26,8 @@ Build the system daemon, not just the client tool + + Depend on dnsmasq to provide DHCP and DNS. + diff --git a/app-emulation/qemu/qemu-2.10.0.ebuild b/app-emulation/qemu/qemu-2.10.0.ebuild index 989c65584710..ad3e8e8235fd 100644 --- a/app-emulation/qemu/qemu-2.10.0.ebuild +++ b/app-emulation/qemu/qemu-2.10.0.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild index 9c17d0462349..d9b7ebeefb60 100644 --- a/app-emulation/virt-what/virt-what-1.18.ebuild +++ b/app-emulation/virt-what/virt-what-1.18.ebuild @@ -9,7 +9,7 @@ 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" +KEYWORDS="~amd64 arm ~hppa ~ppc ppc64 ~sparc ~x86" IUSE="dmi" DEPEND="dev-lang/perl" diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest index a5e3bc70c0a8..5b1bc0adc3ee 100644 --- a/app-emulation/wine-any/Manifest +++ b/app-emulation/wine-any/Manifest @@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392 DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520 +DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -24,6 +25,7 @@ DIST wine-d3d9-2.13.tar.gz 48711 SHA256 738583d1ad80ddeff5d437ef07885e25a2bba7da DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c822fa2e00b372de66541ffd4 SHA512 77aa93ac9b1a81581c27e74641722666026e2e6e03def57955a05fc76c6c02730271a562130dc87ed1caefc9b00b3e0421b2640fa17165aef2f8be5da0cf07d3 WHIRLPOOL 1319fdfb4426a0a294702a5c43641008654a1352d91d23b9bd422d83fb5cd50053110052eef09ae128dfb570523d9208272abd21cb5975adff060fe7d31ac5ad DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94 DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3 +DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa @@ -42,6 +44,7 @@ DIST wine-staging-2.13.tar.gz 10137549 SHA256 0796440ebfa2aa651051e7081cc64f8377 DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761d09db897f25bc33eab840101020b19 SHA512 1e794f77309e94612f822b72872ac2726e37d219a40c4a45feb2fb56f4413c34eae966a4ae8708d502c837cd47db22979e9a05cb73b681703cd729f701cdb210 WHIRLPOOL 63f9ff9cd4d54d6ff91997a904e7cd612bb8bca905399e9c6950b274cd8218c0c04a40dca9f4e12180e1080f1631bfec38e3633fcd457e688e8f8883661a4e59 DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5 +DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64 DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf diff --git a/app-emulation/wine-any/wine-any-2.13.ebuild b/app-emulation/wine-any/wine-any-2.13.ebuild index 76f015333081..bb2c5ea4bf1c 100644 --- a/app-emulation/wine-any/wine-any-2.13.ebuild +++ b/app-emulation/wine-any/wine-any-2.13.ebuild @@ -541,8 +541,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-any/wine-any-2.14.ebuild b/app-emulation/wine-any/wine-any-2.14.ebuild index 842b271f5c12..323eeca67775 100644 --- a/app-emulation/wine-any/wine-any-2.14.ebuild +++ b/app-emulation/wine-any/wine-any-2.14.ebuild @@ -541,8 +541,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-any/wine-any-2.15.ebuild b/app-emulation/wine-any/wine-any-2.15.ebuild index 842b271f5c12..323eeca67775 100644 --- a/app-emulation/wine-any/wine-any-2.15.ebuild +++ b/app-emulation/wine-any/wine-any-2.15.ebuild @@ -541,8 +541,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-any/wine-any-2.16.ebuild b/app-emulation/wine-any/wine-any-2.16.ebuild index 842b271f5c12..323eeca67775 100644 --- a/app-emulation/wine-any/wine-any-2.16.ebuild +++ b/app-emulation/wine-any/wine-any-2.16.ebuild @@ -541,8 +541,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-any/wine-any-2.17.ebuild b/app-emulation/wine-any/wine-any-2.17.ebuild new file mode 100644 index 000000000000..323eeca67775 --- /dev/null +++ b/app-emulation/wine-any/wine-any-2.17.ebuild @@ -0,0 +1,617 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils + +MY_PN="${PN%%-*}" +MY_P="${MY_PN}-${PV}" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(get_version_component_range 1) + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +fi +S="${WORKDIR}/${MY_P}" + +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +WDC_V="20150204" +WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz +" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + s3tc? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${pn_live_val} ]]; then + if use staging || use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" + git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 + "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 + "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + ) + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="" + STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + if use d3d9; then + if use staging; then + PATCHES+=( "${D3D9_DIR}/staging-helper.patch" ) + else + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + fi + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + default + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with v4l) + $(use_with X x) + $(use_with X xfixes) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for bin and man loops + local glob_state=$(shopt -p failglob) + shopt -s failglob + + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${D%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + + # respect LINGUAS when installing man pages, #469418 + local l + for l in de fr pl; do + use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}* + done + + eval "${glob_state}" +} + +pkg_postinst() { + eselect wine register ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${P} || die + else + if use staging; then + eselect wine register --staging ${P} || die + fi + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${P} || die + else + if use staging; then + eselect wine deregister --staging ${P} || die + fi + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest index 95095495754f..f6e6ee9fabb2 100644 --- a/app-emulation/wine-d3d9/Manifest +++ b/app-emulation/wine-d3d9/Manifest @@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392 DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520 +DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -24,6 +25,7 @@ DIST wine-d3d9-2.13.tar.gz 48711 SHA256 738583d1ad80ddeff5d437ef07885e25a2bba7da DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c822fa2e00b372de66541ffd4 SHA512 77aa93ac9b1a81581c27e74641722666026e2e6e03def57955a05fc76c6c02730271a562130dc87ed1caefc9b00b3e0421b2640fa17165aef2f8be5da0cf07d3 WHIRLPOOL 1319fdfb4426a0a294702a5c43641008654a1352d91d23b9bd422d83fb5cd50053110052eef09ae128dfb570523d9208272abd21cb5975adff060fe7d31ac5ad DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94 DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3 +DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059 DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413 DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild index 7f8950c5ddcb..19c89349e85b 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild @@ -481,8 +481,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild index d1afa76263db..97ddaf4c3b0e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild @@ -481,8 +481,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild index d1afa76263db..97ddaf4c3b0e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild @@ -481,8 +481,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild index d1afa76263db..97ddaf4c3b0e 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild @@ -481,8 +481,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild new file mode 100644 index 000000000000..97ddaf4c3b0e --- /dev/null +++ b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild @@ -0,0 +1,551 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils + +MY_PN="${PN%%-*}" +MY_P="${MY_PN}-${PV}" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(get_version_component_range 1) + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +fi +S="${WORKDIR}/${MY_P}" + +D3D9_P="wine-d3d9-${PV}" +D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" +WDC_V="20150204" +WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz +" + +if [[ ${PV} == "9999" ]] ; then + D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" +else + SRC_URI="${SRC_URI} + d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + d3d9? ( + media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${pn_live_val} ]]; then + if use d3d9; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use d3d9; then + git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}" + git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}" + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 + "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 + "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + ) + if use d3d9; then + PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" ) + PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" ) + fi + + default + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with v4l) + $(use_with X x) + $(use_with X xfixes) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for bin and man loops + local glob_state=$(shopt -p failglob) + shopt -s failglob + + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${D%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + + # respect LINGUAS when installing man pages, #469418 + local l + for l in de fr pl; do + use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}* + done + + eval "${glob_state}" +} + +pkg_postinst() { + eselect wine register ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${P} || die + else + if use d3d9; then + eselect wine register --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${P} || die + else + if use d3d9; then + eselect wine deregister --d3d9 ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 5df3d7637d1c..d90f5a268b79 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392 DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520 +DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c @@ -25,6 +26,7 @@ DIST wine-staging-2.13.tar.gz 10137549 SHA256 0796440ebfa2aa651051e7081cc64f8377 DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761d09db897f25bc33eab840101020b19 SHA512 1e794f77309e94612f822b72872ac2726e37d219a40c4a45feb2fb56f4413c34eae966a4ae8708d502c837cd47db22979e9a05cb73b681703cd729f701cdb210 WHIRLPOOL 63f9ff9cd4d54d6ff91997a904e7cd612bb8bca905399e9c6950b274cd8218c0c04a40dca9f4e12180e1080f1631bfec38e3633fcd457e688e8f8883661a4e59 DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5 +DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64 DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf diff --git a/app-emulation/wine-staging/wine-staging-2.13.ebuild b/app-emulation/wine-staging/wine-staging-2.13.ebuild index b43eeb877d89..2e257e3dcee3 100644 --- a/app-emulation/wine-staging/wine-staging-2.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.13.ebuild @@ -516,8 +516,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-staging/wine-staging-2.14.ebuild b/app-emulation/wine-staging/wine-staging-2.14.ebuild index e7462afbb09f..588c73b5a00e 100644 --- a/app-emulation/wine-staging/wine-staging-2.14.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.14.ebuild @@ -516,8 +516,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-staging/wine-staging-2.15.ebuild b/app-emulation/wine-staging/wine-staging-2.15.ebuild index e7462afbb09f..588c73b5a00e 100644 --- a/app-emulation/wine-staging/wine-staging-2.15.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.15.ebuild @@ -516,8 +516,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-staging/wine-staging-2.16.ebuild b/app-emulation/wine-staging/wine-staging-2.16.ebuild index e7462afbb09f..588c73b5a00e 100644 --- a/app-emulation/wine-staging/wine-staging-2.16.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.16.ebuild @@ -516,8 +516,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-staging/wine-staging-2.17.ebuild b/app-emulation/wine-staging/wine-staging-2.17.ebuild new file mode 100644 index 000000000000..588c73b5a00e --- /dev/null +++ b/app-emulation/wine-staging/wine-staging-2.17.ebuild @@ -0,0 +1,586 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils + +MY_PN="${PN%%-*}" +MY_P="${MY_PN}-${PV}" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(get_version_component_range 1) + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +fi +S="${WORKDIR}/${MY_P}" + +STAGING_P="wine-staging-${PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +WDC_V="20150204" +WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz +" + +if [[ ${PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + s3tc? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${pn_live_val} ]]; then + if use staging; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" + git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 + "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 + "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + ) + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="" + STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + + default + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with v4l) + $(use_with X x) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for bin and man loops + local glob_state=$(shopt -p failglob) + shopt -s failglob + + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${D%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + + # respect LINGUAS when installing man pages, #469418 + local l + for l in de fr pl; do + use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}* + done + + eval "${glob_state}" +} + +pkg_postinst() { + eselect wine register ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${P} || die + else + if use staging; then + eselect wine register --staging ${P} || die + fi + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${P} || die + else + if use staging; then + eselect wine deregister --staging ${P} || die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 67182b4e212c..5c776157afdb 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -9,6 +9,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392 DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520 +DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild index df1dab33d1b6..06a2f3370362 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild @@ -447,8 +447,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild index df1dab33d1b6..06a2f3370362 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild @@ -447,8 +447,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild index df1dab33d1b6..06a2f3370362 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild @@ -447,8 +447,8 @@ multilib_src_install_all() { use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} if use abi_x86_64 && ! use abi_x86_32; then - dosym "${MY_PREFIX}"/bin/wine{64,} # 404331 - dosym "${MY_PREFIX}"/bin/wine{64,}-preloader + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi # Failglob for bin and man loops diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild new file mode 100644 index 000000000000..06a2f3370362 --- /dev/null +++ b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild @@ -0,0 +1,509 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils + +MY_PN="${PN%%-*}" +MY_P="${MY_PN}-${PV}" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(get_version_component_range 1) + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +fi +S="${WORKDIR}/${MY_P}" + +WDC_V="20150204" +WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz +" + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "WINE_COMMIT" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615 + "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508 + "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch + ) + + default + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with v4l) + $(use_with X x) + $(use_with X xfixes) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X && ! use ncurses; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + rm_wineconsole() { + rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die + } + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for bin and man loops + local glob_state=$(shopt -p failglob) + shopt -s failglob + + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${D%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + + # respect LINGUAS when installing man pages, #469418 + local l + for l in de fr pl; do + use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}* + done + + eval "${glob_state}" +} + +pkg_postinst() { + eselect wine register ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${P} || die + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${P} || die + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild index 64a6f3def3c9..5554007c7a66 100644 --- a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild +++ b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="0" -KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" IUSE="+cron" RDEPEND="cron? ( virtual/cron )" diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild index b123d156b30c..52ec54d8ac3d 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+ GPL-3+" SLOT="4" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~ppc ppc64 x86" IUSE="+macro-editor" RDEPEND=">=app-i18n/fcitx-4.2.8 diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild index b5f497c1b254..7b91b018eeea 100644 --- a/app-i18n/opencc/opencc-1.0.5.ebuild +++ b/app-i18n/opencc/opencc-1.0.5.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC" LICENSE="Apache-2.0" SLOT="0/2" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 hppa ~ppc ppc64 x86" IUSE="doc test" DEPEND="doc? ( app-doc/doxygen )" diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild index 814766c84ae3..f704a88dabab 100644 --- a/app-i18n/poedit/poedit-1.8.5.ebuild +++ b/app-i18n/poedit/poedit-1.8.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 hppa ppc64 x86" +KEYWORDS="amd64 hppa ~ppc ppc64 x86" IUSE="" # db/expat req for legacytm (backwards support for pre 1.6) diff --git a/app-i18n/poedit/poedit-1.8.7.ebuild b/app-i18n/poedit/poedit-1.8.7.ebuild index 427ffac73bbf..825517a6b8fa 100644 --- a/app-i18n/poedit/poedit-1.8.7.ebuild +++ b/app-i18n/poedit/poedit-1.8.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="" # db/expat req for legacytm (backwards support for pre 1.6) diff --git a/app-misc/bijiben/bijiben-3.24.0.ebuild b/app-misc/bijiben/bijiben-3.24.0.ebuild index 7b5849a0cc64..fc573ec4adc4 100644 --- a/app-misc/bijiben/bijiben-3.24.0.ebuild +++ b/app-misc/bijiben/bijiben-3.24.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="zeitgeist" RDEPEND=" diff --git a/app-misc/geoclue/geoclue-2.4.7.ebuild b/app-misc/geoclue/geoclue-2.4.7.ebuild index c4a2d16205e6..4748e7b60d88 100644 --- a/app-misc/geoclue/geoclue-2.4.7.ebuild +++ b/app-misc/geoclue/geoclue-2.4.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x LICENSE="LGPL-2" SLOT="2.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" IUSE="+introspection +modemmanager zeroconf" RDEPEND=" diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index 665fd5c00b3f..84479aae3440 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -1,2 +1,3 @@ DIST recoll-1.22.4.tar.gz 2511949 SHA256 8211e1ccc6e576b0c21e5bfb4f49a0b69990a44bd5a3ce6eae4ff16aaf23412f SHA512 90d258c854972a41adbb3eef71b08d25c5aea24ed6fc830245d19e273112c016b66b0359e1d83143992d07b5a67226216e8f406ac135c21da6b86c7ffde31225 WHIRLPOOL 2dac2936e4c13448b6f8cb0c6d9d0d6d1d7c14b47a6761b6115762d734f91cfd8652186627b8ab55149c14ff5b00260838b0e62962f32ecbd4d2bef1f25e44ba DIST recoll-1.23.2.tar.gz 2546793 SHA256 0e93e6be0dc2225b03a4850887bd29da47a61e07652fde51be254ef9f8310048 SHA512 0f3d6bae73da066e92e328f963129979f43a12a622120c26d66debde66e569e19e3e8b61154ee77386ad93e968d88262d3e22a679b618bcb8bf468fa16a46769 WHIRLPOOL fec47a74d48c2ae0f93e56964bbfa53b62a0be7d57d602ddb36bb03cc2eb7293c4ffa589a967bc70a76e2478fb315f189cfdab72618a32439c357c1a440e9ff6 +DIST recoll-1.23.3.tar.gz 2590148 SHA256 15125871424ef32ac584eb1c3e4fdd4ac7ff32894db60a3ebff32fa7a45d2eb6 SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06 WHIRLPOOL fe006f4bf53a83375c146cd0f162e030bcd59bbf8b931c428f9a697cb4d6af1ac873ecfd8d596b2b5e00d2374c4431dea7c1169091457a616894ce4417ac87cb diff --git a/app-misc/recoll/recoll-1.23.3.ebuild b/app-misc/recoll/recoll-1.23.3.ebuild new file mode 100644 index 000000000000..46cc6b8c55e3 --- /dev/null +++ b/app-misc/recoll/recoll-1.23.3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit linux-info python-single-r1 qmake-utils + +DESCRIPTION="A personal full text search package" +HOMEPAGE="http://www.lesbonscomptes.com/recoll/" +SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="camelcase doc +inotify qt5 session +spell" +REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}" + +CDEPEND=" + dev-libs/xapian:= + sys-libs/zlib + virtual/libiconv + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebkit:5 + ) + session? ( + inotify? ( x11-libs/libSM x11-libs/libICE ) + ) + spell? ( app-text/aspell ) + ${PYTHON_DEPS} +" + +DEPEND=" + ${CDEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" + +RDEPEND=" + ${CDEPEND} + app-arch/unzip + sys-apps/sed + virtual/awk +" + +pkg_setup() { + if has_version " - - Use media-fonts/corefonts - Use media-fonts/liberation-fonts - crengine diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild index ee88df6c968e..ba14b58cdc40 100644 --- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild +++ b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc" RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] /dev/null; then + die 'POSTGRES_COMPAT not declared.' + fi + +# Don't die because we can't run postgresql-config during pretend. +[[ "$EBUILD_PHASE" = "pretend" \ + && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0 + + local res=$(echo ${POSTGRES_COMPAT[@]} \ + | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null) + + if [[ "$res" -eq "0" ]] ; then + eerror "PostgreSQL slot must be set to one of: " + eerror " ${POSTGRES_COMPAT[@]}" + return 1 + fi + + return 0 +} + +pkg_pretend() { + postgres_check_slot || die +} + +pkg_setup() { + postgres_check_slot || die +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with drivingdistance DD) + $(cmake-utils_use_with doc DOC) + $(cmake-utils_use_build doc MAN) + $(cmake-utils_use_build html HTML) + $(cmake-utils_use_build pdf LATEX) + ) + + cmake-utils_src_configure +} + +src_compile() { + local make_opts + use doc && make_opts="all doc" + cmake-utils_src_make ${make_opts} +} + +src_install() { + use doc && doman "${BUILD_DIR}"/doc/man/en/pgrouting.7 + use html && dohtml -r "${BUILD_DIR}"/doc/html/* + use pdf && dodoc "${BUILD_DIR}"/doc/latex/en/*.pdf + + dodoc README* VERSION + + cmake-utils_src_install +} diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index 324c1f585eec..c293b47e81f0 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -6,3 +6,4 @@ DIST postgis-2.2.5.tar.gz 10223574 SHA256 1fcd458c1e095236d38e52160be5be0c62163f DIST postgis-2.3.2.tar.gz 11336387 SHA256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4 SHA512 d4503959c12e7e269817764e5fae4e567b1765ffe9c857a2382d072a0f159939ddb4f6a57c5ca34b822c585926d0f219f0d788b37e8b06a822ce7c0bcc4e88c6 WHIRLPOOL ff207196df6ab0fd858f93f2ac2b0f8863aab5ad12b0444817f99e7de2a618d6157929302b7199dc8c56d3b6b4b25e6c5bb964a129785e366fd03ae4616051f2 DIST postgis-2.3.3.tar.gz 11342032 SHA256 723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c WHIRLPOOL 427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e DIST postgis-2.4.0rc1.tar.gz 12045664 SHA256 3032ffb468d0fe825d89c2eff767a7855c0d73c98028bc9524b81f540176113a SHA512 ab16ce125af95ad34af6d81de8974cead76669247ecfb5d03b94c40ff17e45dad8466f6d43392477892d2dbbe65580b9c518aeaebbcc8801e464dadacbdf21af WHIRLPOOL fc04313d2ad97ab9ae3b5f60e9dea80934300ede90b052b467738a46c7d0f01bbe9c58ec7bdc27c14a38250d165b275cf3f4ccc5c1eb6b54d96b11c65fc7ea0d +DIST postgis-2.4.0rc2.tar.gz 12733657 SHA256 56ee34899a84e1b7bc0c207176f9fbdbbb67b61a74310d66fb87492dbca5b3dc SHA512 f09212c8db13c0bbb6bae7621ab78480c8948702b30158290d9364dd4bcff657f57ed35586aa2cfee48b147059481f9770f0698c518aaf4d1d9fc1b185667537 WHIRLPOOL ff9c073b0289db38426c307ab72be6c4c5e6c90a7ce9f4e89c198eccfb8baf3de04ef0446b21f56db35af37996b06de31ee6d2aaf43f4b8f8b6f05cccb4f08ec diff --git a/dev-db/postgis/postgis-2.4.0_rc2.ebuild b/dev-db/postgis/postgis-2.4.0_rc2.ebuild new file mode 100644 index 000000000000..057edc60dbd8 --- /dev/null +++ b/dev-db/postgis/postgis-2.4.0_rc2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +POSTGRES_COMPAT=( 9.{2..6} ) +POSTGRES_USEDEP="server" + +inherit autotools eutils postgres-multi versionator + +MY_PV=$(replace_version_separator 3 '') +MY_P="${PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Geographic Objects for PostgreSQL" +HOMEPAGE="http://postgis.net" +SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="" +IUSE="doc gtk static-libs test" + +RDEPEND=" + ${POSTGRES_DEP} + dev-libs/json-c + dev-libs/libxml2:2 + >=sci-libs/geos-3.5.0 + >=sci-libs/proj-4.6.0 + >=sci-libs/gdal-1.10.0 + gtk? ( x11-libs/gtk+:2 ) +" + +DEPEND="${RDEPEND} + doc? ( + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.5 + dev-libs/libxslt + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[imagemagick,png] + ) + ) + virtual/pkgconfig + test? ( dev-util/cunit ) +" + +PGIS="$(get_version_component_range 1-2)" + +REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" + +# Needs a running psql instance, doesn't work out of the box +RESTRICT="test" + +MAKEOPTS+=' -j1' + +# These modules are built using the same *FLAGS that were used to build +# dev-db/postgresql. The right thing to do is to ignore the current +# *FLAGS settings. +QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" + +src_prepare() { + eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" + + local AT_M4DIR="macros" + eautoreconf + postgres-multi_src_prepare +} + +src_configure() { + local myargs="" + use gtk && myargs+=" --with-gui" + postgres-multi_foreach econf ${myargs} +} + +src_compile() { + postgres-multi_foreach emake + postgres-multi_foreach emake -C topology + + if use doc ; then + postgres-multi_foreach emake comments + postgres-multi_foreach emake cheatsheets + postgres-multi_forbest emake -C doc html + fi +} + +src_install() { + postgres-multi_foreach emake DESTDIR="${D}" install + postgres-multi_foreach emake -C topology DESTDIR="${D}" install + postgres-multi_forbest dobin ./utils/postgis_restore.pl + + dodoc CREDITS TODO loader/README.* doc/*txt + + docinto topology + dodoc topology/{TODO,README} + + if use doc ; then + postgres-multi_foreach emake DESTDIR="${D}" comments-install + + docinto html + postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} + + docinto html/images + postgres-multi_forbest dodoc doc/html/images/* + fi + + use static-libs || find "${ED}" -name '*.a' -delete +} + +pkg_postinst() { + ebegin "Refreshing PostgreSQL symlinks" + postgresql-config update + eend $? + + elog "To finish installing PostGIS, follow the directions detailed at:" + elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" +} diff --git a/dev-db/sqlite/sqlite-3.20.1.ebuild b/dev-db/sqlite/sqlite-3.20.1.ebuild index 829b9772e0fe..ee52cadc0f77 100644 --- a/dev-db/sqlite/sqlite-3.20.1.ebuild +++ b/dev-db/sqlite/sqlite-3.20.1.ebuild @@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip ) LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild index 7e4c0030eed2..ebe25c06165a 100644 --- a/dev-embedded/gputils/gputils-1.5.0.ebuild +++ b/dev-embedded/gputils/gputils-1.5.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ppc64 ~x86" IUSE="" src_configure() { diff --git a/dev-games/goatee/goatee-0.3.1.2.ebuild b/dev-games/goatee/goatee-0.3.1.2.ebuild index 60b6fe4b11dd..36c88ba4c3ee 100644 --- a/dev-games/goatee/goatee-0.3.1.2.ebuild +++ b/dev-games/goatee/goatee-0.3.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] clock[test]->tasty diff --git a/dev-haskell/cmark/cmark-0.5.6.ebuild b/dev-haskell/cmark/cmark-0.5.6.ebuild index be8838bc8570..a980c29c31d9 100644 --- a/dev-haskell/cmark/cmark-0.5.6.ebuild +++ b/dev-haskell/cmark/cmark-0.5.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+system-cmark" RDEPEND=">=dev-haskell/text-1.0:=[profile?] snap-server->http-streams diff --git a/dev-haskell/http/http-4000.3.5.ebuild b/dev-haskell/http/http-4000.3.5.ebuild index 69329af255a5..1d66234f0d61 100644 --- a/dev-haskell/http/http-4000.3.5.ebuild +++ b/dev-haskell/http/http-4000.3.5.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="conduit10 +network-uri" RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] 99logtalk - doenvd 99logtalk -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - ewarn "Before running logtalk, users should execute" - ewarn "logtalk_user_setup *once*." - ewarn "To start logtalk use one of the following:" - use gnupl && ewarn "GNU Prolog: /usr/bin/gplgt" - use qupl && ! use amd64 && ewarn "Qu Prolog: /usr/bin/qplgt" - use swipl && ewarn "SWI Prolog: /usr/bin/swilgt" - use xsbpl && use x86 && ewarn "XSB: /usr/bin/xsblgt" - use yappl && ewarn "YAP: /usr/bin/yaplgt" - ewarn "" - - ewarn "The environment has been set up to make the above" - ewarn "integration scripts find files automatically for logtalk." - ewarn "Please run 'etc-update && source /etc/profile' to update" - ewarn "the environment now, otherwise it will be updated at next" - ewarn "login." -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/dev-lang/logtalk/logtalk-2.42.2.ebuild b/dev-lang/logtalk/logtalk-2.42.2.ebuild deleted file mode 100644 index 73e4602bde34..000000000000 --- a/dev-lang/logtalk/logtalk-2.42.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils versionator fdo-mime - -DESCRIPTION="Open source object-oriented logic programming language" -HOMEPAGE="http://logtalk.org" -MY_PV="lgt$(delete_all_version_separators)" -SRC_URI="http://logtalk.org/files/${MY_PV}.tar.bz2" -LICENSE="Artistic-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gnupl qupl swipl xsbpl yappl xslt fop" - -DEPEND="" -RDEPEND=" - gnupl? ( dev-lang/gprolog ) - qupl? ( !amd64? ( dev-lang/qu-prolog ) ) - swipl? ( dev-lang/swi-prolog ) - xsbpl? ( x86? ( dev-lang/xsb ) ) - yappl? ( dev-lang/yap ) - xslt? ( dev-libs/libxslt ) - fop? ( dev-java/fop ) - ${DEPEND}" - -S="${WORKDIR}/${MY_PV}" - -src_install() { - # Look at scripts/install.sh for upstream installation process. - # Install logtalk base - mv scripts/logtalk_user_setup.sh integration/ - mkdir -p "${D}/usr/share/${P}" - cp -r compiler configs contributions VERSION.txt \ - integration library wenv xml libpaths \ - examples settings.lgt "${D}/usr/share/${P}" \ - || die "Failed to install files" - - # Install mime file, the database will be updated later - insinto /usr/share/mime/packages - doins scripts/freedesktop/logtalk.xml - - # Install documentation - dodoc BIBLIOGRAPHY.bib CUSTOMIZE.txt INSTALL.txt \ - LICENSE.txt QUICK_START.txt README.txt \ - RELEASE_NOTES.txt UPGRADING.txt VERSION.txt - dohtml -r manuals/* || die "Failed to install html manual" - - rm -f man/man1/logtalk_backend_select.1 - rm -f man/man1/logtalk_version_select.1 - doman man/man1/*.1 || die "Failed to install man pages" - - # Integration symlinks - dosym /usr/share/${P}/integration/logtalk_user_setup.sh \ - /usr/bin/logtalk_user_setup - use gnupl && dosym /usr/share/${P}/integration/gplgt.sh \ - /usr/bin/gplgt - use qupl && ! use amd64 && dosym /usr/share/${P}/integration/qplgt.sh \ - /usr/bin/qplgt - use swipl && dosym /usr/share/${P}/integration/swilgt.sh \ - /usr/bin/swilgt - use xsbpl && use x86 && dosym /usr/share/${P}/integration/xsblgt.sh \ - /usr/bin/xsblgt - use yappl && dosym /usr/share/${P}/integration/yaplgt.sh \ - /usr/bin/yaplgt - - dosym /usr/share/${P}/xml/lgt2xml.sh /usr/bin/lgt2xml - use xslt && dosym /usr/share/${P}/xml/lgt2html.sh /usr/bin/lgt2html - use xslt && dosym /usr/share/${P}/xml/lgt2txt.sh /usr/bin/lgt2txt - use fop && dosym /usr/share/${P}/xml/lgt2pdf.sh /usr/bin/lgt2pdf - - # Install environment files - echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk - doenvd 99logtalk -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - ewarn "Before running logtalk, users should execute" - ewarn "logtalk_user_setup *once*." - ewarn "To start logtalk use one of the following:" - use gnupl && ewarn "GNU Prolog: /usr/bin/gplgt" - use qupl && ! use amd64 && ewarn "Qu Prolog: /usr/bin/qplgt" - use swipl && ewarn "SWI Prolog: /usr/bin/swilgt" - use xsbpl && use x86 && ewarn "XSB: /usr/bin/xsblgt" - use yappl && ewarn "YAP: /usr/bin/yaplgt" - ewarn "" - - ewarn "The environment has been set up to make the above" - ewarn "integration scripts find files automatically for logtalk." - ewarn "Please run 'etc-update && source /etc/profile' to update" - ewarn "the environment now, otherwise it will be updated at next" - ewarn "login." -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/dev-lang/logtalk/logtalk-3.07.0.ebuild b/dev-lang/logtalk/logtalk-3.07.0.ebuild index cf66066889e2..cb0cc659b75b 100644 --- a/dev-lang/logtalk/logtalk-3.07.0.ebuild +++ b/dev-lang/logtalk/logtalk-3.07.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,6 +32,7 @@ src_install() { cp -r adapters coding contributions core examples integration \ library paths scratch tests tools VERSION.txt \ loader-sample.lgt settings-sample.lgt tester-sample.lgt \ + tests-sample.lgt \ "${D}/usr/share/${P}" \ || die "Failed to install files" @@ -101,9 +102,6 @@ src_install() { pkg_postinst() { fdo-mime_desktop_database_update - ewarn "Before running logtalk, users should execute" - ewarn "logtalk_user_setup *once*" - ewarn "" ewarn "The following integration scripts are installed" ewarn "for running logtalk with selected Prolog compilers:" ewarn "B-Prolog: /usr/bin/bplgt" diff --git a/dev-lang/logtalk/logtalk-3.11.2.ebuild b/dev-lang/logtalk/logtalk-3.11.2.ebuild new file mode 100644 index 000000000000..4469d4c34937 --- /dev/null +++ b/dev-lang/logtalk/logtalk-3.11.2.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils fdo-mime + +DESCRIPTION="Open source object-oriented logic programming language" +HOMEPAGE="http://logtalk.org" +SRC_URI="http://logtalk.org/files/${P}.tar.bz2" +LICENSE="Apache-2.0" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="fop xslt" + +DEPEND="" +RDEPEND="${DEPEND} + xslt? ( dev-libs/libxslt ) + fop? ( dev-java/fop )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-portage.patch +} + +src_install() { + # Look at scripts/install.sh for upstream installation process. + # Install logtalk base + mv scripts/logtalk_user_setup.sh integration/ + mkdir -p "${D}/usr/share/${P}" + cp -r adapters coding contributions core docs examples integration \ + library manuals paths scratch tests tools VERSION.txt \ + loader-sample.lgt settings-sample.lgt tester-sample.lgt \ + tests-sample.lgt \ + "${D}/usr/share/${P}" \ + || die "Failed to install files" + + # Install mime file, the database will be updated later + insinto /usr/share/mime/packages + doins scripts/freedesktop/logtalk.xml + + # Install documentation + dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CUSTOMIZE.md \ + INSTALL.md LICENSE.txt QUICK_START.md README.md \ + RELEASE_NOTES.md UPGRADING.md VERSION.txt + + rm -f man/man1/logtalk_backend_select.1 + rm -f man/man1/logtalk_version_select.1 + doman man/man1/*.1 || die "Failed to install man pages" + + # Integration symlinks + dosym /usr/share/${P}/integration/logtalk_user_setup.sh \ + /usr/bin/logtalk_user_setup + dosym /usr/share/${P}/integration/bplgt.sh \ + /usr/bin/bplgt + dosym /usr/share/${P}/integration/cxlgt.sh \ + /usr/bin/cxlgt + dosym /usr/share/${P}/integration/eclipselgt.sh \ + /usr/bin/eclipselgt + dosym /usr/share/${P}/integration/gplgt.sh \ + /usr/bin/gplgt + dosym /usr/share/${P}/integration/jiplgt.sh \ + /usr/bin/jiplgt + dosym /usr/share/${P}/integration/lplgt.sh \ + /usr/bin/lplgt + dosym /usr/share/${P}/integration/qplgt.sh \ + /usr/bin/qplgt + dosym /usr/share/${P}/integration/quintuslgt.sh \ + /usr/bin/quintuslgt + dosym /usr/share/${P}/integration/sicstuslgt.sh \ + /usr/bin/sicstuslgt + dosym /usr/share/${P}/integration/swilgt.sh \ + /usr/bin/swilgt + dosym /usr/share/${P}/integration/xsblgt.sh \ + /usr/bin/xsblgt + dosym /usr/share/${P}/integration/xsbmtlgt.sh \ + /usr/bin/xsbmtlgt + dosym /usr/share/${P}/integration/yaplgt.sh \ + /usr/bin/yaplgt + + dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2xml.sh \ + /usr/bin/lgt2xml + use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2html.sh \ + /usr/bin/lgt2html + use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2txt.sh \ + /usr/bin/lgt2txt + use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2md.sh \ + /usr/bin/lgt2md + use fop && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \ + /usr/bin/lgt2pdf + + # Install environment files + echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk + doenvd 99logtalk +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + ewarn "The following integration scripts are installed" + ewarn "for running logtalk with selected Prolog compilers:" + ewarn "B-Prolog: /usr/bin/bplgt" + ewarn "CxProlog: /usr/bin/cxlgt" + ewarn "ECLiPSe: /usr/bin/eclipselgt" + ewarn "GNU Prolog: /usr/bin/gplgt" + ewarn "JIProlog: /usr/bin/jiplgt" + ewarn "Lean Prolog: /usr/bin/lplgt" + ewarn "Qu-Prolog: /usr/bin/qplgt" + ewarn "Quintus Prolog: /usr/bin/quintuslgt" + ewarn "SICStus Prolog: /usr/bin/sicstuslgt" + ewarn "SWI Prolog: /usr/bin/swilgt" + ewarn "XSB: /usr/bin/xsblgt" + ewarn "XSB MT: /usr/bin/xsbmtlgt" + ewarn "YAP: /usr/bin/yaplgt" + ewarn "" + + ewarn "The environment has been set up to make the above" + ewarn "integration scripts find files automatically for logtalk." + ewarn "Please run 'etc-update && source /etc/profile' to update" + ewarn "the environment now, otherwise it will be updated at next" + ewarn "login." +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/dev-lang/logtalk/metadata.xml b/dev-lang/logtalk/metadata.xml index e6cc2e552279..7adf5e18089a 100644 --- a/dev-lang/logtalk/metadata.xml +++ b/dev-lang/logtalk/metadata.xml @@ -6,11 +6,6 @@ Prolog - Support GNU Prolog back-end compiler - Support Qu-Prolog back-end compiler - Support SWI-Prolog back-end compiler - Support XSB back-end compiler - Support YAP back-end compiler Support for generating html documentation using xslt Support for generating pdf documentation using fop diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 01009fc9beef..1f7bfbbf1dee 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -2,11 +2,12 @@ DIST perl-5.24.1-patches-3.tar.xz 24012 SHA256 b8f8164c1fb34c5db82d9f16c5330cdb2 DIST perl-5.24.1.tar.xz 11569284 SHA256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f SHA512 9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c WHIRLPOOL 26d401f03af54ba61ea8e761f483f3d374737660fa4beaa3bd77951c0f920f88f9e47f327754c32d4c3c49557882a2a531b9eebef420ad6155d62423f7753406 DIST perl-5.24.2-patches-1.tar.xz 24012 SHA256 51b1dd61f4907da053558c6aa80de303230ee3348b6c4e7d6b149ee0a7c3e54e SHA512 3576dbce373a17de2de436b6bd33378c9bca899dab71b7448e3c2d1df5ed3d63ea19ad0e0406526b9a75b416585e0da0c32e653e6f76474fbcd66672094d7aaf WHIRLPOOL 2668b0d4ea7c0b4bbddc1c26c2187dc4d9b19d449bde91b522a7f500bcdec2d25ec59110001b9560fc610f9deacdfd8bcbdb2ce979e5ad09c9055c1f78820902 DIST perl-5.24.2.tar.xz 11570420 SHA256 b25dd465ef32edf853078eb540b26243db0a3b5e1b1cc84393703d9564be67c0 SHA512 d7bb66e23064aba426fe3f7264d065f0926957675b0bba51fe2ddb623561ffcdb7657d9f27d78920a583a21bdee01a7ace37aae6d42c02d32403bd1347ad8df8 WHIRLPOOL 51e2fd19bff64c6d7bd8f40372089d14cc783c3ae17d6788361b3363a497a8e44688e490422b6c327b886eddf2ff0f2aa261c4c0aa76ecfac08ceb62f8d344d4 -DIST perl-5.24.3-RC1.tar.xz 11583528 SHA256 9f73329273fe9fb5c854d6764ccb160a23e5de747cee042e01bbadafc8f5dda6 SHA512 fa69ada4dc4050bfbfb4946380936a7719e52dd2eff196db3f4d0819c0abda2446b898f50030545f7b06adf16dbc2819ef944a271e0016691ab7ec671e004ff9 WHIRLPOOL 8da84fe6a245d766047236ceabb7646dcb7778736620d8c3d83a1e8e71b520d2735c5ff36ca9f2d165358de500394a9000190cd36ececa356c1b2be5e4d1c8a9 DIST perl-5.24.3-patches-1.tar.xz 24016 SHA256 8dc42e629d50ea7193c890cfcd85abaed32db74507b8862c060bf93f5ea82ef4 SHA512 5feddaa14b66c6c5f926a3bee96e2849d829141ee7a6d74cfec68128785fcb8de38e13cfd229c420a9fe6c3a1db4a4bdd52a91aa72726233570f61c73d31f9fd WHIRLPOOL ffe2e5a530683a36d6d546eff0ac13b4b5014365574abe0cc90be9f73219ec3f5bcd3a9c3fa9a5744682d293e9f3a40e9b0bff0a389cf60d00b2b7f7f8fd32f2 +DIST perl-5.24.3.tar.xz 11574740 SHA256 03fe3e4ea39d2a4982703572599a80f3d5f368a1359ed89746ea1d8bec6cfbba SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec WHIRLPOOL 5c8f9234047ccb448373a1dde403d35a4c8f6e320537fad6b011c3650b6e5f8e7a300fc3567a5bd7cbc308266f2db5adcbd8f74b04c87855b058275c74e08bab DIST perl-5.25.11-patches-1.tar.xz 16776 SHA256 43dda2f9a20b44442d25caa733ba94acb0c48b26e8201b3f8fa3d2be24a6667e SHA512 ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036 WHIRLPOOL 98681898039e1bcc3e9a33498a8b7b8b3f24cc4c49396b33dfd04a853c329323ad47081d64da61ba2880fbd3505e10ffe90367dffa8005bda86c4f114b283934 DIST perl-5.26.0.tar.xz 11961692 SHA256 9bf2e3d0d72aad77865c3bdbc20d3b576d769c5c255c4ceb30fdb9335266bf55 SHA512 cd5af6495fe4c46c0d5d0f51d4015b54daa221f08a5fb48899c247cb57c2ba85cffb97e6d258d0f931504828bb23e175d899f311c73805d924d1042058ac42e4 WHIRLPOOL 9b87a1fd5371871c747351440e40f5d1345b8bf6ac5810b9ef239e58947fe0c243583fdac6888f0450bdca437b6031cc5281a4e045d5014642ef2dc671e24e47 DIST perl-5.26.1-RC1.tar.xz 11923212 SHA256 3c52c1092a66ee7c809af53076e1f407e43f52962272d0fd2e95bfb6c70df111 SHA512 036151303704e8d91db8cc22a9c8972499babca112d46f570e4f921fdad1b73919f6d038973896ff3d55b079080c4682609b3f73b962999bc5f5425b7b877084 WHIRLPOOL 99ae7d69509fcd85486beff976f79da03216e2ef1b241080b3d65bbacc343b8fb577082e111f5fd5214c42dd704465efdb2622558ed76fefa1315fe0dec40d3f +DIST perl-5.26.1.tar.xz 11922848 SHA256 fe8208133e73e47afc3251c08d2c21c5a60160165a8ab8b669c43a420e4ec680 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300 WHIRLPOOL 5126e3727ff4b7bd5cc3b0dce4a4a6f1d4c2601af318161981e66407850a08d8731cdb5554af00cd4889978c7564d85f900e526584ebbab0fee6d97b2aebc6d3 DIST perl-5.27.1-patches-1.tar.xz 16444 SHA256 98e3c57398a3476ff809b98c7a17e52424842ca41499b3ee84b73d90c633ec62 SHA512 c70e033619e1caecb5e5d70e36094bb105f0387a383f7091c763b87ad9f31121c036446e337d44565ce66c9977870c951f2fbd61d34ac1633c18ac9d0b489a13 WHIRLPOOL d211c1b5b3358e8142dd6c6ec9b324db49d1097a0f717168a299e22872d7ff3f9066dace7ac1de935117849445de15f6c3b0afd14afa2750c69d388b83c464d9 DIST perl-5.27.4.tar.xz 11977216 SHA256 a9ade3ec7e605bee6990bf0eb4502da8bd62fa2d4f70b2c4407a15aa7e12543c SHA512 92c170a195da61d306faa8699682f69469e6e04188972ca608f4125122556d0839558cea3b3812b8e70114e9ae566bb58b22d277f66ff837d938bade02f04636 WHIRLPOOL fa156cddd72d9f3811450fea6c4378421021ed73f367dfc123cbfe4d1144e65d257a30d751ffed86ae787f05bf8f0c75d6167618ce480f70e615eb1da23acb81 DIST perl-cross-1.1.4.tar.gz 94623 SHA256 c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57 SHA512 3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79 WHIRLPOOL c4a150cf15d067cd58db63dae01bbe810808888477f9a2bfcd8557b2eeee097bbf93509bb9128feef84e8a2913724a82de0accc3b9c5d65207ee9dcd2989fe51 diff --git a/dev-lang/perl/perl-5.24.3_rc1.ebuild b/dev-lang/perl/perl-5.24.3.ebuild similarity index 100% rename from dev-lang/perl/perl-5.24.3_rc1.ebuild rename to dev-lang/perl/perl-5.24.3.ebuild diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild new file mode 100644 index 000000000000..cb9cb10d6f99 --- /dev/null +++ b/dev-lang/perl/perl-5.26.1.ebuild @@ -0,0 +1,623 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing + +PATCH_VER=1 +CROSS_VER=1.1.6 +PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}" + +DIST_AUTHOR=SHAY + +# Greatest first, don't include yourself +# Devel point-releases are not ABI-intercompatible, but stable point releases are +# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions +PERL_BIN_OLDVERSEN="5.26.0" +if [[ "${PV##*.}" == "9999" ]]; then + DIST_VERSION=5.26.1-RC1 +else + DIST_VERSION="${PV/_rc/-RC}" +fi +SHORT_PV="${DIST_VERSION%.*}" +# Even numbered major versions are ABI intercompatible +# Odd numbered major versions are not +if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then + SUBSLOT="${DIST_VERSION%-RC*}" +else + SUBSLOT="${DIST_VERSION%.*}" +fi +# Used only in tar paths +MY_P="perl-${DIST_VERSION}" +# Used in library paths +MY_PV="${DIST_VERSION%-RC*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +SRC_URI=" + mirror://cpan/src/5.0/${MY_P}.tar.xz + mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz + https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz + mirror://gentoo/${PATCH_BASE}.tar.xz + https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz + https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz +" +HOMEPAGE="http://www.perl.org/" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0/${SUBSLOT}" + +if [[ "${PV##*.}" != "9999" ]]; then +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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +IUSE="berkdb debug doc gdbm ithreads" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) + app-arch/bzip2 + sys-libs/zlib +" +DEPEND="${RDEPEND} + !prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) ) +" +PDEPEND=" + >=app-admin/perl-cleaner-2.5 + >=virtual/perl-File-Temp-0.230.400-r2 + >=virtual/perl-Data-Dumper-2.154.0 + virtual/perl-Test-Harness +" +# bug 390719, bug 523624 +# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker + +S="${WORKDIR}/${MY_P}" + +dual_scripts() { + src_remove_dual perl-core/Archive-Tar 2.240.0 ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.180.0 cpan + src_remove_dual perl-core/Digest-SHA 5.960.0 shasum + src_remove_dual perl-core/Encode 2.880.0 enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 7.240.0 instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 3.340.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.74.0 zipdetails + src_remove_dual perl-core/JSON-PP 2.274.0.200_rc json_pp + src_remove_dual perl-core/Module-CoreList 5.201.709.222.600_rc corelist + src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect + src_remove_dual perl-core/Pod-Perldoc 3.280.0 perldoc + src_remove_dual perl-core/Test-Harness 3.380.0 prove + src_remove_dual perl-core/podlators 4.90.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 4.90.0 /usr/share/man/man1/perlpodstyle.1 +} + +check_rebuild() { + # Fresh install + if [[ -z "${REPLACING_VERSIONS}" ]]; then + return 0; + # Major Upgrade + # doesn't matter if there's multiple copies, it still needs a rebuild + # if the string is anything other than "5.CURRENTMAJOR" + elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then + echo "" + ewarn "UPDATE THE PERL MODULES:" + ewarn "After updating dev-lang/perl the installed Perl modules" + ewarn "have to be re-installed. In most cases, this is done automatically" + ewarn "by the package manager, but subsequent steps are still recommended" + ewarn "to ensure system consistency." + ewarn + ewarn "You should start with a depclean to remove any unused perl dependencies" + ewarn "that may confuse portage in future. Regular depcleans are also encouraged" + ewarn "as part of your regular update cycle, as that will keep perl upgrades working." + ewarn "Recommended: emerge --depclean -va" + ewarn + ewarn "You should then call perl-cleaner to clean up any old files and trigger any" + ewarn "remaining rebuilds portage may have missed." + ewarn "Use: perl-cleaner --all" + return 0; + + # Reinstall w/ USE Change + elif ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \ + ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \ + ( use debug && ! has_version dev-lang/perl[debug] ) || \ + ( ! use debug && has_version dev-lang/perl[debug] ) ; then + echo "" + ewarn "TOGGLED USE-FLAGS WARNING:" + ewarn "You changed one of the use-flags ithreads or debug." + ewarn "You must rebuild all perl-modules installed." + ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" + fi +} + +pkg_setup() { + case ${CHOST} in + *-freebsd*) osname="freebsd" ;; + *-dragonfly*) osname="dragonfly" ;; + *-netbsd*) osname="netbsd" ;; + *-openbsd*) osname="openbsd" ;; + *-darwin*) osname="darwin" ;; + *-interix*) osname="interix" ;; + *-aix*) osname="aix" ;; + *-cygwin*) osname="cygwin" ;; + *) osname="linux" ;; + esac + + myarch="${CHOST%%-*}-${osname}" + if use debug ; then + myarch+="-debug" + fi + if use ithreads ; then + mythreading="-multi" + myarch+="-thread" + fi + + PRIV_BASE="/usr/$(get_libdir)/perl5" + SITE_BASE="/usr/local/$(get_libdir)/perl5" + VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl" + + LIBPERL="libperl$(get_libname ${MY_PV} )" + PRIV_LIB="${PRIV_BASE}/${MY_PV}" + ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}" + SITE_LIB="${SITE_BASE}/${MY_PV}" + SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}" + VENDOR_LIB="${VENDOR_BASE}/${MY_PV}" + VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}" + + dual_scripts +} + +src_remove_dual_file() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + alternatives_auto_makesym "${i}" "${i}-[0-9]*" + done + ;; + setup) + for i in "$@" ; do + if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then + has_version ${pkg} && ewarn "You must reinstall ${pkg} !" + break + fi + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i}{,-${ver}-${P}} || die + done + ;; + esac +} + +src_remove_dual_man() { + local i pkg ver ff + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*` + ff=${ff##*${i#${i%.[0-9]}}} + alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*" + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die + done + ;; + esac +} + +src_remove_dual() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + for i in "$@" ; do + src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}" + src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1" + done +} + +src_prepare_update_patchlevel_h() { + # Copied and modified from debian: + # Copyright 2011 Niko Tyni + # This program is free software; you can redistribute it and/or modify + # it under the same terms as Perl itself. + local patchdir="${WORKDIR}/patches" + local prefix + local patchoutput="patchlevel-gentoo.h" + + [[ -f ${patchdir}/series ]] || return 0 + +while read patch +do + patchname=$(echo $patch | sed 's/\.diff$//') + < $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e ' + + # massage the patch headers + s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend; + s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend; + s|^Bug-Gentoo: ||; tprepend; + s/^\(Subject\|Description\): //; tappend; + s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend; + + # post-process at the end of input + $ { x; + # include the version number in the patchlevel.h description (if available) + s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/; + + # escape any backslashes and double quotes + s|\\|\\\\|g; s|"|\\"|g; + + # add a prefix + s|^|\t,"'"$prefix$patchname"' - |; + # newlines away + s/\n/ /g; s/ */ /g; + # add a suffix + s/ *$/"/; p + }; + # stop all processing + d; + # label: append to the hold space + :append H; d; + # label: prepend to the hold space + :prepend x; H; d; + ' +done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}" +echo "${patchoutput}" >> "${S}/MANIFEST" +} + +src_prepare_perlcross() { + cp -a ../perl-cross-${CROSS_VER}/* . || die + + sed -i \ + -e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \ + cnf/diffs/perl5-${PV}/makemaker-test.patch || die + + sed -i \ + -e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \ + -e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \ + cnf/diffs/perl5-${PV}/customized.patch || die + + sed -i \ + -e 's|^lib/unicore/CombiningClass.pl pod/perluniprops.pod:|lib/unicore/CombiningClass.pl pod/perluniprops.pod: $(CONFIGPM)|' \ + Makefile || die + + # bug 604072 + MAKEOPTS+=" -j1" + export MAKEOPTS +} +src_prepare_dynamic() { + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die +} + +src_prepare() { + local patch + EPATCH_OPTS+=" -p1" + einfo "Applying patches from ${PATCH_BASE} ..." + while read patch ; do + EPATCH_SINGLE_MSG=" ${patch} ..." + epatch "${WORKDIR}"/patches/${patch} + done < "${WORKDIR}"/patches/series + + src_prepare_update_patchlevel_h + + tc-is-cross-compiler && src_prepare_perlcross + + tc-is-static-only || src_prepare_dynamic + + if use gdbm; then + sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \ + ext/NDBM_File/Makefile.PL || die + fi + + default +} + +myconf() { + # the myconf array is declared in src_configure + myconf=( "${myconf[@]}" "$@" ) +} + +src_configure() { + declare -a myconf + + export LC_ALL="C" + [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 + + # some arches and -O do not mix :) + use ppc && replace-flags -O? -O1 + + # Perl has problems compiling with -Os in your flags with glibc + use elibc_uclibc || replace-flags "-Os" "-O2" + + # This flag makes compiling crash in interesting ways + filter-flags "-malign-double" + + # Fixes bug #97645 + use ppc && filter-flags "-mpowerpc-gpopt" + + # Fixes bug #143895 on gcc-4.1.1 + filter-flags "-fsched2-use-superblocks" + + use sparc && myconf -Ud_longdbl + + export BUILD_BZIP2=0 + export BZIP2_INCLUDE=${EROOT}/usr/include + export BZIP2_LIB=${EROOT}/usr/$(get_libdir) + + export BUILD_ZLIB=False + export ZLIB_INCLUDE=${EROOT}/usr/include + export ZLIB_LIB=${EROOT}/usr/$(get_libdir) + + # allow either gdbm to provide ndbm (in ) or db1 + myndbm='U' + mygdbm='U' + mydb='U' + if use gdbm ; then + mygdbm='D' + if use berkdb ; then + myndbm='D' + fi + fi + if use berkdb ; then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db" + + if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf -Ui_db -Ui_ndbm + fi + + use ithreads && myconf -Dusethreads + + if use debug ; then + append-cflags "-g" + myconf -DDEBUGGING + elif [[ ${CFLAGS} == *-g* ]] ; then + myconf -DDEBUGGING=-g + else + myconf -DDEBUGGING=none + fi + + # Autodiscover all old version directories, some of them will even be newer + # if you downgrade + if [[ -z ${PERL_OLDVERSEN} ]]; then + PERL_OLDVERSEN="$( + find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \ + -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \ + -printf "%f " 2>/dev/null )" + fi + # Fixup versions, removing self match, fixing order and dupes + PERL_OLDVERSEN="$( + echo "${PERL_OLDVERSEN}" |\ + tr " " "\n" |\ + grep -vF "${DIST_VERSION%-RC}" |\ + sort -u -nr -t'.' -k1,1 -k2,2 -k3,3 + )" + + # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string + if [[ -n "${PERL_OLDVERSEN// }" ]]; then + local inclist="$( + for v in ${PERL_OLDVERSEN}; do + has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} "; + echo -n "${v} "; + done )" + einfo "This version of perl may partially support modules previously" + einfo "installed in any of the following paths:" + for incpath in ${inclist}; do + [[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}" + [[ -e "${EROOT%/}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}" + [[ -e "${EROOT%/}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}" + done + einfo "This is a temporary measure and you should aim to cleanup these paths" + einfo "via world updates and perl-cleaner" + myconf -Dinc_version_list="${inclist}" + fi + + [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" + + # Make sure we can do the final link #523730, need to set deployment + # target to override hardcoded 10.3 which breaks on modern OSX + [[ ${CHOST} == *-darwin* ]] && \ + myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)" + + # Prefix: the host system needs not to follow Gentoo multilib stuff, and in + # Prefix itself we don't do multilib either, so make sure perl can find + # something compatible. + if use prefix ; then + # Set a hook to check for each detected library whether it actually works. + export libscheck=" + ( echo 'main(){}' > '${T}'/conftest.c && + $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null + ) || xxx=/dev/null" + + # Use all host paths that might contain useful stuff, the hook above will filter out bad choices. + local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib" + myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}" + elif [[ $(get_libdir) != "lib" ]] ; then + # We need to use " and not ', as the written config.sh use ' ... + myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" + fi + + # don't try building ODBM, bug #354453 + disabled_extensions="ODBM_File" + + if ! use gdbm ; then + # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm" + disabled_extensions="${disabled_extensions} GDBM_File NDBM_File" + fi + + myconf -Dnoextensions="${disabled_extensions}" + + [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly + + [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF} + # allow fiddling via EXTRA_ECONF, bug 558070 + eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})" + + myconf \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Doptimize="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ + -Dprefix="${EPREFIX}"'/usr' \ + -Dsiteprefix="${EPREFIX}"'/usr/local' \ + -Dvendorprefix="${EPREFIX}"'/usr' \ + -Dscriptdir="${EPREFIX}"'/usr/bin' \ + -Dprivlib="${EPREFIX}${PRIV_LIB}" \ + -Darchlib="${EPREFIX}${ARCH_LIB}" \ + -Dsitelib="${EPREFIX}${SITE_LIB}" \ + -Dsitearch="${EPREFIX}${SITE_ARCH}" \ + -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \ + -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \ + -Dman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \ + -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \ + -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth="${EPREFIX}"'/usr/include ' \ + -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Ud_csh \ + -Dsh="${EPREFIX}"/bin/sh \ + -Dtargetsh="${EPREFIX}"/bin/sh \ + -Uusenm \ + "${myconf[@]}" \ + "${EXTRA_ECONF[@]}" + + if tc-is-cross-compiler; then + ./configure \ + --target="${CHOST}" \ + --build="${CBUILD}" \ + -Dinstallprefix='' \ + -Dinstallusrbinperl='undef' \ + -Dusevendorprefix='define' \ + "${myconf[@]}" \ + || die "Unable to configure" + else + sh Configure \ + -des \ + -Dinstallprefix="${EPREFIX}"'/usr' \ + -Dinstallusrbinperl='n' \ + "${myconf[@]}" \ + || die "Unable to configure" + fi +} + +src_test() { + export NO_GENTOO_NETWORK_TESTS=1; + if [[ ${EUID} == 0 ]] ; then + ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." + return 0 + fi + use elibc_uclibc && export MAKEOPTS+=" -j1" + TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" +} + +src_install() { + local i + local coredir="${ARCH_LIB}/CORE" + + emake DESTDIR="${D}" install + + rm -f "${ED}/usr/bin/perl${MY_PV}" + ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die + + if ! tc-is-static-only ; then + dolib.so "${ED}"${coredir}/${LIBPERL} + rm -f "${ED}"${coredir}/${LIBPERL} + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die + fi + + rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages" + + # This removes ${D} from Config.pm + for i in $(find "${D}" -iname "Config.pm" ) ; do + einfo "Removing ${D} from ${i}..." + sed -i -e "s:${D}::" "${i}" || die "Sed failed" + done + + dodoc Changes* README AUTHORS + + if use doc ; then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + LD_LIBRARY_PATH=. ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${ED}/usr/share/doc/${PF}/html" + fi + + [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local + + dual_scripts +} + +pkg_preinst() { + check_rebuild +} + +pkg_postinst() { + dual_scripts + + if [[ "${ROOT}" = "/" ]] ; then + local INC DIR file + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }') + einfo "Removing old .ph files" + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + for file in $(find "${DIR}" -name "*.ph" -type f ) ; do + rm -f "${file}" + einfo "<< ${file}" + done + fi + done + # Silently remove the now empty dirs + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null + fi + done + + fi +} + +pkg_postrm(){ + dual_scripts +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index fb00565efd07..5fd59601771b 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,7 +1,4 @@ -DIST php-5.6.30.tar.xz 12449696 SHA256 a363185c786432f75e3c7ff956b49c3369c3f6906a6b10459f8d1ddc22f70805 SHA512 fdf503925c236a79cc09bc9e5c06ce5afa7497ccf20ab486389b818a7d84db1b84ac119523b35586f64fff7d198b6c20164910fbf33254b35ec2f41015d9feef WHIRLPOOL d3217dfd3de0a2b2f178f1b869d2e0fa39128c4518deaf20f6f79d81a938f3730bf4cfb1cc19ddd55797a9e43a2ebad76555ae08004cefbf2430fc6916c49bd3 DIST php-5.6.31.tar.xz 12461268 SHA256 c464af61240a9b7729fabe0314cdbdd5a000a4f0c9bd201f89f8628732fe4ae4 SHA512 b5d3bc306167c851460036aa21194a2f74a50a26aa5c46159394bddbff94e4a418b557d68d5e1315672b3571b13a231ef7810d5346f57c0094acfe29c2e70495 WHIRLPOOL 2cd74a9cfe82b9363b4fbad37b13a8f7cc9571d2493a95b52cdaeeafe2d04255a29b31792dce2db0c41696539ed6b203446a2a6a8ea0319d82066fe9622bfcb9 -DIST php-7.0.21.tar.xz 12626276 SHA256 6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3 SHA512 6fabbadc6076622628e5c408c1be546982412f56b631285f6abe4a98cedc2bbb5d05f4c1c14b07a7e0a04e24270a8a0d7361baa4f42a2232703baee70934ec34 WHIRLPOOL 4f2fbbdb2eca5515721f21924df3bf00d61a2856c06d15c46b5e7592700b7a036dc58f3745a20bb5b908469b1007b293c91ebd0c17cd60372a1b392fc9e0a8bb DIST php-7.0.23.tar.xz 11953100 SHA256 8e526e3551a58e00c8055fa4a72804aa1bd3ee1c0411b25bf1504cc4992609df SHA512 62201592fca88fb1c302badf7e73e5d417e9a062300e0d32fdfcb346d300cd86bf957b880a73795037a332fe148b64589bb15204bdd6b0ddcbbddc5a12e6d042 WHIRLPOOL 5d6131b5d7701b01c1aa849c6b5e3b133b4276999354eccecf847675552eb0be79a68cd0a10595c64bda2594489d3699868b4ed9a1fe3c5cdcc4fda45be32493 DIST php-7.1.9.tar.xz 12157172 SHA256 ec9ca348dd51f19a84dc5d33acfff1fba1f977300604bdac08ed46ae2c281e8c SHA512 feefaae7edda115c9c10d6a07a9d897343ca972e4e5ec327f383cb28f204ac10956653fc120f0474901e59f32f105dc1a7afe64d49a3ea8bf486377837618013 WHIRLPOOL 5179ca1adddb099a3d8dccc009a96202f6d69edeea3126a5f861498475f36413f0a17a6a501b1b0eadba3acfb4ff262a8a5a7ee324043f03d74e857d1dc7c6a8 -DIST php-7.2.0RC1.tar.xz 11970504 SHA256 04f68d9accb60e56adecc34a80b84bde16edb255a13eef701ea2d6c2b13dc15b SHA512 0b342416df181f7e67174e9be899e1db1d621630366b7b27a3568a076e7eae4b1f7bf08093f39cf8a3adc9698cf35a66c4b59a6014c7cbb2d4d00e4c1cf2618d WHIRLPOOL 63ecc092b7b96f1bb68c4c003d0627640eba46cac2f6b6ee2e5664ff4a3c347765ea117722b9bf607331d185c0a162bb0ce34308cd8749cedf0e9653120aa755 DIST php-7.2.0RC2.tar.xz 12051048 SHA256 0406366fcd5be4ee5e76e3c6a4279e04f93a1827a44d27c4f57fbed9e01cd281 SHA512 aa7e3632381677db995a72dcf0276a3be0d40c32138743a225d8e41e791a6fe00859e27ed7699be90e3843d3eb4da90af6a31aab65dc790c402863d09f409a48 WHIRLPOOL fc8c39b8b4a6184fa8e460dd91b0afbb62c5321effd5c5227eb276adb46857acf05e0fa5749279b0f26fe2c08d9f8001f0132507ab778dd1f7df7237da74b623 diff --git a/dev-lang/php/php-5.6.30.ebuild b/dev-lang/php/php-5.6.30.ebuild deleted file mode 100644 index c38661fc0f76..000000000000 --- a/dev-lang/php/php-5.6.30.ebuild +++ /dev/null @@ -1,779 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic versionator systemd - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="http://php.net/" -SRC_URI="http://php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug - enchant exif +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl - mhash mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - acl? ( sys-apps/acl ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( dev-libs/gmp:0 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/libmysqlclient:= ) - mysqli? ( virtual/libmysqlclient:= ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma:= ) - vpx? ( media-libs/libvpx ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd ) - vpx? ( gd ) - cjk? ( gd ) - exif? ( gd ) - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - recode? ( !imap !mysql !mysqli !libmysqlclient ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - sharedmem? ( !threads ) -" - -PHP_MV="$(get_major_version)" - -# Allow users to install production version if they want to -if [[ "${PHP_INI_VERSION}" == "production" ]]; then - PHP_INI_UPSTREAM="php.ini-production" -else - PHP_INI_UPSTREAM="php.ini-development" -fi - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - fi - - dodoc php.ini-development - dodoc php.ini-production -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch" - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - eapply_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with acl fpm-acl) - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_with truetype t1lib "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - $(use_with vpx vpx-dir "${EPREFIX}/usr") - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib) - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Only mention PHP_INI_VERSION if the user doesn't have it set. - case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - elog "This ebuild installed a version of php.ini based on" - elog "${PHP_INI_UPSTREAM}. You can choose which version of" - elog "php.ini to install by default by setting PHP_INI_VERSION" - elog "to either 'production' or 'development' in your make.conf." - elog "Both versions of php.ini can be found with the PHP docs in" - elog "${EPREFIX}/usr/share/doc/${PF}" - elog - ;; - esac - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild index 932385783871..99350669e42b 100644 --- a/dev-lang/php/php-5.6.31.ebuild +++ b/dev-lang/php/php-5.6.31.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2" diff --git a/dev-lang/php/php-7.0.21.ebuild b/dev-lang/php/php-7.0.21.ebuild deleted file mode 100644 index 9e48700e9b1a..000000000000 --- a/dev-lang/php/php-7.0.21.ebuild +++ /dev/null @@ -1,739 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic versionator systemd - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="http://php.net/" -SRC_URI="http://php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug - enchant exif +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sysvipc systemd tidy +tokenizer truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - acl? ( sys-apps/acl ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( dev-libs/gmp:0 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma:= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd ) - webp? ( gd ) - cjk? ( gd ) - exif? ( gd ) - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - sharedmem? ( !threads ) - mysql? ( || ( mysqli pdo ) ) -" - -PHP_MV="$(get_major_version)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with acl fpm-acl) - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-7.0.23.ebuild b/dev-lang/php/php-7.0.23.ebuild index dd53c1f9037e..547d2e86efc6 100644 --- a/dev-lang/php/php-7.0.23.ebuild +++ b/dev-lang/php/php-7.0.23.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.2.0_rc1.ebuild b/dev-lang/php/php-7.2.0_rc1.ebuild deleted file mode 100644 index 698474f376db..000000000000 --- a/dev-lang/php/php-7.2.0_rc1.ebuild +++ /dev/null @@ -1,734 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic versionator systemd - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="http://php.net/" -SRC_URI="https://downloads.php.net/~remi/php-7.2.0RC1.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/php-7.2.0RC1" -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk - coverage +ctype curl debug - enchant exif +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - acl? ( sys-apps/acl ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( dev-libs/gmp:0 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - sodium? ( dev-libs/libsodium:= ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( sys-libs/zlib ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd ) - webp? ( gd ) - cjk? ( gd ) - exif? ( gd ) - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - sharedmem? ( !threads ) - mysql? ( || ( mysqli pdo ) ) - zip-encryption? ( zip ) -" - -PHP_MV="$(get_major_version)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with acl fpm-acl) - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sodium sodium "${EPREFIX}/usr") - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zip-encryption libzip "${EPREFIX}/usr") - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - # --with-pcre-valgrind cannot be enabled with system pcre - # Many arches don't support pcre-jit - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - --without-pcre-valgrind - --without-pcre-jit - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild index 83d306058d60..a32be5b617f3 100644 --- a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" LICENSE="Apache-2.0 GPL-2+" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug doc examples pedro qt4 readline threads" RDEPEND=" diff --git a/dev-lang/ruby/ruby-2.2.8.ebuild b/dev-lang/ruby/ruby-2.2.8.ebuild index 9dda3275eb56..0f5823737f87 100644 --- a/dev-lang/ruby/ruby-2.2.8.ebuild +++ b/dev-lang/ruby/ruby-2.2.8.ebuild @@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" LICENSE="|| ( Ruby-BSD BSD-2 )" -KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" RDEPEND=" diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 380b9a918a1b..f1b7320c5f6e 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,6 +1,8 @@ DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0 +DIST swi-prolog-7.4.2-gentoo-patchset-1.tar.gz 1622 SHA256 a418298d5b390d2be30579e48281f19379516da1b03c4d46037735d171057221 SHA512 13331a0b79407bfe431894cdeb9759263139805ccea90eb760f3c9362221393532278add1e37f1b7ddc8a7c926229895a1f1019595a3d8c15ce250f53d19c260 WHIRLPOOL 350111fa9b8e3793fc4e7b4a997e48263802a6febf93d5a109779247d0c2f36865fbdb62837973a1ef0eda967042d9d45995b2602956fba9b354dc32295182d8 +DIST swi-prolog-7.5.15-gentoo-patchset-1.tar.gz 2069 SHA256 4980474f710aa07ea88e8c3daa81fcf922f5c2e8de00e57dfb80284b04403a83 SHA512 d15fdd346052e780b5a7dd414c91a5d80dc7631447fcbe391e9b3080b8b2f71aa5bb00fd13baf2a6bdac73df62c4ada8f9a5d5dc0afad8d2628d7558c816f267 WHIRLPOOL a2e992019212c58d40aa3c3eebd635baa967cca272b09dd8fec893a7df5c10957ea78e030c8cefdef78c450c0014b173589e739077a7010ff84295a9393a854b DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3 DIST swipl-7.4.1.tar.gz 16498678 SHA256 891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 SHA512 a3e49cc43aed05808901860fe302711d2850b23740a987d1071822d7b4888aca30a8b5f7c94e1e7191057a031f45adeedb0fbff9139d0294e6ec07032da6798d WHIRLPOOL 5605043173e6bbebed316504b3eb20a0ccc4891d25ae7a7eafc7de6eadef1688367a524e1d81fd0c1ff427e1ece39295555bbf7114deb6056b12b3c3ce2196ed DIST swipl-7.4.2.tar.gz 16496738 SHA256 7f17257da334bc1e7a35e9cf5cb8fca01d82f1ea406c7ace76e9062af8f0df8b SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3 WHIRLPOOL 2dad1a5e7ae3670b3a3965010d60420a27cb9623b35cdee83360f6f3a4fadc3dbf2a91fd3e7178b59c9b81723dfe6036fb968953218e7611179b52117a16cb19 diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild index 8c3294b16729..791d94ec968c 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild @@ -5,11 +5,12 @@ EAPI=5 inherit eutils flag-o-matic java-pkg-opt-2 multilib -PATCHSET_VER="0" +PATCHSET_VER="1" DESCRIPTION="free, small, and standard compliant Prolog compiler" HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz" +SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/dev-lang/swi-prolog/swi-prolog-7.5.15.ebuild b/dev-lang/swi-prolog/swi-prolog-7.5.15.ebuild index 563575532e7f..fbec1ad5e84b 100644 --- a/dev-lang/swi-prolog/swi-prolog-7.5.15.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-7.5.15.ebuild @@ -5,11 +5,12 @@ EAPI=5 inherit eutils flag-o-matic java-pkg-opt-2 multilib -PATCHSET_VER="0" +PATCHSET_VER="1" DESCRIPTION="free, small, and standard compliant Prolog compiler" HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest index 7f5cc362f440..578239efd8ec 100644 --- a/dev-lang/xsb/Manifest +++ b/dev-lang/xsb/Manifest @@ -1,2 +1,4 @@ DIST XSB360.tar.gz 12842882 SHA256 bb8d2b30e598574e263ddb48b7569e5582953a0c4f8b16d55f6bbf306e9e7faa SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c WHIRLPOOL 057a1939ff4115c2fc4cd91f10458a4d89847b6394723ea05a4a86d9e7986ee3c03f7ff1b2eff2389ec3c1be7d20b69cdf77be016066cf261b2af131dfbb2176 +DIST XSB370.tar.gz 12322913 SHA256 282936b17ca581e6f546a4cb15687653ad19144897c4776b01a8caf7027ebc6d SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f WHIRLPOOL 7fad63fbd66e902eaccc5ae1e542787a824d4396df1a49f08b003cada4f424eaf563b0eff693296e7adecb46bfd24931938baf5dde95ad01694dfcdf4b2fb4ef DIST xsb-3.6.0-gentoo-patchset-2.tar.gz 7051 SHA256 14fe682df72677e09c9ecaee7a1ef1b0f8f155344789ce90a917bc5a02735947 SHA512 285211c9d1fa52acff707b0ad38f3da06374b8ac187ad66e9148508cbc0ec5c0f60b3e4461705b072510360ce72f81b5d5cfa4bbd1258510e7abfbbe8f0788b0 WHIRLPOOL 5c82f3b268a86b0f5bdbf0a4ffbe755253367d6d84cb24f7c6c2bf216833fb40afe4ca357148c882d57cc754cd75fc1ff7beca3084eeb104a015581e5872b337 +DIST xsb-3.7.0-gentoo-patchset-0.tar.gz 5111 SHA256 cd907853e43ab9a6249511a9313cde4d0c2484ffd35c6fb1f82310fdcd6c7e16 SHA512 6bee94326c99a186b61f4eea62fab4d5d61c3dead65adbf2543249f16febe463e45d23f8b761ef11a276cc29cc3558a592a58c168fcc4265ccdfc83b75dfb4ed WHIRLPOOL 4146000f30cdd8c64bc15521e3ffb086aee43efabce13267191f3191af4f7b33bf10b02c0fdd73d20bffdd02bd0daff2c9f34292eabc963dcfcfbb902bf41dbd diff --git a/dev-lang/xsb/xsb-3.7.0.ebuild b/dev-lang/xsb/xsb-3.7.0.ebuild new file mode 100644 index 000000000000..c4e8881e2b03 --- /dev/null +++ b/dev-lang/xsb/xsb-3.7.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +MY_P="XSB${PV//./}" + +PATCHSET_VER="0" + +inherit eutils autotools java-pkg-opt-2 + +DESCRIPTION="XSB is a logic programming and deductive database system" +HOMEPAGE="http://xsb.sourceforge.net" +SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl debug iodbc java mysql odbc pcre threads xml" + +RDEPEND="curl? ( net-misc/curl ) + iodbc? ( dev-db/libiodbc ) + java? ( >=virtual/jdk-1.4:= ) + mysql? ( virtual/mysql ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + xml? ( dev-libs/libxml2 )" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/XSB + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + cd "${S}"/build + eautoconf +} + +src_configure() { + cd "${S}"/build + + econf \ + --prefix=/usr/$(get_libdir) \ + --disable-optimization \ + --without-smodels \ + $(use_with odbc) \ + $(use_with iodbc) \ + $(use_enable threads mt) \ + $(use_enable debug) + + if use curl ; then + cd "${S}"/packages/curl + econf + fi + + if use mysql ; then + cd "${S}"/packages/dbdrivers/mysql + econf + fi + + if use odbc ; then + cd "${S}"/packages/dbdrivers/odbc + econf + fi + + if use pcre ; then + cd "${S}"/packages/pcre + econf + fi + + if use xml ; then + cd "${S}"/packages/xpath + econf + fi +} + +src_compile() { + cd "${S}"/build + + emake || die "emake failed" + + # All XSB Packages are compiled using a single Prolog engine. + # Consequently they must all be compiled using a single make job. + + cd "${S}"/packages + rm -f *.xwam + emake -j1 || die "emake packages failed" + + if use curl ; then + emake -j1 curl || die "emake curl package failed" + emake -j1 sgml || die "emake sgml package failed" + if use xml ; then + emake -j1 xpath || die "emake xpath package failed" + fi + fi + + if use mysql ; then + emake -j1 mysql || die "emake mysql package failed" + fi + + if use odbc ; then + emake -j1 odbc || die "emake odbc package failed" + fi + + if use pcre ; then + emake -j1 pcre || die "emake pcre package failed" + fi +} + +src_install() { + cd "${S}"/build + emake DESTDIR="${D}" install || die "make install failed" + + local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV} + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die + + cd "${S}"/packages + local PACKAGES=${XSB_INSTALL_DIR}/packages + insinto ${PACKAGES} + doins *.xwam || die + + insinto ${PACKAGES}/chr + doins chr/*.xwam || die + + insinto ${PACKAGES}/clpqr + doins clpqr/*.xwam || die + + insinto ${PACKAGES}/gap + doins gap/*.xwam || die + + insinto ${PACKAGES}/justify + doins justify/*.xwam || die + doins justify/*.H || die + + insinto ${PACKAGES}/regmatch + doins regmatch/*.xwam || die + insinto ${PACKAGES}/regmatch/cc + doins regmatch/cc/*.H || die + + insinto ${PACKAGES}/slx + doins slx/*.xwam || die + + insinto ${PACKAGES}/wildmatch + doins wildmatch/*.xwam || die + insinto ${PACKAGES}/wildmatch/cc + doins wildmatch/cc/*.H || die + + if use curl ; then + insinto ${PACKAGES}/curl + doins curl/*.xwam || die + insinto ${PACKAGES}/curl/cc + doins curl/cc/*.H || die + insinto ${PACKAGES}/sgml + doins sgml/*.xwam || die + insinto ${PACKAGES}/sgml/cc + doins sgml/cc/*.H || die + insinto ${PACKAGES}/sgml/cc/dtd + doins sgml/cc/dtd/* || die + if use xml ; then + insinto ${PACKAGES}/xpath + doins xpath/*xwam || die + insinto ${PACKAGES}/xpath/cc + doins xpath/cc/*.H || die + fi + fi + + if use mysql || use odbc ; then + insinto ${PACKAGES}/dbdrivers + doins dbdrivers/*.xwam || die + doins dbdrivers/*.H || die + insinto ${PACKAGES}/dbdrivers/cc + doins dbdrivers/cc/*.H || die + if use mysql ; then + insinto ${PACKAGES}/dbdrivers/mysql + doins dbdrivers/mysql/*.xwam || die + insinto ${PACKAGES}/dbdrivers/mysql/cc + doins dbdrivers/mysql/cc/*.H || die + fi + if use odbc ; then + insinto ${PACKAGES}/dbdrivers/odbc + doins dbdrivers/odbc/*.xwam || die + insinto ${PACKAGES}/dbdrivers/odbc/cc + doins dbdrivers/odbc/cc/*.H || die + fi + fi + + if use pcre ; then + insinto ${PACKAGES}/pcre + doins pcre/*.xwam || die + insinto ${PACKAGES}/pcre/cc + doins pcre/cc/*.H || die + fi + + cd "${S}" + dodoc FAQ README || die +} diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild index c09823101667..7f35b95da11c 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild @@ -12,7 +12,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 ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+introspection nls stemmer" RDEPEND=" diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild index 058f3c5b48fe..93b4219e284b 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz" LICENSE="LGPL-2.1 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64" IUSE="debug gtk gtk3 +introspection test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-libs/libgudev/libgudev-231.ebuild b/dev-libs/libgudev/libgudev-231.ebuild index 45cba9a15c84..f58d47d099ba 100644 --- a/dev-libs/libgudev/libgudev-231.ebuild +++ b/dev-libs/libgudev/libgudev-231.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" LICENSE="LGPL-2.1" SLOT="0/0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="introspection static-libs" COMMON_DEPEND=" diff --git a/dev-libs/libinput/libinput-1.7.3.ebuild b/dev-libs/libinput/libinput-1.7.3.ebuild index 77a9830c1c8e..1c061c33d3db 100644 --- a/dev-libs/libinput/libinput-1.7.3.ebuild +++ b/dev-libs/libinput/libinput-1.7.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" LICENSE="MIT" SLOT="0/10" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="input_devices_wacom test" # Tests require write access to udev rules directory which is a no-no for live system. # Other tests are just about logs, exported symbols and autotest of the test library. diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild index 049922c3e0c8..979511cb4b1e 100644 --- a/dev-libs/libzip/libzip-1.3.0.ebuild +++ b/dev-libs/libzip/libzip-1.3.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 static-libs" RDEPEND=" diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild index e3d87c77090d..801240995486 100644 --- a/dev-libs/openssl/openssl-1.0.2l.ebuild +++ b/dev-libs/openssl/openssl-1.0.2l.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" diff --git a/dev-ml/async/async-0.9.0.ebuild b/dev-ml/async/async-0.9.0.ebuild index d64eaab2eade..e1ba15eb9c98 100644 --- a/dev-ml/async/async-0.9.0.ebuild +++ b/dev-ml/async/async-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Jane Street Capital's asynchronous execution library" HOMEPAGE="https://github.com/janestreet/async" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -12,7 +14,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="" -RDEPEND=">=dev-lang/ocaml-4.02.0:= +RDEPEND=" dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= @@ -21,12 +23,4 @@ RDEPEND=">=dev-lang/ocaml-4.02.0:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild index 8696bff4270a..8a7ca78a2291 100644 --- a/dev-ml/fpath/fpath-0.7.2.ebuild +++ b/dev-ml/fpath/fpath-0.7.2.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="File system paths for OCaml" HOMEPAGE="http://erratique.ch/software/fpath https://github.com/dbuenzli/fpath" SRC_URI="http://erratique.ch/software/fpath/releases/${P}.tbz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" RDEPEND=" - dev-lang/ocaml:= dev-ml/result:= dev-ml/astring:= " @@ -26,11 +27,3 @@ DEPEND="${RDEPEND} src_compile() { ocaml pkg/pkg.ml build || die } - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.210.0.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.210.0.ebuild index a0ae92096cae..b08b141aa431 100644 --- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.210.0.ebuild +++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.210.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Wrap OP check callbacks" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86" +KEYWORDS="~amd64 hppa ppc x86" IUSE="test" RDEPEND="virtual/perl-parent" diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.10.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.10.0.ebuild index 8db382375567..bd67d7065ea2 100644 --- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.10.0.ebuild +++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.10.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Prevent leakage of lexical hints" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86" +KEYWORDS="~amd64 hppa ppc x86" IUSE="test" # Note: This module is a no-op at runtime since Perl 5.12 diff --git a/dev-perl/PPI/PPI-1.224.0.ebuild b/dev-perl/PPI/PPI-1.224.0.ebuild index 1238b1e6fb77..47a8d217ec81 100644 --- a/dev-perl/PPI/PPI-1.224.0.ebuild +++ b/dev-perl/PPI/PPI-1.224.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.5.0.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.5.0.ebuild index e558ec83dd54..9e1f02fa60db 100644 --- a/dev-perl/bareword-filehandles/bareword-filehandles-0.5.0.ebuild +++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.5.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Disables bareword filehandles" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86" +KEYWORDS="~amd64 hppa ppc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/indirect/indirect-0.360.0.ebuild b/dev-perl/indirect/indirect-0.360.0.ebuild index ffadde808daf..957ecc36bab5 100644 --- a/dev-perl/indirect/indirect-0.360.0.ebuild +++ b/dev-perl/indirect/indirect-0.360.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Lexically warn about using the indirect method call syntax" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86" +KEYWORDS="~amd64 hppa ppc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild index 6ef1a13ab9ba..2d4262eedb06 100644 --- a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild +++ b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="disables multidimensional array emulation" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86" +KEYWORDS="~amd64 hppa ppc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/strictures/strictures-2.0.3.ebuild b/dev-perl/strictures/strictures-2.0.3.ebuild index 09a962722bd0..707d42537719 100644 --- a/dev-perl/strictures/strictures-2.0.3.ebuild +++ b/dev-perl/strictures/strictures-2.0.3.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Turn on strict and make most warnings fatal" SLOT="0" -KEYWORDS="~amd64 hppa ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris" +KEYWORDS="~amd64 hppa ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris" IUSE="test minimal" RDEPEND=" diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild index 30dd1c19a4b9..71866e63edef 100644 --- a/dev-python/automat/automat-0.5.0.ebuild +++ b/dev-python/automat/automat-0.5.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="examples test" RDEPEND=" diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild index 30dd1c19a4b9..71866e63edef 100644 --- a/dev-python/automat/automat-0.6.0.ebuild +++ b/dev-python/automat/automat-0.6.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="examples test" RDEPEND=" diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest new file mode 100644 index 000000000000..3e4a75ee7939 --- /dev/null +++ b/dev-python/basho-erlastic/Manifest @@ -0,0 +1 @@ +DIST basho-erlastic-2.1.1.tar.gz 9298 SHA256 d1596a881437f2be71a8426efed1566b7faefb97234cb21440700ecc8367c545 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e WHIRLPOOL be0c5bd6a4c5b6e553ec782937089e2f81a90b0192bbb92c9481c27a4b0b10ddf8527e7316ea31818ff416bb52e6c693767f2cb8ac9eb4591d81b4297c1bce3c diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild new file mode 100644 index 000000000000..1343d4db951a --- /dev/null +++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Erlang binary term codec and port interface." +HOMEPAGE="https://github.com/basho/python-erlastic/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + "${PYTHON:-python}" tests.py || die +} diff --git a/dev-python/basho-erlastic/metadata.xml b/dev-python/basho-erlastic/metadata.xml new file mode 100644 index 000000000000..d1732d51c867 --- /dev/null +++ b/dev-python/basho-erlastic/metadata.xml @@ -0,0 +1,11 @@ + + + + + basho-erlastic + basho/python-erlastic + + + zmedico@gentoo.org + + diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild index 39a78be31751..d86ce568187b 100644 --- a/dev-python/configclass/configclass-0.1.0.ebuild +++ b/dev-python/configclass/configclass-0.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild index 673ace887cf1..cb4c36f11536 100644 --- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild +++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2.4" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild index 8d89d48a1154..e9ce37e88770 100644 --- a/dev-python/doit-py/doit-py-0.4.0.ebuild +++ b/dev-python/doit-py/doit-py-0.4.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild index 8e9c0cb2f559..2bef51932ca1 100644 --- a/dev-python/doit/doit-0.29.0.ebuild +++ b/dev-python/doit/doit-0.29.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" RDEPEND=" diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild index 42d8d598fcc8..cac709dd0f81 100644 --- a/dev-python/geopy/geopy-1.11.0.ebuild +++ b/dev-python/geopy/geopy-1.11.0.ebuild @@ -15,13 +15,14 @@ IUSE="test doc timezone yahoo" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}] dev-python/placefinder[${PYTHON_USEDEP}] ) timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] + test? ( dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] dev-python/nose-cover3[${PYTHON_USEDEP}] dev-python/pylint[${PYTHON_USEDEP}] ) doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild index f637f017e376..9e2620d13d17 100644 --- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild +++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND="" diff --git a/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch b/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch new file mode 100644 index 000000000000..6ec84aa732b9 --- /dev/null +++ b/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch @@ -0,0 +1,14 @@ +https://sourceware.org/git/?p=glibc.git;a=patch;h=4f157746e0c713965d9143b52fef606312087c48 + +diff --git a/libasyncns-python-0.7.1/libasyncns.c b/libasyncns-python-0.7.1/libasyncns.c +index 99a73de..5e3da0b 100644 +--- a/libasyncns-python-0.7.1/libasyncns.c ++++ b/libasyncns-python-0.7.1/libasyncns.c +@@ -134,7 +134,6 @@ PyMODINIT_FUNC initlibasyncns(void) + ADDNSCONST(ns_t_mailb); + ADDNSCONST(ns_t_maila); + ADDNSCONST(ns_t_any); +- ADDNSCONST(ns_t_zxfr); + ADDNSCONST(ns_t_max); + + ADDNSCONST(ns_c_invalid); diff --git a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild index 1b8e56d00254..2c5ab37721e6 100644 --- a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild +++ b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild @@ -18,6 +18,8 @@ IUSE="" DEPEND=">=net-libs/libasyncns-0.4" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-0.7.1-glibc-2.25.patch" ) + python_compile() { if [[ ${EPYTHON} != python3* ]]; then local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" diff --git a/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild index 24ce4b548727..4262eae37256 100644 --- a/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild +++ b/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then RDEPEND="app-emulation/libvirt:=[-python(-)]" else SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" RDEPEND="app-emulation/libvirt:0/${PV}" fi S="${WORKDIR}/${P%_rc*}" diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild index 87d66e1c0fe3..d6d2a181ec75 100644 --- a/dev-python/m2r/m2r-0.1.5.ebuild +++ b/dev-python/m2r/m2r-0.1.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild index 87d66e1c0fe3..d6d2a181ec75 100644 --- a/dev-python/m2r/m2r-0.1.6.ebuild +++ b/dev-python/m2r/m2r-0.1.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild index 050d04625093..11087194f18c 100644 --- a/dev-python/mergedict/mergedict-0.2.0.ebuild +++ b/dev-python/mergedict/mergedict-0.2.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/micawber/micawber-0.3.3.ebuild b/dev-python/micawber/micawber-0.3.3.ebuild index 4e31b525abce..2b0beae68490 100644 --- a/dev-python/micawber/micawber-0.3.3.ebuild +++ b/dev-python/micawber/micawber-0.3.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="examples" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild index 4622631ac293..dac126b3caf9 100644 --- a/dev-python/numpy/numpy-1.10.4.ebuild +++ b/dev-python/numpy/numpy-1.10.4.ebuild @@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz # It appears the docs haven't been upgraded, still @ 1.8.1 LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc lapack test" RDEPEND=" diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild index 5e56a2ae000b..099143598caf 100644 --- a/dev-python/pexpect/pexpect-4.2.1.ebuild +++ b/dev-python/pexpect/pexpect-4.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]" diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild index 8eb4e3afb2d2..4bdfc6b21ed6 100644 --- a/dev-python/pmw/pmw-2.0.1.ebuild +++ b/dev-python/pmw/pmw-2.0.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="py3" -KEYWORDS="alpha amd64 ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="doc examples test" DEPEND="!dev-python/pmw:0" diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild index 7341fbf66729..30b39030fb57 100644 --- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild +++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="test" DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )" diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild index a513564f5e9f..13bfc8f7406b 100644 --- a/dev-python/pycups/pycups-1.9.73-r1.ebuild +++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86" SLOT="0" IUSE="doc examples" diff --git a/dev-python/pydns/pydns-3.1.1.ebuild b/dev-python/pydns/pydns-3.1.1.ebuild index 95be5be1fa53..6004c2f169d1 100644 --- a/dev-python/pydns/pydns-3.1.1.ebuild +++ b/dev-python/pydns/pydns-3.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz" LICENSE="CNRI" SLOT="3" -KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc x86" +KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86" IUSE="examples" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild index 0ff5e9700d73..245594294805 100644 --- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild +++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc test" RDEPEND=">=dev-libs/libmemcached-0.32" diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild index 854a692673b1..b5fc191522f5 100644 --- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild +++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild index 7799caa865fe..93b17e4a2f69 100644 --- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild +++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild index 12b5a2b8491a..851e7acce7de 100644 --- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild +++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND=" diff --git a/dev-python/riak-python-client/Manifest b/dev-python/riak-python-client/Manifest new file mode 100644 index 000000000000..7fb5c7dae64e --- /dev/null +++ b/dev-python/riak-python-client/Manifest @@ -0,0 +1 @@ +DIST riak-python-client-2.7.0.tar.gz 194141 SHA256 1c676b90fef357f60adc135ccd180ac28945b61b1367198a2a63df86e9bac1ca SHA512 d63d031fb4b3598176480a3f1419158437ea814b46623a9a69e9105ced4172a1609d731bd163dd258c9301fa3b3c406a81f4c1068460b0ea397046fa6a1863e8 WHIRLPOOL b794eb6b5c7472bd487934b3b40ea38fe7b4886e5d209e16344852b3ed8d9041774b4932465ba247bad2999fd4cf5e296198716964b59c75f853ed54322db625 diff --git a/dev-python/riak-python-client/metadata.xml b/dev-python/riak-python-client/metadata.xml new file mode 100644 index 000000000000..6a8aecae126a --- /dev/null +++ b/dev-python/riak-python-client/metadata.xml @@ -0,0 +1,11 @@ + + + + + riak + basho/riak-python-client + + + zmedico@gentoo.org + + diff --git a/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild b/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild new file mode 100644 index 000000000000..dd9e09f6080e --- /dev/null +++ b/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="The Riak client for Python." +HOMEPAGE="https://github.com/basho/riak-python-client/" +MY_PN=${PN%%-*} +MY_P=${MY_PN}-${PV} +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/basho-erlastic[${PYTHON_USEDEP}] + dev-libs/protobuf[${PYTHON_USEDEP}] + >=dev-python/six-1.8[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + default + # delete protobuf requirements that only work for pip + sed '17,22d' -i setup.py || die + sed -e "s:'\\\\n\\\\027:b\\0:" -i riak/pb/*.py || die +} + +python_test() { + esetup.py test || die +} diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild index 8be93212a0ec..62308224c09d 100644 --- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild +++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-vcs/git" diff --git a/dev-python/setuptools/setuptools-36.5.0.ebuild b/dev-python/setuptools/setuptools-36.5.0.ebuild index c64301ffe860..569852df901c 100644 --- a/dev-python/setuptools/setuptools-36.5.0.ebuild +++ b/dev-python/setuptools/setuptools-36.5.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="Collection of extensions to Distutils" diff --git a/dev-python/spyder/spyder-3.2.3.ebuild b/dev-python/spyder/spyder-3.2.3.ebuild index c7290c8ba7ab..485bde91fcf7 100644 --- a/dev-python/spyder/spyder-3.2.3.ebuild +++ b/dev-python/spyder/spyder-3.2.3.ebuild @@ -33,6 +33,7 @@ RDEPEND=" dev-python/pickleshare[${PYTHON_USEDEP}] dev-python/pyzmq[${PYTHON_USEDEP}] dev-python/chardet[${PYTHON_USEDEP}] + >=dev-python/pycodestyle-2.3.0 hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} app-arch/unzip" diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild index ddfb2d9db370..ded5cdf6e032 100644 --- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild +++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc ~x86" #Refrain for now setting IUSE test and deps of test given test restricted. IUSE="" diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest index 2a71321655e0..04cf8728b365 100644 --- a/dev-python/tox/Manifest +++ b/dev-python/tox/Manifest @@ -1,2 +1,2 @@ -DIST tox-2.4.1.tar.gz 113677 SHA256 6673571a3c4b1561b564e2b1cce55bddfb4f3efdb387ba4eb0a3688bbe2496db SHA512 f636b08a9f386ad20058581ca03cae0a259fe3432d3d4bd9a5117c30cb2f2c2d35d7fd499057654cd55d86c172456101f82b320d120f67afd8669a74fa63b860 WHIRLPOOL 7386f0b30e50dd8d89e05871491347849ee18b11cc89b0871cbe2719b2a75b140afa65c5d4b5e7c4266f33f89c7a36e24aa52036ae8845d5ad70279d417abb2d DIST tox-2.7.0.tar.gz 120139 SHA256 9c3bdc06fe411d24015e8bbbab9d03dc5243a970154496aac13f9283682435f9 SHA512 96088a9f77e8b994d920a8c9907a0fa50d5e0fe918e5a67673d4c30810642be2872283810d1d8b5ae9cc311605236b64343248485c4d4067b54c7b6d9f31a4b4 WHIRLPOOL ed77717cfead6e98ff31fb773b31bcf55bb8c4892c281aae68d10459f4ffe0c386d5adc7e1dcaacfffe2a17e005231d1dc51f3ddb3900cb09547eba6ed444628 +DIST tox-2.8.1.tar.gz 125777 SHA256 de0abf4e8992c056bc22afff9d969e0cae2e39452a9650bdbcbe7154793537b7 SHA512 a230f7bc48f476825ca1a879e669288b311f266f1695bac4eecfcd44076731e5581a425e36555a0db54f8a0683af31abd77ab862aa40525387e6e436ba351c37 WHIRLPOOL 18f146f0b09e64fbc656fff9a8e098422cd8abd38ea6a09e29489c9cd3dfb3e6d4540922e5ea569d0dc3323c63f8f1c132fe75125f2e7ebb6d409ee086eee6e6 diff --git a/dev-python/tox/tox-2.4.1.ebuild b/dev-python/tox/tox-2.4.1.ebuild deleted file mode 100644 index 117e7fe9735a..000000000000 --- a/dev-python/tox/tox-2.4.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy ) - -inherit distutils-r1 - -DESCRIPTION="virtualenv-based automation of test activities" -HOMEPAGE="https://tox.testrun.org https://pypi.python.org/pypi/tox" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" -IUSE="doc test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}] - dev-python/pluggy[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/py-1.4.17[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )" - -python_prepare_all() { - # Take out failing tests known to pass when run manually - # # Run from ebuild interferes in subtle & mysterious ways, inducing these erroroneous fails - sed \ - -e 's:test_package_install_fails:_&:' \ - -e 's:test_different_config_cwd:_&:' \ - -e 's:test_develop:_&:' \ - -e 's:test_usedevelop:_&:' \ - -e 's:test_usedevelop_mixed:_&:' \ - -e 's:test__test_usedevelop:_&:' \ - -e 's:test_env_VIRTUALENV_PYTHON:_&:' \ - -i tests/test_z_cmdline.py || die - - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed \ - -e "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" \ - -i doc/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test -v -v tests || die "Testsuite failed under ${EPYTHON}" -} - -python_install_all() { - use doc && HTML_DOCS=( "${S}"/doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/tox/tox-2.7.0.ebuild b/dev-python/tox/tox-2.7.0.ebuild index a19a3c1aefbd..9fa76bafad4a 100644 --- a/dev-python/tox/tox-2.7.0.ebuild +++ b/dev-python/tox/tox-2.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc test" diff --git a/dev-python/tox/tox-2.8.1.ebuild b/dev-python/tox/tox-2.8.1.ebuild new file mode 100644 index 000000000000..c0177a22c3f1 --- /dev/null +++ b/dev-python/tox/tox-2.8.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy ) + +inherit distutils-r1 + +DESCRIPTION="virtualenv-based automation of test activities" +HOMEPAGE="http://tox.testrun.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="doc test" + +# tests need internet +RESTRICT="test" + +RDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/py-1.4.17[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools_scm[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # remove intersphinx stuff + sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + esetup.py build_sphinx + HTML_DOCS=( "${S}"/doc/build/html/. ) + fi +} + +python_test() { + esetup.py test || die "Testsuite failed under ${EPYTHON}" +} diff --git a/dev-python/twisted/twisted-17.5.0-r1.ebuild b/dev-python/twisted/twisted-17.5.0-r1.ebuild index a859d97e120e..78bd82450ae2 100644 --- a/dev-python/twisted/twisted-17.5.0-r1.ebuild +++ b/dev-python/twisted/twisted-17.5.0-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 # Dropped keywords due to new deps not keyworded #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" LICENSE="MIT" SLOT="0" diff --git a/dev-python/twython/twython-3.3.0.ebuild b/dev-python/twython/twython-3.3.0.ebuild index 858cdfbf65e4..811a837599ab 100644 --- a/dev-python/twython/twython-3.3.0.ebuild +++ b/dev-python/twython/twython-3.3.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="" diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild index 685111948e47..8b63ed6335d9 100644 --- a/dev-python/typing/typing-3.6.2.ebuild +++ b/dev-python/typing/typing-3.6.2.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x64-solaris" IUSE="" -DEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="" python_test() { diff --git a/dev-ros/turtlesim/Manifest b/dev-ros/turtlesim/Manifest index 6ede2a0f8eff..013e3f6ab485 100644 --- a/dev-ros/turtlesim/Manifest +++ b/dev-ros/turtlesim/Manifest @@ -1,5 +1 @@ -DIST ros_tutorials-0.6.1.tar.gz 126792 SHA256 0227557d49343c8dc2c17f5fba6a44ca8fe46cb0d9f34315bf4c2f8c3d9969f5 SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5 WHIRLPOOL 861fec5410f5e1f6930b537f757abf120ee5b10b843a39010e0dc04f170c627c793dbf462fa1ac0a2c3f150780915d01ade459f973453a053ee53e2ccae7d795 -DIST ros_tutorials-0.7.0.tar.gz 140125 SHA256 38ed655e914de2990bfcf5f8a25b6ef99f1ed4287033bf153ee6383eeac2842d SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711 WHIRLPOOL 6ff32292a7ce3e3c4d18e58509669a168bef707ecefaf523c7392b44d77e965ccca5c621ecaf52fd3382b2873f3e2ea84f209695d0c79ba32bb36401d2d9dfa5 -DIST ros_tutorials-0.7.1.tar.gz 140483 SHA256 55f6dc2ae32b895dee3feeb434755f17d655699b3666609e66452f2e757331a2 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa WHIRLPOOL 649e717c58179fd1b0f51f01cf4ea9303124e6b5479c6be7fb49e39b010003b58535692156980da76e1f628ff6e5ce217f62d343773e183ce2a959b63a2c0b38 -DIST ros_tutorials-0.8.0.tar.gz 153739 SHA256 d15246d6a8cb2ed9be933704870da523c112e2b432c23b3709e43afbf54d50f4 SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795 WHIRLPOOL facd65521e62987a3589e84f1fbb2d6e64f8cf4cf3152c7ab8389e4a8f60a4aee84e4dcd54978292fb2433e653014bcbcc5ed139fb3fcd9b9c45766d9521b1ac DIST ros_tutorials-0.8.1.tar.gz 153831 SHA256 c4348a436411d7369c1c1766ba5e3785fd32943cf6548cdac73bdaa664986d74 SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668 WHIRLPOOL 59439f94becf43eee8ded918193b7cbcce2e2f4fa7a6b4e3edf727b99aa39fb22b2a774f5383fdce0efe45d547ade70eebe27f00182014370a6690231de65a00 diff --git a/dev-ros/turtlesim/turtlesim-0.6.1.ebuild b/dev-ros/turtlesim/turtlesim-0.6.1.ebuild deleted file mode 100644 index c3019eff1846..000000000000 --- a/dev-ros/turtlesim/turtlesim-0.6.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros/ros_tutorials" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs" - -inherit ros-catkin - -DESCRIPTION="Tool made for teaching ROS and ROS packages" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/boost:=[threads] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roscpp_serialization - dev-ros/roslib - dev-ros/rostime - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/turtlesim/turtlesim-0.7.0.ebuild b/dev-ros/turtlesim/turtlesim-0.7.0.ebuild deleted file mode 100644 index e2e296b12f34..000000000000 --- a/dev-ros/turtlesim/turtlesim-0.7.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros/ros_tutorials" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs" - -inherit ros-catkin - -DESCRIPTION="Tool made for teaching ROS and ROS packages" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-libs/boost:=[threads] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roscpp_serialization - dev-ros/roslib - dev-ros/rostime - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/turtlesim/turtlesim-0.7.1.ebuild b/dev-ros/turtlesim/turtlesim-0.7.1.ebuild deleted file mode 100644 index 0d96b983386f..000000000000 --- a/dev-ros/turtlesim/turtlesim-0.7.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros/ros_tutorials" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs" - -inherit ros-catkin - -DESCRIPTION="Tool made for teaching ROS and ROS packages" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-libs/boost:=[threads] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roscpp_serialization - dev-ros/roslib - dev-ros/rostime - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ros/turtlesim/turtlesim-0.8.0.ebuild b/dev-ros/turtlesim/turtlesim-0.8.0.ebuild deleted file mode 100644 index 697eb7b6d84a..000000000000 --- a/dev-ros/turtlesim/turtlesim-0.8.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros/ros_tutorials" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=${PN} -CATKIN_HAS_MESSAGES=yes -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs" - -inherit ros-catkin - -DESCRIPTION="Tool made for teaching ROS and ROS packages" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-libs/boost:=[threads] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roscpp_serialization - dev-ros/roslib - dev-ros/rostime - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND}" diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest index 60755c452702..042b35b4670f 100644 --- a/dev-ruby/childprocess/Manifest +++ b/dev-ruby/childprocess/Manifest @@ -2,3 +2,4 @@ DIST childprocess-0.5.3.gem 28160 SHA256 9cebed1bd68f7ba0deb54683a5c05a8c3e79037 DIST childprocess-0.6.3.gem 31744 SHA256 7b319509275e326d6b673c2f82ad21db7c3598fe854fe16bffa9ffc6f4206edc SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5 WHIRLPOOL b5ec03b784d3576d6ad666a980c367638693786d932705b5520ba6094414fdd8e7b6c9c515846b9339b741c37b67eef28bc09106b50efe2635f9bedcc0951706 DIST childprocess-0.7.0.gem 32256 SHA256 0da6258189a05d975727395c04e42d5ea2336fdc4c4cc615226b81fd4a2a0e67 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a WHIRLPOOL 6ce3e7256deb415fbc46a06347b89cb7f216fda49520807b3b24732bdaf2b97f6b67f180d19cd2fe29ed22b9034f08665ca5fd306acf1ab535665128f1f74cea DIST childprocess-0.7.1.gem 32256 SHA256 411abbefacab4d769d20ab2b69fe6dff855b7ee4b7b6b2d22d5211ef79bd9e11 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902 WHIRLPOOL 750f0d5b5fa90cbbb86b80e5112c6a8269a6723ebeaec63800e76ee1e094c92aa4fe3b762c4a9dc55adc5106b219f915bd0e43dbdd77a2b7d1dd9a127ca1dba7 +DIST childprocess-0.8.0.gem 32768 SHA256 bab28cef7c17bc9242d75c8dd535dd8d2bdc989d1c5cf02550b04b9cdfea3020 SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf WHIRLPOOL ab669a42b117722e6824c463b2d2af6f9db183f633c559b07d78e532114fae138c21964a45a26cea4e4976279e11072f39f1c7ef93ad3153d78f830fa2bf1398 diff --git a/dev-ruby/childprocess/childprocess-0.8.0.ebuild b/dev-ruby/childprocess/childprocess-0.8.0.ebuild new file mode 100644 index 000000000000..571ee9e6de47 --- /dev/null +++ b/dev-ruby/childprocess/childprocess-0.8.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23 ruby24" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Solution for controlling external programs running in the background" +HOMEPAGE="https://github.com/jarib/childprocess" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/ffi-1.0.11" + +all_ruby_prepare() { + # Remove bundler support + rm Gemfile || die + sed -i -e "/[Bb]undler/d" Rakefile || die + sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die + sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_prepare() { + sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die +} + +each_ruby_test() { + RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec +} diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild index f1dc4282fcab..a5a638ed0386 100644 --- a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild +++ b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22" +USE_RUBY="ruby22 ruby23 ruby24" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/json/json-1.8.6.ebuild b/dev-ruby/json/json-1.8.6.ebuild index 337c9eaff1d9..0810a567dd1b 100644 --- a/dev-ruby/json/json-1.8.6.ebuild +++ b/dev-ruby/json/json-1.8.6.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension" HOMEPAGE="https://github.com/flori/json" LICENSE="|| ( Ruby GPL-2 )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="" diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild index 077e2ce0dc1a..8660b9d9e4ac 100644 --- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild +++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild @@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends" HOMEPAGE="https://github.com/intridea/multi_json" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="" diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild index dce162cfc6de..f99474a2df51 100644 --- a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild +++ b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://rdoc.info/gems/multi_xml" SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="" diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest index 245562d315be..598dfaa7af4a 100644 --- a/dev-ruby/oauth/Manifest +++ b/dev-ruby/oauth/Manifest @@ -1,3 +1,2 @@ -DIST oauth-0.4.7.gem 50688 SHA256 bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc SHA512 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 WHIRLPOOL 5a9dd0eeb2137db2b9810482dca116bf38c06ed75dff2df434118c147ed907d4fdad55dfd2e9c0751b42a110cd240c2ff70bfca75bcffc7f08dd454f65ca7591 DIST oauth-0.5.1.tar.gz 46675 SHA256 462839c6a685b72d619e050869d15abb889f98b010ee97a19ea5a2bc4e39ad91 SHA512 fe00e4455ab72edb38051e0c203f27b299b624cdc3ba031de9aea33c1429a54a364f066297dae86c22b723859ab8bd8854b02d344ec49a535c28b256e96593a6 WHIRLPOOL b9813500cc920a74ac7b48414bcb80f266cad4f8407fc9a62ac1c0da69c92dcd83f1b837de2b7caf8e2a89727c794bc3b0652f1091981e70d82122e7fd6470a9 DIST oauth-0.5.3.tar.gz 59355 SHA256 0a8225316dfcaf83fc05c2f96ccef912ccfd41a2f57b45ea78ccf44bca975c5c SHA512 658a0b2c8b2eaa51981fd274c5058996309aa0a7098fad8221ca4074f51d996c17c5bdd8373da5e13b6cdc782b9d59769b705f2aa6ad724a2ebd14034ff92e9e WHIRLPOOL 0700f2ccb7e4b3e24c9e6651d7a2ad9fdba21dcf9d37a85b4e0e008e89bed795dc8877877fced792f48996f9ecbe7f0fd89ca4831fdebbc9eddeec287ab6b8df diff --git a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild b/dev-ruby/oauth/oauth-0.4.7-r2.ebuild deleted file mode 100644 index b4136ac19ba8..000000000000 --- a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO" - -inherit ruby-fakegem - -DESCRIPTION="A RubyGem for implementing both OAuth clients and servers" -HOMEPAGE="http://oauth.rubyforge.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-macos" -IUSE="" - -ruby_add_bdepend "test? ( - dev-ruby/test-unit:2 - dev-ruby/mocha:0.14 - dev-ruby/webmock - dev-ruby/rack )" - -all_ruby_prepare() { - # Require a compatible version of mocha - sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die - - # Ensure a consistent test order to avoid loading issues with e.g. rack - sed -i -e "s/.rb']/.rb'].sort/" Rakefile || die - - # Remove tests that require Rails 2.3 since that is ruby18-only. - rm -f test/test_action_controller_request_proxy.rb || die - - # Remove typhoeus tests since they require an old version. - rm -f test/test_typhoeus_request_proxy.rb || die -} diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest index a82cb90f237c..3379ca197535 100644 --- a/dev-ruby/octokit/Manifest +++ b/dev-ruby/octokit/Manifest @@ -1,3 +1 @@ -DIST octokit-4.4.1.tar.gz 2823271 SHA256 9222747466c94f3976f3efb7f818e1a24134fb1fec33eaf395fd8097bfa68473 SHA512 cb6ceb4bbeeba9131176e425cafb40e5cbf0e38958a473ec44dcc702f0a087e5ff19ba34815f1a7a65d095b68c52824b161bf37e6b0fdc626770904bd830f5cb WHIRLPOOL 61e210e7fdc8679be50537ef5425c04710eebad54886fad865b46acd6f4e9758f66a0cb935e2238986c099765b313e6c0a3278e0f6dd2b377d5c049d4981715b -DIST octokit-4.6.2.tar.gz 2859064 SHA256 f568e5e8488d5ed994591fc1b539cbfd8d2a00225f9be642727937f970a598ae SHA512 ff95dc22eca73eee60a1cbe9c8ae0a8c66957f5d50ac906ae73cc36adae49d52cc971e24a807860eac323d24023540a74926dfa1a38c9547359bd5f58cfa10f2 WHIRLPOOL 2fc558196d2879e0f88681f6138a25ed6b3a054594c127c06c902ba7d781f919e2f82f606464e26b5dad2f1e48f33272caec94d9f8f3b29a725ca940737539b5 DIST octokit-4.7.0.tar.gz 2926712 SHA256 9ce503a8ed4e42022aa01f0a12d0afbec8dd52bde71c12164c5ff815c0278110 SHA512 7a760f909e4756401ce7ecfb3dc8682ec2c630b7ca1639135e61912f8dac2a18974ced1fd5b2d75ee14d1fcc567a370781c159303d7789a9a3f4b756186e72c1 WHIRLPOOL 7a0bbfd7d9009f44b2f8ba41212ac9f1633bfe6b946d855628836578703ab19db81a3214f6f059f840168c5d2c08f8276235a44436ab8593fb246851485d789c diff --git a/dev-ruby/octokit/octokit-4.4.1.ebuild b/dev-ruby/octokit/octokit-4.4.1.ebuild deleted file mode 100644 index 8fcd322c6f61..000000000000 --- a/dev-ruby/octokit/octokit-4.4.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_DOC="yard" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit multilib ruby-fakegem - -DESCRIPTION="Ruby toolkit for the Github API" -HOMEPAGE="https://github.com/octokit/octokit.rb" -SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="" - -RUBY_S=octokit.rb-${PV} - -ruby_add_rdepend ">=dev-ruby/sawyer-0.5.3" -ruby_add_bdepend "test? ( dev-ruby/mime-types - >=dev-ruby/netrc-0.7.7 - dev-ruby/vcr:2 - >=dev-ruby/webmock-1.9:0 )" - -all_ruby_prepare() { - sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die -} diff --git a/dev-ruby/octokit/octokit-4.6.2.ebuild b/dev-ruby/octokit/octokit-4.6.2.ebuild deleted file mode 100644 index 186778dccf10..000000000000 --- a/dev-ruby/octokit/octokit-4.6.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_DOC="yard" -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit multilib ruby-fakegem - -DESCRIPTION="Ruby toolkit for the Github API" -HOMEPAGE="https://github.com/octokit/octokit.rb" -SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="" - -RUBY_S=octokit.rb-${PV} - -ruby_add_rdepend ">=dev-ruby/sawyer-0.8.0" -ruby_add_bdepend "test? ( dev-ruby/mime-types - >=dev-ruby/netrc-0.7.7 - dev-ruby/vcr:2 - >=dev-ruby/webmock-1.9:0 )" - -all_ruby_prepare() { - sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die -} diff --git a/dev-ruby/ox/ox-2.5.0.ebuild b/dev-ruby/ox/ox-2.5.0.ebuild index eee48251f7b1..4149119fa08a 100644 --- a/dev-ruby/ox/ox-2.5.0.ebuild +++ b/dev-ruby/ox/ox-2.5.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox" SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="" diff --git a/dev-ruby/ox/ox-2.6.0.ebuild b/dev-ruby/ox/ox-2.6.0.ebuild index eee48251f7b1..4149119fa08a 100644 --- a/dev-ruby/ox/ox-2.6.0.ebuild +++ b/dev-ruby/ox/ox-2.6.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox" SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="" diff --git a/dev-ruby/ox/ox-2.7.0.ebuild b/dev-ruby/ox/ox-2.7.0.ebuild index d51d9aa48d25..060f1807bc96 100644 --- a/dev-ruby/ox/ox-2.7.0.ebuild +++ b/dev-ruby/ox/ox-2.7.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox" SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="" diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest index 67628f27d75a..981e3291f3ab 100644 --- a/dev-ruby/packetfu/Manifest +++ b/dev-ruby/packetfu/Manifest @@ -1,2 +1 @@ -DIST packetfu-1.1.11.gem 751104 SHA256 6ae9398fa707446e856c37f1160f3323695cd8b245732b78f281d9db8d2e2816 SHA512 c4e2a86ab331f87989e675777a7c47570afee1426007ac91387d5bd4594206c0ae9c0e180dd0f890558d46ff54d0298e89ef57bb4b433c1fea5644315d7b61b6 WHIRLPOOL 679f615c3a02597d9615bca96aab76b0aad24f9ca01cf57155bb554e2a6d23a513ba999bbf4d0ca1e556b530d7a83543ab9e25fdd4a34e1cefdc690617463054 DIST packetfu-1.1.13.gem 769024 SHA256 94a247b056617d6b6db8b682b21e8ad5193d745e8506a335149de0ee78c2f79a SHA512 c3ee67bfd597dcd197f213361ab94c614136304d8746de45b99322c1b6878eaef7c4a2ebc19be658d891df3e7d261476def27ae14990157dc6cb466815bd6f15 WHIRLPOOL d36cc51511b0a826de8e38b57ade9745aac477ce03cddbcb68121cb0134142985f8d209295c36ec6c8f487b442da2ba84a1025c5c3a90a12f3b1aeca81bab027 diff --git a/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild deleted file mode 100644 index 64405f485a37..000000000000 --- a/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_EXTRADOC="README.rdoc" - -inherit multilib ruby-fakegem - -DESCRIPTION="A mid-level packet manipulation library" -HOMEPAGE="https://rubygems.org/gems/packetfu" - -LICENSE="BSD" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~x86" - -ruby_add_rdepend " - dev-ruby/network_interface:0 - dev-ruby/pcaprub:0.12 -" - -ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 ) - dev-ruby/bundler" -DEPEND="${DEPEND} !dev-ruby/packetfu:0" - -all_ruby_prepare() { - [ -f Gemfile.lock ] && rm Gemfile.lock - #For now, we don't support development or testing at all - #if ! use development; then - sed -i -e "/^group :development do/,/^end$/d" Gemfile || die - sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die - sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die - #fi - #if ! use test; then - sed -i -e "/^group :test do/,/^end$/d" Gemfile || die - #fi - #if ! use test && ! use development; then - sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die - #fi -} - -each_ruby_prepare() { - if [ -f Gemfile ] - then - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die - fi -} diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-5.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.0.1.ebuild index d55f5a81cf0a..5fb9ad2a3824 100644 --- a/dev-ruby/puppetdb-termini/puppetdb-termini-5.0.1.ebuild +++ b/dev-ruby/puppetdb-termini/puppetdb-termini-5.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=5 -USE_RUBY="ruby21 ruby22" +USE_RUBY="ruby22 ruby23 ruby24" inherit unpacker diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest index 673fc3f5927d..e9c04c8f5f4b 100644 --- a/dev-ruby/rcairo/Manifest +++ b/dev-ruby/rcairo/Manifest @@ -1,4 +1,2 @@ DIST cairo-1.14.3.gem 97792 SHA256 e3a31ef8097c0b16f2ad71561dca37b4564ae3003838a82805aadeceb69d03b6 SHA512 aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772 WHIRLPOOL 724d072ad881f54cdcdc631399f99e6bdc563bc78f70c611bdeb3ddc659de78e4ce75c1ec51ac6659542e9ab8ae9c138caa610f97e37a6a1d69440313b69e6a9 -DIST cairo-1.15.4.gem 101376 SHA256 d6a0f70f6e1cac4385b28ed784fe4c4bccc7e9bc563ea7057f56ca737bc4a592 SHA512 c8e09f35dc3eddb3106a11230c38b58b03a98f0465d7d721b2ad6ccd90149ce010b7d5d873329c6704bde60ca943dbe6d325d662b6fefcac090ec1252f0b374e WHIRLPOOL 94699573c74edb4383916c0ee2b246efdcff99c69a06fe6ad1e1b5a90bfc8a5e4d2e5210f5d3b63e71f9d235f3a390af579bb844971b6da99ee1f1458fd382d3 -DIST cairo-1.15.5.gem 101376 SHA256 442a290fd9dda3fff1a154a2338464da9a59c1f7bf7cfbac647418e5eb3f5692 SHA512 5634334173fb99e2617056694fa5b4af8dfda8010a607329848b6e0e6de5c0f299a433b55525062af82ee228878098db0289b9d3e89aaa725a129e96cfa38660 WHIRLPOOL bf0466ce7dabc26ed2c3152807dcd33e21f883984d3eaea9bb9a74f421d22ccc2181ddbb43bb0ea2b990e2606a53b1a1fdd86a478d523b49e633cd6827c08bcc DIST cairo-1.15.9.gem 102400 SHA256 579727200f724a4da0c259e59bb79289de35ede0668dbe4b08883cc8e3b35325 SHA512 f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98 WHIRLPOOL 619fb1d76958876d51e17db68c0931cdb7886b9afaa34589d605e3e598dd3e63c49f5df12b98aa348e4af52c11c7672ed5244db0a914b37391e94d1562c34d3b diff --git a/dev-ruby/rcairo/rcairo-1.15.4.ebuild b/dev-ruby/rcairo/rcairo-1.15.4.ebuild deleted file mode 100644 index 00391710ba7a..000000000000 --- a/dev-ruby/rcairo/rcairo-1.15.4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22 ruby23" - -RUBY_FAKEGEM_NAME="cairo" - -# Documentation depends on files that are not distributed. -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_TASK_TEST="" - -RUBY_FAKEGEM_DOCDIR="doc" - -RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS" - -inherit multilib ruby-fakegem - -DESCRIPTION="Ruby bindings for cairo" -HOMEPAGE="https://cairographics.org/rcairo/" - -IUSE="" - -SLOT="0" -LICENSE="|| ( Ruby GPL-2 )" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="${RDEPEND} - >=x11-libs/cairo-1.2.0[svg]" -DEPEND="${DEPEND} - >=x11-libs/cairo-1.2.0[svg]" - -ruby_add_bdepend " - >=dev-ruby/pkg-config-1.1.5 - dev-ruby/ruby-glib2 - test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )" - -all_ruby_prepare() { - # Avoid development dependency. - sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/cairo extconf.rb || die "extconf failed" -} - -each_ruby_compile() { - emake V=1 -Cext/cairo - - # again, try to make it more standard, to install it more easily. - cp ext/cairo/cairo$(get_modname) lib/ || die -} - -each_ruby_test() { - # don't rely on the Rakefile because it's a mess to load with - # their hierarchy, do it manually. - ${RUBY} -Ilib -r ./test/cairo-test-utils.rb \ - -e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed" -} - -each_ruby_install() { - each_fakegem_install - - insinto $(ruby_get_hdrdir) - doins ext/cairo/rb_cairo.h -} - -all_ruby_install() { - all_fakegem_install - - insinto /usr/share/doc/${PF}/samples - doins -r samples/* -} diff --git a/dev-ruby/rcairo/rcairo-1.15.5.ebuild b/dev-ruby/rcairo/rcairo-1.15.5.ebuild deleted file mode 100644 index d4c5a784844b..000000000000 --- a/dev-ruby/rcairo/rcairo-1.15.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby21 ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_NAME="cairo" - -# Documentation depends on files that are not distributed. -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_TASK_TEST="" - -RUBY_FAKEGEM_DOCDIR="doc" - -RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS" - -inherit multilib ruby-fakegem - -DESCRIPTION="Ruby bindings for cairo" -HOMEPAGE="https://cairographics.org/rcairo/" - -IUSE="" - -SLOT="0" -LICENSE="|| ( Ruby GPL-2 )" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="${RDEPEND} - >=x11-libs/cairo-1.2.0[svg]" -DEPEND="${DEPEND} - >=x11-libs/cairo-1.2.0[svg]" - -ruby_add_bdepend " - >=dev-ruby/pkg-config-1.1.5 - dev-ruby/ruby-glib2 - test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )" - -all_ruby_prepare() { - # Avoid development dependency. - sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/cairo extconf.rb || die "extconf failed" -} - -each_ruby_compile() { - emake V=1 -Cext/cairo - - # again, try to make it more standard, to install it more easily. - cp ext/cairo/cairo$(get_modname) lib/ || die -} - -each_ruby_test() { - # don't rely on the Rakefile because it's a mess to load with - # their hierarchy, do it manually. - ${RUBY} -Ilib -r ./test/cairo-test-utils.rb \ - -e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed" -} - -each_ruby_install() { - each_fakegem_install - - insinto $(ruby_get_hdrdir) - doins ext/cairo/rb_cairo.h -} - -all_ruby_install() { - all_fakegem_install - - insinto /usr/share/doc/${PF}/samples - doins -r samples/* -} diff --git a/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild b/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild index 8a16b08ca4d5..a2ad6e573009 100644 --- a/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild +++ b/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild @@ -24,7 +24,7 @@ IUSE="" SLOT="0" LICENSE="|| ( Ruby GPL-2 )" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" RDEPEND="${RDEPEND} >=x11-libs/cairo-1.2.0[svg]" diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild index ad056d57506f..47c535cbaf51 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild @@ -3,7 +3,7 @@ EAPI="5" -USE_RUBY="ruby21 ruby22" +USE_RUBY="ruby22 ruby23 ruby24" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/rubygems/rubygems-2.6.13.ebuild b/dev-ruby/rubygems/rubygems-2.6.13.ebuild index 5cfd28e682d3..860048ab5c5b 100644 --- a/dev-ruby/rubygems/rubygems-2.6.13.ebuild +++ b/dev-ruby/rubygems/rubygems-2.6.13.ebuild @@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )" SRC_URI="https://rubygems.org/rubygems/${P}.tgz" -KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="server test" diff --git a/dev-ruby/rubytter/rubytter-1.5.1.ebuild b/dev-ruby/rubytter/rubytter-1.5.1.ebuild deleted file mode 100644 index 8bfce4ae36b2..000000000000 --- a/dev-ruby/rubytter/rubytter-1.5.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -USE_RUBY="ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -RUBY_FAKEGEM_DOCDIR="rdoc" -RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*" - -inherit ruby-fakegem - -DESCRIPTION="Rubytter is a simple twitter library" -HOMEPAGE="https://wiki.github.com/jugyo/rubytter" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/json-1.1.3 >=dev-ruby/oauth-0.3.6" - -all_ruby_prepare() { - sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die -} diff --git a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild index 0ffcecaaaf6c..6fb5f0ed3ef4 100644 --- a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild +++ b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://tzinfo.github.io/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="" diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild index 985a20e0b181..8ef2241712f2 100644 --- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild +++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="${RDEPEND} dev-libs/yajl" diff --git a/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch new file mode 100644 index 000000000000..533cbc0c75cf --- /dev/null +++ b/dev-tex/latex2html/files/latex2html-2017.2-brace-2.patch @@ -0,0 +1,12 @@ +diff -ruN latex2html-2017.2.orig/styles/frames.perl latex2html-2017.2/styles/frames.perl +--- latex2html-2017.2.orig/styles/frames.perl 2017-01-23 18:14:25.000000000 +0100 ++++ latex2html-2017.2/styles/frames.perl 2017-09-23 15:49:27.184088195 +0200 +@@ -706,7 +706,7 @@ + $_[0] =~ s/<(META NAME|LINK)[^>]*>\s*//g; + $_[0] =~ s/$more_links_mark/$NO_ROBOTS\n$LATEX2HTML_META/g; + local($savedRS)=$/; $/ = ''; +- $_[0] =~ s/\n{2;}/\n/sg; ++ $_[0] =~ s/\n\{2;}/\n/sg; + $_[0] =~ s/\s$//s; + $_[0] =~ s!\s*(\n\n)\s*!$1!s; + $/ = $savedRS; diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild new file mode 100644 index 000000000000..68f635740cb5 --- /dev/null +++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Convertor written in Perl that converts LATEX documents to HTML" +HOMEPAGE="http://www.latex2html.org/" +SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="gif png" + +DEPEND="app-text/ghostscript-gpl + virtual/latex-base + media-libs/netpbm + dev-lang/perl + gif? ( media-libs/giflib ) + png? ( media-libs/libpng:0 )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}"-{destdir,tests}.patch + "${FILESDIR}/${P}"-dotinc.patch + "${FILESDIR}/${P}"-dotinc-2.patch + "${FILESDIR}/${P}"-brace.patch + "${FILESDIR}/${P}"-brace-2.patch +) + +src_prepare() { + default + + sed -i -e 's%@PERL@%'"${EPREFIX}"'/usr/bin/perl%g' wrapper/unix.pin || die +} + +src_configure() { + local myconf + + use gif || use png || myconf="${myconf} --disable-images" + + econf --libdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \ + --shlibdir="${EPREFIX}"/usr/$(get_libdir)/latex2html \ + --enable-pk \ + --enable-eps \ + --enable-reverse \ + --enable-pipes \ + --enable-paths \ + --enable-wrapper \ + --with-texpath="${EPREFIX}"/usr/share/texmf-site/tex/latex/html \ + --without-mktexlsr \ + $(use_enable gif) \ + $(use_enable png) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + # make /usr/share/latex2html sticky + keepdir /usr/share/latex2html + + # clean the perl scripts up to remove references to the sandbox + local dir="${ED}/usr/$(get_libdir)/latex2html" + if use png || use gif; then + # pstoimg isn't built unless gif or png useflags are enabled + sed -i -e "s:${T}:/tmp:g" "${dir}"/pstoimg.pl || die + fi + sed -i -e "s:${S}::g" "${dir}"/latex2html.pl || die + sed -i -e "s:${T}:/tmp:g" "${dir}"/cfgcache.pm || die + sed -i -e "s:${T}:/tmp:g" "${dir}"/l2hconf.pm || die + + dodoc BUGS Changes FAQ MANIFEST README.md TODO +} + +pkg_postinst() { + "${EROOT}"/usr/bin/mktexlsr +} + +pkg_postrm() { + "${EROOT}"/usr/bin/mktexlsr +} diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild index cdf34426d187..009601bfd42f 100644 --- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild +++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch new file mode 100644 index 000000000000..a7a0a09dc162 --- /dev/null +++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch @@ -0,0 +1,36 @@ +--- a/mingw-w64-crt/lib32/msvcrt.def.in ++++ b/mingw-w64-crt/lib32/msvcrt.def.in +@@ -138,6 +138,7 @@ _copysign + _cprintf + _cputs + _creat ++_create_locale + _cscanf + _ctype DATA + _cwait +@@ -192,6 +193,7 @@ _fpieee_flt + _fpreset DATA + _fputchar + _fputwchar ++_free_locale + _fsopen + _fstat + _fstat32 == _fstat +--- a/mingw-w64-crt/lib64/msvcrt.def.in ++++ b/mingw-w64-crt/lib64/msvcrt.def.in +@@ -240,6 +240,7 @@ _cprintf_p_l + _cputs + _cputws + _creat ++_create_locale + _cscanf + _cscanf_l + _cscanf_s +@@ -315,6 +316,7 @@ _fputchar + _fputwchar + _fscanf_l + _fscanf_s_l ++_free_locale + _fsopen + _fstat + _fstat64 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild new file mode 100644 index 000000000000..0edd83c00354 --- /dev/null +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +WANT_AUTOMAKE="1.15" + +inherit autotools flag-o-matic eutils + +DESCRIPTION="Free Win64 runtime and import library definitions" +HOMEPAGE="http://mingw-w64.sourceforge.net/" +SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crosscompile_opts_headers-only idl libraries tools" +RESTRICT="strip" + +S="${WORKDIR}/mingw-w64-v${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.1-winpthreads.patch" + "${FILESDIR}/${PN}-4.0.1-build.patch" + "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch" + "${FILESDIR}/${PN}-5.0.2-locale.patch" +) + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +just_headers() { + use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] +} +crt_with() { + just_headers && echo --without-$1 || echo --with-$1 +} +crt_use_enable() { + just_headers && echo --without-$2 || use_enable "$@" +} +crt_use_with() { + just_headers && echo --without-$2 || use_with "$@" +} + +pkg_setup() { + if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then + die "Invalid configuration" + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + CHOST=${CTARGET} strip-unsupported-flags + + if ! just_headers; then + mkdir "${WORKDIR}/headers" + pushd "${WORKDIR}/headers" > /dev/null + CHOST=${CTARGET} "${S}/configure" \ + --prefix="${T}/tmproot" \ + --with-headers \ + --without-crt \ + || die + popd > /dev/null + append-cppflags "-I${T}/tmproot/include" + fi + + CHOST=${CTARGET} econf \ + --prefix=/usr/${CTARGET} \ + --includedir=/usr/${CTARGET}/usr/include \ + --libdir=/usr/${CTARGET}/usr/lib \ + --with-headers \ + --enable-sdk \ + $(crt_with crt) \ + $(crt_use_enable idl) \ + $(crt_use_with libraries libraries winpthreads,libmangle) \ + $(crt_use_with tools) \ + $( + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + ) +} + +src_compile() { + if ! just_headers; then + emake -C "${WORKDIR}/headers" install + fi + default +} + +src_install() { + default + + if is_crosscompile ; then + # gcc is configured to look at specific hard-coded paths for mingw #419601 + dosym usr /usr/${CTARGET}/mingw + dosym usr /usr/${CTARGET}/${CTARGET} + dosym usr/include /usr/${CTARGET}/sys-include + fi + + env -uRESTRICT CHOST=${CTARGET} prepallstrip + rm -rf "${ED}/usr/share" +} diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest index cab3f72bbc0c..b56888065bd2 100644 --- a/dev-util/sysdig/Manifest +++ b/dev-util/sysdig/Manifest @@ -1 +1,2 @@ DIST sysdig-0.17.0.tar.gz 718719 SHA256 f009acc32f2b15fcb0d2267bde6f6de9b3445179003c979ba61a8836abdb78f9 SHA512 476e130151d1a8e9e782f074c45448becbef10397c0040e33febaf89c73f22c1716ebeeb2683f489a74c83f5d67174c9f21bb05d4327f35fb03ca1b9822889bc WHIRLPOOL a8f3e0aa45e00d9e6b02e0c26f3ec2f91cbf4d9a6caf955684617e2a1e7c9c0b92c0bdda3b2c254129008ea42bd2386710ef391714e13631e0e7d62fe9226ed0 +DIST sysdig-0.18.0.tar.gz 739774 SHA256 9caab6b4ef4a6d9f9ded8f79b1fcbe34a918c61b6f3b5a15d803f0f25e73497a SHA512 51649bc965d54b0e4b6c17d3b8f6a9c1710300b371c556193f04f25c71acbc96da1bfb6c636f8afdd8544de39d7bb1db0bd8ecc39d18d6f1f238d9e7819f0265 WHIRLPOOL de150a7254428edf88fbe34226ebb1bc96270fbb942d70cc483cef7c04e7a31e43e8efd070b44d78991bdeabc88bfd90370f0cfa7fcb71b41b72c4fd005f4e8c diff --git a/dev-util/sysdig/sysdig-0.18.0.ebuild b/dev-util/sysdig/sysdig-0.18.0.ebuild new file mode 100644 index 000000000000..ebc9e98519ac --- /dev/null +++ b/dev-util/sysdig/sysdig-0.18.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +MODULES_OPTIONAL_USE=modules +inherit linux-mod bash-completion-r1 cmake-utils + +DESCRIPTION="A system exploration and troubleshooting tool" +HOMEPAGE="https://www.sysdig.org/" +SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+modules" + +RDEPEND=" + app-misc/jq:0= + dev-lang/luajit:2= + >=dev-libs/jsoncpp-0.6_pre:0= + dev-libs/libb64:0= + sys-libs/ncurses:0= + sys-libs/zlib:0= + dev-libs/openssl:0= + net-misc/curl:0=" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/os-headers" + +# needed for the kernel module +CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" + +pkg_pretend() { + linux-mod_pkg_setup +} + +pkg_setup() { + linux-mod_pkg_setup +} + +src_prepare() { + sed -i -e 's:-ggdb::' CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + # we will use linux-mod for that + -DBUILD_DRIVER=OFF + # libscap examples are not installed or really useful + -DBUILD_LIBSCAP_EXAMPLES=OFF + + # unbundle the deps + -DUSE_BUNDLED_DEPS=OFF + ) + + cmake-utils_src_configure + + # setup linux-mod ugliness + MODULE_NAMES="sysdig-probe(extra:${S}/driver:)" + BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"' + BUILD_TARGETS="all" + + if use modules; then + cmake-utils_src_make configure_driver + + cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die + fi +} + +src_compile() { + cmake-utils_src_compile + + linux-mod_src_compile +} + +src_install() { + cmake-utils_src_install + + linux-mod_src_install + + # remove sources + rm -r "${ED%/}"/usr/src || die + + # move bashcomp to the proper location + dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die + rm -r "${ED%/}"/usr/etc || die +} diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild index 57c895c00f68..9dd270b6827f 100644 --- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild +++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="crypt doc kerberos nls pam server" RESTRICT="test" diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild index e7f4f96450a5..df94ced13860 100644 --- a/dev-vcs/darcs/darcs-2.12.5.ebuild +++ b/dev-vcs/darcs/darcs-2.12.5.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+curl +network-uri +terminfo +threaded" RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] /dev/null || die + + # make ${S} read-only in order to detect broken build-systems + if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then + chmod -R a-w "${S}" + fi + + _CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1 } # @VARIABLE: mycmakeargs @@ -465,6 +478,10 @@ cmake-utils_src_prepare() { cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" + if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then + eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/" + fi + [[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake _cmake_check_build_dir diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild index 101cd3e9609a..3bf1d5f007da 100644 --- a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild +++ b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-games/goatee-0.3:=[profile?] =dev-ruby/trollop-2.1.2:2 + >=dev-ruby/paint-2.0.0" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild index 905435a6207f..17aa63ed079c 100644 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild @@ -11,7 +11,7 @@ IUSE="+bluetooth +cdr cups" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~ia64 x86" +KEYWORDS="amd64 ~ia64 ~ppc64 x86" # Note to developers: # This is a wrapper for the core apps tightly integrated with GNOME 3 diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild index e51c2332b1ca..bd061e7712a4 100644 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild @@ -11,7 +11,7 @@ IUSE="+bluetooth +cdr cups" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="~amd64 ~ia64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" # Note to developers: # This is a wrapper for the core apps tightly integrated with GNOME 3 diff --git a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild index 8527a7898929..331f81ec0b54 100644 --- a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild +++ b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild @@ -15,7 +15,7 @@ IUSE="cups +gnome-shell" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~ia64 x86" +KEYWORDS="amd64 ~ia64 ~ppc64 x86" # XXX: Note to developers: # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of diff --git a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild index 180917e5daf0..549726cc2297 100644 --- a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild +++ b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild @@ -15,7 +15,7 @@ IUSE="cups +gnome-shell" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="~amd64 ~ia64 ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" # XXX: Note to developers: # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild index 712f5bf27aea..76625b33ba7b 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild @@ -18,7 +18,7 @@ REQUIRED_USE=" input_devices_wacom? ( udev ) smartcard? ( udev ) " -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" COMMON_DEPEND=" >=dev-libs/glib-2.37.7:2[dbus] diff --git a/gnome-base/gnome/gnome-3.22.2.ebuild b/gnome-base/gnome/gnome-3.22.2.ebuild index e9829caf77e8..b06d9aa3ccd0 100644 --- a/gnome-base/gnome/gnome-3.22.2.ebuild +++ b/gnome-base/gnome/gnome-3.22.2.ebuild @@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2 # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="accessibility +bluetooth +classic +cdr cups +extras" diff --git a/gnome-base/gnome/gnome-3.24.0.ebuild b/gnome-base/gnome/gnome-3.24.0.ebuild index 42d8d74dc63e..f3b4c70ad1d5 100644 --- a/gnome-base/gnome/gnome-3.24.0.ebuild +++ b/gnome-base/gnome/gnome-3.24.0.ebuild @@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2 # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="accessibility +bluetooth +classic +cdr cups +extras" diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild index 92ff685253ec..29ae1c06bbd9 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild @@ -17,7 +17,7 @@ LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 SLOT="0" IUSE="debug +introspection test vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" RDEPEND=" >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] diff --git a/gnome-base/nautilus/nautilus-3.22.3.ebuild b/gnome-base/nautilus/nautilus-3.22.3.ebuild index b809db7cff94..f5495d193a14 100644 --- a/gnome-base/nautilus/nautilus-3.22.3.ebuild +++ b/gnome-base/nautilus/nautilus-3.22.3.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" -KEYWORDS="~alpha amd64 ~arm64 ~ia64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild index 8a1b84a37249..3f56127c972f 100644 --- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild +++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" -KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" diff --git a/kde-frameworks/prison/prison-5.38.0.ebuild b/kde-frameworks/prison/prison-5.38.0.ebuild index d06ff10643f5..c58970ce3531 100644 --- a/kde-frameworks/prison/prison-5.38.0.ebuild +++ b/kde-frameworks/prison/prison-5.38.0.ebuild @@ -14,7 +14,7 @@ IUSE="" DEPEND=" $(add_qt_dep qtgui) - media-gfx/qrencode + media-gfx/qrencode:= media-libs/libdmtx " RDEPEND="${DEPEND}" diff --git a/kde-misc/plasma-applet-weather-widget/Manifest b/kde-misc/plasma-applet-weather-widget/Manifest index f81fc1078fab..bd9a797ea4c1 100644 --- a/kde-misc/plasma-applet-weather-widget/Manifest +++ b/kde-misc/plasma-applet-weather-widget/Manifest @@ -1,2 +1 @@ -DIST plasma-applet-weather-widget-1.6.8.tar.gz 104894 SHA256 6632643ea20b090556ff916d4f17094f89c715bff89084189f72c523f8d38603 SHA512 4fcdcf40fd93e1ee0a86b8588e7546dd934ba2e1c5d4adda99464fff8d1134be687b09e5e4a7f51d36e9f1206238e35db815a77707ddb80c78b8d563a01dfbee WHIRLPOOL 84371868174d708aee942995eaf09f3a04051a42ba63f1a32878cffdd7b50f57f230eaa18026886097e717ed204b6278ff2fe41b1debc9a8ac8ffcf2d8b886c9 -DIST plasma-applet-weather-widget-1.6.9.tar.gz 106942 SHA256 9447a01adf3589006efea647daf3cc5eac74362dcd6475738164ccaac3a8ad98 SHA512 fd8a99fc8c78b90f1553547b3733aa337acb5e39efd242426ae91847694aa1163363f5415e6fa3d83a2bcd90493c4ef24be721d6f915c9ed8b1fb6503699f5d1 WHIRLPOOL 5c4e1752d519be1f3b818dd8e8e888006c82bc5f17f2cddfd93720de25bc5d475c31b590740053f41d8991ca42026bf8b42fd74b51ff600b5c519a9818312542 +DIST plasma-applet-weather-widget-1.6.10.tar.gz 107848 SHA256 9557441285121be52bfe27fa2bb214e865132b8581953faf88f1fae4ae1e87f2 SHA512 5db4c2e426b9b8296b70ec4edf5fc2dbc5e8056f66327569008a77b05201896ed23039aae063807726376e203d637053884bfeeac78c59c519b7fc5685797331 WHIRLPOOL b2f8b570d1ea97f39f742f2a546d8cf294c8af814283ea78c236a1672c460e04c6e3eb2134b3dde82e2a28d0143108cccf59d523e3a5abb9742e706388d15be8 diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.8.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild similarity index 100% rename from kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.8.ebuild rename to kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild deleted file mode 100644 index 88e387288f6f..000000000000 --- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Plasma 5 applet for weather forecasts" -HOMEPAGE="https://store.kde.org/content/show.php/Weather+Widget?content=169572 -https://github.com/kotelnik/plasma-applet-weather-widget" - -if [[ ${KDE_BUILD_TYPE} = live ]] ; then - EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git" -else - SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2+" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - $(add_frameworks_dep plasma) - $(add_qt_dep qtdeclarative 'xml') -" -RDEPEND="${DEPEND}" - -DOCS=( README.md ) diff --git a/mail-client/evolution/evolution-3.22.6.ebuild b/mail-client/evolution/evolution-3.22.6.ebuild index ac18731b7487..7a1e260d2600 100644 --- a/mail-client/evolution/evolution-3.22.6.ebuild +++ b/mail-client/evolution/evolution-3.22.6.ebuild @@ -15,7 +15,7 @@ SLOT="2.0" IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather" -KEYWORDS="~alpha amd64 ~ia64 x86" +KEYWORDS="~alpha amd64 ~ia64 ~ppc64 x86" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 diff --git a/mail-client/evolution/evolution-3.24.5.ebuild b/mail-client/evolution/evolution-3.24.5.ebuild index 15ce660ad9d1..c2075f7b38a3 100644 --- a/mail-client/evolution/evolution-3.24.5.ebuild +++ b/mail-client/evolution/evolution-3.24.5.ebuild @@ -15,7 +15,7 @@ SLOT="2.0" IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather" -KEYWORDS="~alpha ~amd64 ~ia64 ~x86" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 43a0d6532647..9fe7ae37c184 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,6 +1,6 @@ DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4 -DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6 +DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c -DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999 DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467 +DIST mutt-gentoo-1.9.1-patches-r0.tar.xz 112300 SHA256 9d3c18ae5602c2e6881faf02eeffd87233589ed85eed99624834858768d3480f SHA512 c8686042e570c9411e7c36a539068a95e9a2d691a7b88226b2ab0875fdcea7aeadbe549858374221ea40844301aa592c244e5fe3aeeeddf8dcf88ecc88129b3a WHIRLPOOL 3665504c548c8439e475b70f672df8db3e56295db94354b6e45f4deab8a7bf23e1933df90a93228d9053bb451df7869e39cb048e8eb310ee06fbb90f950568a5 diff --git a/mail-client/mutt/mutt-1.8.3.ebuild b/mail-client/mutt/mutt-1.9.1.ebuild similarity index 99% rename from mail-client/mutt/mutt-1.8.3.ebuild rename to mail-client/mutt/mutt-1.9.1.ebuild index b9e0fd0f6fc6..f7385cf01944 100644 --- a/mail-client/mutt/mutt-1.8.3.ebuild +++ b/mail-client/mutt/mutt-1.9.1.ebuild @@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" +IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix" REQUIRED_USE=" hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild index a402bb7b4963..f9e7a0683a5c 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz" LICENSE="GPL-2 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq" DEPEND=">=sys-apps/sed-4 diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild index faa907017a14..b50747597c0d 100644 --- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild +++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild @@ -12,7 +12,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes LICENSE="GPL-2 BSD-2" SLOT="0" -KEYWORDS="amd64 hppa ppc64 x86" +KEYWORDS="amd64 hppa ~ppc ppc64 x86" IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq" DEPEND=">=sys-apps/sed-4 diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild index 414b9351f9f1..780a06db52ea 100644 --- a/media-libs/Field3D/Field3D-1.7.2.ebuild +++ b/media-libs/Field3D/Field3D-1.7.2.ebuild @@ -22,7 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -PATCHES=( "${FILESDIR}/Field3D-1.7.2-openexr-fixes.patch" ) +PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" ) # Docs are not finished yet. mycmakeargs=( -DINSTALL_DOCS=OFF ) diff --git a/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch b/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch new file mode 100644 index 000000000000..e967d20244c3 --- /dev/null +++ b/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch @@ -0,0 +1,142 @@ +From 5656d8dc657f4702c67fbabfab8922c80e0cf778 Mon Sep 17 00:00:00 2001 +From: Jonathan Scruggs +Date: Sat, 23 Sep 2017 16:08:48 +0100 +Subject: [PATCH] Use PkgConfig for IlmBase + +--- + CMakeLists.txt | 15 +++++++------- + cmake/FindILMBase.cmake | 54 ------------------------------------------------- + 2 files changed, 8 insertions(+), 61 deletions(-) + delete mode 100644 cmake/FindILMBase.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e9ad44f..864f0d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,9 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) + + PROJECT ( field3d ) + +-set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) ++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ) + ++FIND_PACKAGE ( PkgConfig ) + FIND_PACKAGE (Doxygen) + FIND_PACKAGE (HDF5) + IF ( CMAKE_HOST_WIN32 ) +@@ -49,7 +50,7 @@ FIND_PACKAGE (Boost COMPONENTS regex thread program_options system) + FIND_PACKAGE (MPI) + ENDIF () + +-FIND_PACKAGE (ILMBase) ++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase ) + + # Allow the developer to select if Dynamic or Static libraries are built + OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) +@@ -65,14 +66,14 @@ INCLUDE_DIRECTORIES ( . ) + INCLUDE_DIRECTORIES ( src ) + INCLUDE_DIRECTORIES ( export ) + INCLUDE_DIRECTORIES ( include ) +-INCLUDE_DIRECTORIES ( ${ILMBASE_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} ) + INCLUDE_DIRECTORIES ( ${HDF5_INCLUDE_DIRS} ) + INCLUDE_DIRECTORIES ( ${Boost_INCLUDE_DIR} ) + + # link directories + LINK_DIRECTORIES ( ${Boost_LIBRARY_DIRS} ) + LINK_DIRECTORIES ( ${HDF5_LIBRARY_DIRS} ) +-LINK_DIRECTORIES ( ${ILMBASE_LIBRARY_DIRS} ) ++LINK_DIRECTORIES ( ${ILMBASE_LIBS_LIBRARY_DIRS} ) + + IF ( CMAKE_HOST_UNIX ) + ADD_DEFINITIONS ( -fPIC -DREQUIRE_IOSTREAM -Wno-invalid-offsetof ) +@@ -147,7 +148,7 @@ IF ( CMAKE_HOST_UNIX ) + ${MPI_LIBRARIES} ) + ENDIF ( MPI_FOUND ) + LIST ( APPEND Field3D_Libraries_Shared +- Iex Half IlmThread Imath ++ ${ILMBASE_LIBS_LIBRARIES} + pthread dl z ) + SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} ) + SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared} +@@ -155,7 +156,7 @@ IF ( CMAKE_HOST_UNIX ) + ENDIF ( ) + IF ( CMAKE_HOST_WIN32 ) + # Add OpenEXR and zlib release/debug +- FOREACH ( lib Iex Half IlmThread Imath zdll ) ++ FOREACH ( lib ${ILMBASE_LIBS_LIBRARIES} zdll ) + LIST ( APPEND Field3D_Libraries_Shared + optimized ${lib} + debug ${lib}_d ) +@@ -164,7 +165,7 @@ IF ( CMAKE_HOST_WIN32 ) + SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} ) + ENDIF () + +-TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES}) ++TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} ) + + # Parase version and soversion from export/ns.h + +diff --git a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake +deleted file mode 100644 +index c555100..0000000 +--- a/cmake/FindILMBase.cmake ++++ /dev/null +@@ -1,54 +0,0 @@ +-# Copyright (c) 2009 Sony Pictures Imageworks Inc. et al. +-# +-# All rights reserved. +-# +-# Redistribution and use in source and binary forms, with or without +-# modification, are permitted provided that the following conditions +-# are met: +-# +-# Redistributions of source code must retain the above copyright +-# notice, this list of conditions and the following disclaimer. +-# Redistributions in binary form must reproduce the above copyright +-# notice, this list of conditions and the following disclaimer in the +-# documentation and/or other materials provided with the +-# distribution. Neither the name of Sony Pictures Imageworks nor the +-# names of its contributors may be used to endorse or promote +-# products derived from this software without specific prior written +-# permission. +-# +-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +-# OF THE POSSIBILITY OF SUCH DAMAGE. +- +-# Author : Nicholas Yue yue.nicholas@gmail.com +- +-# This module will define the following variables: +-# ILMBASE_INCLUDE_DIRS - Location of the ilmbase includes +-# ILMBASE_LIBRARIES - [TODO] Required libraries for all requested bindings +-# ILMBASE_FOUND - true if ILMBASE was found on the system +-# ILMBASE_LIBRARY_DIRS - the full set of library directories +- +-FIND_PATH ( Ilmbase_Base_Dir include/OpenEXR/IlmBaseConfig.h +- ENV ILMBASE_ROOT +- ) +- +-IF ( Ilmbase_Base_Dir ) +- +- SET ( ILMBASE_INCLUDE_DIRS +- ${Ilmbase_Base_Dir}/include +- ${Ilmbase_Base_Dir}/include/OpenEXR +- CACHE STRING "ILMBase include directories") +- SET ( ILMBASE_LIBRARY_DIRS ${Ilmbase_Base_Dir}/lib +- CACHE STRING "ILMBase library directories") +- SET ( ILMBASE_FOUND TRUE ) +- +-ENDIF ( Ilmbase_Base_Dir ) +-- +2.14.1 + diff --git a/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch b/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch deleted file mode 100644 index 41ab1ccf2945..000000000000 --- a/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -purN a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake ---- a/cmake/FindILMBase.cmake 2016-06-19 05:56:00.000000000 +0100 -+++ b/cmake/FindILMBase.cmake 2017-03-02 11:44:35.449043588 +0000 -@@ -37,12 +37,17 @@ - # ILMBASE_FOUND - true if ILMBASE was found on the system - # ILMBASE_LIBRARY_DIRS - the full set of library directories - -+find_package(PkgConfig QUIET) -+if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_ILMBASE QUIET IlmBase) -+endif() -+ - FIND_PATH ( Ilmbase_Base_Dir include/OpenEXR/IlmBaseConfig.h - ENV ILMBASE_ROOT - ) - - IF ( Ilmbase_Base_Dir ) -- -+ SET ( IlmBase_VERSION ${PC_ILMBASE_VERSION} ) - SET ( ILMBASE_INCLUDE_DIRS - ${Ilmbase_Base_Dir}/include - ${Ilmbase_Base_Dir}/include/OpenEXR -diff -purN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-06-19 05:56:00.000000000 +0100 -+++ b/CMakeLists.txt 2017-03-02 11:44:37.029035041 +0000 -@@ -146,8 +146,11 @@ IF ( CMAKE_HOST_UNIX ) - LIST ( APPEND Field3D_Libraries_Shared - ${MPI_LIBRARIES} ) - ENDIF ( MPI_FOUND ) -+ # handle new library names for 2.0.0 -+ STRING ( REPLACE "." "_" _IlmBase_VERSION ${IlmBase_VERSION} ) -+ STRING ( SUBSTRING ${_IlmBase_VERSION} 0 3 _IlmBase_VERSION ) - LIST ( APPEND Field3D_Libraries_Shared -- Iex Half IlmThread Imath -+ Iex-${_IlmBase_VERSION} Half IlmThread-${_IlmBase_VERSION} Imath-${_IlmBase_VERSION} - pthread dl z ) - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} ) - SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared} diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 720558b6a152..8c6e3fe103a2 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,3 +1,3 @@ DIST fontconfig-2.11.1.tar.bz2 1516095 SHA256 dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149 WHIRLPOOL 45009a1e0fcbbe2f532c6f642a0d57af35af3f6abfb50098c89fe39c71da96597078eb4babdd80a713ef4456e07481d70def7c1c18b7314452136d5b30a4858b -DIST fontconfig-2.12.3.tar.bz2 1600509 SHA256 bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd SHA512 311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7 WHIRLPOOL 7b3ec6f364d1b701ae1eb676b3f4cffef91af2d0b3f78719119449dfc6d679d1da20224e9148aa970d60c0d531ee5dfbb3c256ffc18edb142648fa06c0704c93 DIST fontconfig-2.12.4.tar.bz2 1613580 SHA256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81 WHIRLPOOL 6f0b98e80bdbe5077047b42c7b998a7879e8cd1a7d53598ed6d1cc7110e7ba99b4d3cac6c14875744f7d43e05f338eec1588934e5511e3b1cd8d28d7292fcd72 +DIST fontconfig-2.12.6.tar.bz2 1624683 SHA256 cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06 WHIRLPOOL 45741ad1389604325bdd517098edf8075a4302d35c680eb5b2280732c112c4c65521fa6b84c58647b4629a57b244f5e717d8a70afc14f3b72a8652c0670a63de diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch deleted file mode 100644 index 033fe895bc10..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- fontconfig-2.11.93.orig/conf.d/60-latin.conf 2015-04-18 20:06:06.070687989 +0800 -+++ fontconfig-2.11.93/conf.d/60-latin.conf 2015-04-18 20:14:15.245732796 +0800 -@@ -4,46 +4,49 @@ - - serif - -- Bitstream Vera Serif -+ Liberation Serif - DejaVu Serif - Times New Roman -- Thorndale AMT - Luxi Serif - Nimbus Roman No9 L - Nimbus Roman - Times -+ Thorndale AMT -+ Bitstream Vera Serif - - - - sans-serif - -- Bitstream Vera Sans -+ Liberation Sans - DejaVu Sans -- Verdana - Arial -- Albany AMT - Luxi Sans - Nimbus Sans L - Nimbus Sans - Helvetica - Lucida Sans Unicode - BPG Glaho International -+ Verdana - Tahoma -+ Albany AMT -+ Bitstream Vera Sans - - - - monospace - -- Bitstream Vera Sans Mono -+ Liberation Mono - DejaVu Sans Mono - Inconsolata - Andale Mono - Courier New -- Cumberland AMT - Luxi Mono - Nimbus Mono L - Nimbus Mono - Courier -+ Cumberland AMT -+ Bitstream Vera Sans Mono - - - - - EiskaltDC++ is a multi-platform program that uses the Direct Connect and - ADC protocol. It is compatible with other DC clients, such as the original DC - from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all - common DC hub software. - - - Enable sample cli based on readline - Enable eiskaltdcpp-daemon - Enable DHT (distributed hash table) support for libeiskaltdcpp - Install emoticon packs - Enable JSON for cli and daemon - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk - Don't install headers - - - eiskaltdcpp/eiskaltdcpp - + + + EiskaltDC++ is a multi-platform program that uses the Direct Connect and + ADC protocol. It is compatible with other DC clients, such as the original DC + from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all + common DC hub software. + + + Enable sample cli based on readline + Enable eiskaltdcpp-daemon + Enable DHT (distributed hash table) support for libeiskaltdcpp + Enable JSON for cli and daemon + Enable sound notifications support over libcanberra in EiskaltDC++ Gtk + Don't install headers + + + eiskaltdcpp/eiskaltdcpp + diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 646cfa7175be..698850796945 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,4 +1,3 @@ DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97 DIST qbittorrent-3.3.12-cmake-3.8.patch.gz 18330 SHA256 8172d04af3621ed0859ff541ae6c6e73f469125e0b7defd591191ab8c233e658 SHA512 e5aa6aa32f12c47a28658b2382faca88b64be1c198c69ad88f4fcd9f18d2db7a4e71c170dffd142b5af0184105b04dc2409417761db8859f622d42af7d25b060 WHIRLPOOL a68723a52858aed3e0474e0ccc3bcde7a451b388c8cd30ea5548f53e950902e234cb7e9cc32a86c75e367c4cad33a40beab52619de0a1f27442b89a10c25e67f DIST qbittorrent-3.3.12.tar.xz 2989604 SHA256 56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f SHA512 537ded71c75b3ab3fe014d77b5c4f8069ebb7a1aa94b5190b16e9ee910bfb70d462e5a3a536ba9222a97d8cceac00af0d33a92b7414b17724694d364fc2374df WHIRLPOOL 9f3b7cb85885691ea747b2569690aa3d1189798be6000e9ec2c8af65ccd86010be877af10b540422233f5b8c253bf221fad0fea6fdc9a0b5dcbc3cedf50613bd -DIST qbittorrent-3.3.7.tar.xz 2884792 SHA256 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 SHA512 c33ae47bd78e79197fd499e9541ce20a30c0ee582c6696f72b792a46324a42bffbe2140f6dcb89c05d9366b7332845e108c661c0458e94ca5739cfc71be4dafc WHIRLPOOL 753efd5e30c725d77e241bfc4cee63f089109b4a85bab5224e5445d141605c07bb8873531245d17f577252ae1d90041457848e9290ecb2384d96f2a20bbf6f66 diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild deleted file mode 100644 index 8b69c98f8fe3..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-3.3.7.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 flag-o-matic qmake-utils - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="http://www.qbittorrent.org/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" -else - MY_P=${P/_} - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" - S=${WORKDIR}/${MY_P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus debug +qt5 webui +X" -REQUIRED_USE="dbus? ( X )" - -RDEPEND=" - dev-libs/boost:= - >=net-libs/libtorrent-rasterbar-1.0.6 - sys-libs/zlib - !qt5? ( - >=dev-libs/qjson-0.8.1[qt4(+)] - dev-qt/qtcore:4[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt4,X?] - dbus? ( dev-qt/qtdbus:4 ) - X? ( dev-qt/qtgui:4 ) - ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] - dev-qt/qtxml:5 - dbus? ( dev-qt/qtdbus:5 ) - X? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - ) -" -DEPEND="${RDEPEND} - qt5? ( dev-qt/linguist-tools:5 ) - virtual/pkgconfig -" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) - -src_configure() { - # workaround build issue with older boost - # https://github.com/qbittorrent/qBittorrent/issues/4112 - if has_version '= 2.6.16." + eerror + fi + + if kernel_is -lt 2 6 34; then + ewarn + ewarn "IMPORTANT KERNEL NOTES: Please read carefully..." + ewarn + + if kernel_is -lt 2 6 29; then + ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to" + ewarn "include all required IPv6 modules even if you just intend" + ewarn "to run on IPv4 only." + ewarn + ewarn "This has been fixed with kernels >= 2.6.29." + ewarn + fi + + if kernel_is -lt 2 6 33; then + ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards" + ewarn "compliant implementation for SHA-2 HMAC support in ESP and" + ewarn "miss SHA384 and SHA512 HMAC support altogether." + ewarn + ewarn "If you need any of those features, please use kernel >= 2.6.33." + ewarn + fi + + if kernel_is -lt 2 6 34; then + ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only" + ewarn "ESP cipher is only included in kernels >= 2.6.34." + ewarn + ewarn "If you need it, please use kernel >= 2.6.34." + ewarn + fi + fi + + if use non-root; then + enewgroup ${UGID} + enewuser ${UGID} -1 -1 -1 ${UGID} + fi +} + +src_prepare() { + epatch_user +} + +src_configure() { + local myconf="" + + if use non-root; then + myconf="${myconf} --with-user=${UGID} --with-group=${UGID}" + fi + + # If a user has already enabled db support, those plugins will + # most likely be desired as well. Besides they don't impose new + # dependencies and come at no cost (except for space). + if use mysql || use sqlite; then + myconf="${myconf} --enable-attr-sql --enable-sql" + fi + + # strongSwan builds and installs static libs by default which are + # useless to the user (and to strongSwan for that matter) because no + # header files or alike get installed... so disabling them is safe. + if use pam && use eap; then + myconf="${myconf} --enable-eap-gtc" + else + myconf="${myconf} --disable-eap-gtc" + fi + + for mod in $STRONGSWAN_PLUGINS_STD; do + if use strongswan_plugins_${mod}; then + myconf+=" --enable-${mod}" + fi + done + + for mod in $STRONGSWAN_PLUGINS_OPT; do + if use strongswan_plugins_${mod}; then + myconf+=" --enable-${mod}" + fi + done + + econf \ + --disable-static \ + --enable-ikev1 \ + --enable-ikev2 \ + --enable-swanctl \ + --enable-socket-dynamic \ + $(use_with caps capabilities libcap) \ + $(use_enable curl) \ + $(use_enable constraints) \ + $(use_enable ldap) \ + $(use_enable debug leak-detective) \ + $(use_enable dhcp) \ + $(use_enable eap eap-sim) \ + $(use_enable eap eap-sim-file) \ + $(use_enable eap eap-simaka-sql) \ + $(use_enable eap eap-simaka-pseudonym) \ + $(use_enable eap eap-simaka-reauth) \ + $(use_enable eap eap-identity) \ + $(use_enable eap eap-md5) \ + $(use_enable eap eap-aka) \ + $(use_enable eap eap-aka-3gpp2) \ + $(use_enable eap md4) \ + $(use_enable eap eap-mschapv2) \ + $(use_enable eap eap-radius) \ + $(use_enable eap eap-tls) \ + $(use_enable eap xauth-eap) \ + $(use_enable farp) \ + $(use_enable gmp) \ + $(use_enable gcrypt) \ + $(use_enable mysql) \ + $(use_enable networkmanager nm) \ + $(use_enable openssl) \ + $(use_enable pam xauth-pam) \ + $(use_enable pkcs11) \ + $(use_enable sqlite) \ + "$(systemd_with_unitdir)" \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + doinitd "${FILESDIR}"/ipsec + + local dir_ugid + if use non-root; then + fowners ${UGID}:${UGID} \ + /etc/ipsec.conf \ + /etc/strongswan.conf + + dir_ugid="${UGID}" + else + dir_ugid="root" + fi + + diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid} + dodir /etc/ipsec.d \ + /etc/ipsec.d/aacerts \ + /etc/ipsec.d/acerts \ + /etc/ipsec.d/cacerts \ + /etc/ipsec.d/certs \ + /etc/ipsec.d/crls \ + /etc/ipsec.d/ocspcerts \ + /etc/ipsec.d/private \ + /etc/ipsec.d/reqs + + dodoc NEWS README TODO || die + + # shared libs are used only internally and there are no static libs, + # so it's safe to get rid of the .la files + find "${D}" -name '*.la' -delete || die "Failed to remove .la files." +} + +pkg_preinst() { + has_version "Module-CoreList Module::CoreList Module::CoreList::TieHashDelta + Module::CoreList::Utils diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index b82f6915cfcd..121b4078df62 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -306,7 +306,3 @@ media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext # saves people from needlessly installing nasm # Refs bug #93279 media-sound/lame cpu_flags_x86_mmx - -# Robert Buchholz (16 Aug 2008) -# masked in base, unmask for x86/amd64 -dev-python/kaa-base -tls diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 4eb2e87ae803..c1f2b0728ebe 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -5,11 +5,6 @@ # Requires [cuda] which is masked in most of the profiles. media-libs/opencv contrib_xfeatures2d -# Alon Bar-Lev (01 Sep 2017) -# dev-python/tlslite is keyworded only for x86/amd64 -# waiting for ppc, bug#629506 -dev-python/kaa-base tls - # Rick Farina (11 May 2017) # the needed deps are amd64/x86 only net-analyzer/metasploit nexpose openvas diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 21cf1da1a2d7..ebfbaafd0d12 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -232,10 +232,6 @@ sys-power/pm-utils -video_cards_intel -video_cards_radeon # X use flag only for amd64/x86, bug 285951. media-gfx/iscan -X -# Robert Buchholz (16 Aug 2008) -# masked in base, unmask for x86/amd64 -dev-python/kaa-base -tls - # Serkan Kaba (20 Jul 2008) app-text/enchant -zemberek diff --git a/profiles/package.mask b/profiles/package.mask index a86f34acc047..eb31575d292a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -103,14 +103,6 @@ dev-util/universalindentgui # Masked for removal in 30 days. kde-misc/kfilebox -# Kent Fredric (10 Sep 2017) -# Staging block for Perl 5.24.3 -=dev-lang/perl-5.24.3_rc1 -=dev-lang/perl-5.24.3_rc2 -=dev-lang/perl-5.24.3_rc3 -=virtual/perl-Module-CoreList-5.201.709.220 -=virtual/perl-Time-HiRes-1.974.100-r1 - # Andreas Sturmlechner (10 Sep 2017) # Requires dead Qt 4. Dead upstream. Unmaintained. # Use media-video/kmplayer or kde-apps/dragon instead. @@ -457,6 +449,7 @@ dev-ruby/poltergeist # Andreas K. Hüttel (5 June 2017) # Masked for initial testing. =dev-lang/perl-5.26.0 +=dev-lang/perl-5.26.1 =virtual/perl-Archive-Tar-2.240.0 =virtual/perl-B-Debug-1.240.0 =virtual/perl-CPAN-2.180.0 diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 54edad4918bf..a69648f3bf7d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -516,6 +516,7 @@ app-emulation/libvirt:xen - Support management of Xen virtualisation (app-emulat app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs app-emulation/lxc:cgmanager - Enable support for cgroup management using app-admin/cgmanager app-emulation/lxd:daemon - Build the system daemon, not just the client tool +app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS. app-emulation/open-vm-tools:doc - Generate API documentation app-emulation/open-vm-tools:grabbitmqproxy - Enable grabbitmqproxy app-emulation/open-vm-tools:pic - Force shared libraries to be built as PIC @@ -1105,8 +1106,6 @@ app-text/blogc:git - Build blogc-git-receiver tool app-text/blogc:httpd - Build blogc-runserver tool app-text/blogc:make - Build blogc-make tool app-text/cb2bib:webengine - Use dev-qt/qtwebengine instead of dev-qt/qtwebkit -app-text/coolreader:corefonts - Use media-fonts/corefonts -app-text/coolreader:liberation-fonts - Use media-fonts/liberation-fonts app-text/crm114:mew - Add support for using the mewdecode mime decoder (app-emacs/mew) app-text/crm114:mimencode - Add support for using the mimencode mime (net-mail/metamail) app-text/crm114:normalizemime - Add support for using the normalizemime (mail-filter/normalizemime) @@ -1869,12 +1868,7 @@ dev-lang/go:gccgo - Enable bootstrapping using gccgo dev-lang/icon:iplsrc - install the icon programming library source dev-lang/lazarus:minimal - Don't build extra packages from the bigide component dev-lang/logtalk:fop - Support for generating pdf documentation using fop -dev-lang/logtalk:gnupl - Support GNU Prolog back-end compiler -dev-lang/logtalk:qupl - Support Qu-Prolog back-end compiler -dev-lang/logtalk:swipl - Support SWI-Prolog back-end compiler -dev-lang/logtalk:xsbpl - Support XSB back-end compiler dev-lang/logtalk:xslt - Support for generating html documentation using xslt -dev-lang/logtalk:yappl - Support YAP back-end compiler dev-lang/lua:deprecated - make deprecated data structures/routines available dev-lang/luajit:lua52compat - Enable some upwards-compatible features from Lua 5.2 that are unlikely to break existing code. dev-lang/mercury:erlang - Support Mercury Erlang grade @@ -6638,7 +6632,6 @@ net-p2p/dogecoin-qt:qrcode - Enable generation of QR Codes for receiving payment net-p2p/eiskaltdcpp:cli - Enable sample cli based on readline net-p2p/eiskaltdcpp:daemon - Enable eiskaltdcpp-daemon net-p2p/eiskaltdcpp:dht - Enable DHT (distributed hash table) support for libeiskaltdcpp -net-p2p/eiskaltdcpp:emoticons - Install emoticon packs net-p2p/eiskaltdcpp:json - Enable JSON for cli and daemon net-p2p/eiskaltdcpp:libcanberra - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk net-p2p/eiskaltdcpp:minimal - Don't install headers diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index e49ef8fd68ee..18776691bb03 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest index e02dad7d155d..159b507489ea 100644 --- a/sci-chemistry/avogadro2/Manifest +++ b/sci-chemistry/avogadro2/Manifest @@ -1,3 +1 @@ DIST avogadro2-0.9.0.tar.gz 1096442 SHA256 3af7faf0cc534953f40f4d77d9a5b6bdf1699d8c8bce9fb72834aaef10deddd1 SHA512 bc780b1f45822ffc6cef82cf5fbe04cfbab035e553037959965eb0cad2c3f87e53bc71a574c7154cae5909377c74d14708550070c1794bdd5d83d738846b03ba WHIRLPOOL a7633bec714f1decc339d8a9a131f047b733fc2e30d80f2ed9ff904b89e03091bed4c242452e222e441ecbea02fe95c06a6ef9faed354a565b1a89d9d00bc049 -DIST avogadroapp-0.7.2.tar.gz 523935 SHA256 f29db2f04aea8d9dfa0ab73bfa0c45fba18f45fba968a249f618024e8ab8fe63 SHA512 fb798931b66827b0b0e27295b528483d258e15612dba729219874b6171be3e981bd18337add41eb93613d90653286d8d8aa0dbe5fb11577c5ee22ba25b65443b WHIRLPOOL bce0a6c8e0e10bedb332b68c08935ecaf2abe8fbc53cfb7eb53f206da89014f99e0f9ccd95c2ad6c876bb97090939b0807e0d10c7e62f58ebb3a3cc3254fd2a6 -DIST avogadroapp-0.8.0.tar.gz 1105596 SHA256 d79840f0395c11c2081262ba9c1bc6d944c089bac162b434b94a3080bc90c221 SHA512 cc8c6c1620f603b3ed48a45c13968dc451382d3c3947b743fc65c547d6af92ae1f7f1764ffba84e602a2b54a5be075473e58cb49b8061b9e41b728eadba1a5de WHIRLPOOL dc04714b0f830bf826b5253ceb1738500f48aed5e1c922bd2096d2273c88264bbcf27a796418eec80c4483c5905d6c46e8ad4af22e011ab1b451c70d0c087a38 diff --git a/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild b/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild deleted file mode 100644 index 352cba90785d..000000000000 --- a/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -MY_PN=avogadroapp -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Advanced molecule editor and visualizer 2" -HOMEPAGE="http://www.openchemistry.org/" -SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="BSD GPL-2+" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc rpc test" - -RDEPEND=" - >=dev-cpp/eigen-3.2.0-r1 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - ~sci-libs/avogadrolibs-${PV}[qt4,opengl] - sci-libs/hdf5 - rpc? ( sci-chemistry/molequeue ) -" -DEPEND="${DEPEND}" - -RESTRICT=test - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - sed '/COPYING/d' -i CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use rpc Avogadro_ENABLE_RPC) - $(cmake-utils_use_enable test TESTING) - ) - cmake-utils_src_configure -} diff --git a/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild b/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild deleted file mode 100644 index d98ef8d5bd44..000000000000 --- a/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -MY_PN=avogadroapp -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Advanced molecule editor and visualizer 2" -HOMEPAGE="http://www.openchemistry.org/" -SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="BSD GPL-2+" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc rpc test vtk" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ~sci-libs/avogadrolibs-${PV}[qt5,opengl] - sci-libs/hdf5 - rpc? ( sci-chemistry/molequeue ) -" -DEPEND="${DEPEND} - >=dev-cpp/eigen-3.2.0-r1 - test? ( dev-qt/qttest:5 )" - -RESTRICT=test - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${P}-vtk.patch -) - -src_prepare() { - sed '/COPYING/d' -i CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use rpc Avogadro_ENABLE_RPC) - $(cmake-utils_use_enable test TESTING) - $(cmake-utils_use_use vtk) - ) - cmake-utils_src_configure -} diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch deleted file mode 100644 index 24738fb54531..000000000000 --- a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ - avogadro/icons/avogadro2.desktop | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/avogadro/icons/avogadro2.desktop b/avogadro/icons/avogadro2.desktop -index 940a21b..a88c5fb 100644 ---- a/avogadro/icons/avogadro2.desktop -+++ b/avogadro/icons/avogadro2.desktop -@@ -6,6 +6,6 @@ Exec=avogadro2 %f - Icon=avogadro2 - Terminal=false - Type=Application --Categories=Qt;Science;Chemistry;Physics;Education; -+Categories=Qt;Science;Chemistry;Physics; - StartupNotify=true --MimeType=chemical/x-cml;chemical/x-xyz -+MimeType=chemical/x-cml;chemical/x-xyz; diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch deleted file mode 100644 index fd872cef0133..000000000000 --- a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch +++ /dev/null @@ -1,142 +0,0 @@ -commit 23a9474aad8eba503bcfe54584fd7cad106bda17 -Author: Marcus D. Hanwell -Date: Mon Sep 21 12:03:07 2015 -0400 - - Made VTK truly optional for Avogadro application - -diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt -index 90534ea..24bdd46 100644 ---- a/avogadro/CMakeLists.txt -+++ b/avogadro/CMakeLists.txt -@@ -8,6 +8,7 @@ option(USE_VTK "Build with VTK support" OFF) - if(USE_VTK) - find_package(VTK COMPONENTS vtkGUISupportQt vtkRenderingOpenGL REQUIRED) - include(${VTK_USE_FILE}) -+ add_definitions(-DAVO_USE_VTK) - endif() - - if(MSVC) -diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp -index a1c09e8..8fe3038 100644 ---- a/avogadro/mainwindow.cpp -+++ b/avogadro/mainwindow.cpp -@@ -81,7 +81,9 @@ - # include - #endif // Avogadro_ENABLE_RPC - --#include -+#ifdef AVO_USE_VTK -+# include -+#endif - - namespace Avogadro { - -@@ -198,8 +200,10 @@ using QtGui::ToolPluginFactory; - using QtGui::ExtensionPlugin; - using QtGui::ExtensionPluginFactory; - using QtOpenGL::GLWidget; --using VTK::vtkGLWidget; - using QtPlugins::PluginManager; -+#ifdef AVO_USE_VTK -+using VTK::vtkGLWidget; -+#endif - - MainWindow::MainWindow(const QStringList &fileNames, bool disableSettings) - : m_molecule(NULL), -@@ -434,9 +438,11 @@ void MainWindow::setMolecule(Molecule *mol) - if (GLWidget *glWidget = qobject_cast(w)) { - setWidgetMolecule(glWidget, mol); - } -+#ifdef AVO_USE_VTK - else if (vtkGLWidget *vtkWidget = qobject_cast(w)) { - setWidgetMolecule(vtkWidget, mol); - } -+#endif - } - - void MainWindow::markMoleculeDirty() -@@ -831,6 +837,7 @@ void MainWindow::viewActivated(QWidget *widget) - m_moleculeModel->setActiveMolecule(m_molecule); - } - } -+#ifdef AVO_USE_VTK - else if (vtkGLWidget *vtkWidget = qobject_cast(widget)) { - bool firstRun = populatePluginModel(vtkWidget->sceneModel()); - m_sceneTreeView->setModel(&vtkWidget->sceneModel()); -@@ -851,6 +858,7 @@ void MainWindow::viewActivated(QWidget *widget) - m_moleculeModel->setActiveMolecule(m_molecule); - } - } -+#endif - updateWindowTitle(); - activeMoleculeEdited(); - } -@@ -1194,14 +1202,18 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes) - { - ScenePluginModel *scenePluginModel(NULL); - GLWidget *glWidget(NULL); -+#ifdef AVO_USE_VTK - VTK::vtkGLWidget *vtkWidget(NULL); -+#endif - if ((glWidget = qobject_cast(m_multiViewWidget->activeWidget()))) { - scenePluginModel = &glWidget->sceneModel(); - } -+#ifdef AVO_USE_VTK - else if ((vtkWidget = - qobject_cast(m_multiViewWidget->activeWidget()))) { - scenePluginModel = &vtkWidget->sceneModel(); - } -+#endif - - foreach (ScenePlugin *scene, scenePluginModel->scenePlugins()) - scene->setEnabled(false); -@@ -1211,8 +1223,10 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes) - scene->setEnabled(true); - if (glWidget) - glWidget->updateScene(); -+#ifdef AVO_USE_VTK - else if (vtkWidget) - vtkWidget->updateScene(); -+#endif - } - - void MainWindow::undoEdit() -diff --git a/avogadro/viewfactory.cpp b/avogadro/viewfactory.cpp -index 28009be..15c6a44 100644 ---- a/avogadro/viewfactory.cpp -+++ b/avogadro/viewfactory.cpp -@@ -17,7 +17,9 @@ - #include "viewfactory.h" - - #include --#include -+#ifdef AVO_USE_VTK -+# include -+#endif - - namespace Avogadro { - -@@ -31,15 +33,22 @@ ViewFactory::~ViewFactory() - - QStringList ViewFactory::views() const - { -- return QStringList() << "3D View" << "VTK"; -+ QStringList views; -+ views << "3D View"; -+#ifdef AVO_USE_VTK -+ views << "VTK"; -+#endif -+ return views; - } - - QWidget * ViewFactory::createView(const QString &view) - { - if (view == "3D View") - return new QtOpenGL::GLWidget; -+#ifdef AVO_USE_VTK - else if (view == "VTK") - return new VTK::vtkGLWidget; -+#endif - return NULL; - } - diff --git a/sci-chemistry/molequeue/Manifest b/sci-chemistry/molequeue/Manifest index 6f70e3d7a221..8fad37b58f51 100644 --- a/sci-chemistry/molequeue/Manifest +++ b/sci-chemistry/molequeue/Manifest @@ -1,2 +1 @@ -DIST molequeue-0.7.1.tar.gz 658745 SHA256 cdf184936a73e382b8cbff02768b9a04a3a64fec658d6dde4f6574236a73d3bf SHA512 09bdd45c1b2833be3a4f4cd3a0ade8d51276f8da150b0206d9c4a0d3b4999c58bc6cb3df48b9be70907d47c11bbd22aacc7c8d9ae401aa2f21a43405d6a8e3cd WHIRLPOOL 7ea17582495145b9d616bf1df58fbae3d4a6876c1490d5efdcefae1804cf7d29b08543a112ac7c033e2d2e18aa1537ed73a80f75484c90c7319f52dd469b5812 DIST molequeue-0.8.0.tar.gz 643072 SHA256 c191e396f3d882c911e331e6325ed4e2666b70d4316e458964e61d5af7c8cbba SHA512 b9539d2ad2c67188ad254f186c1d67c122a15a32047801c632a1613a4f9c887f38baf2da1bb80cb123391948c2a44604fb1082e475ca6de1e683fbe51266ac84 WHIRLPOOL 4ea157d2c644ab3e35648d731f9e48f0b4f4a05f70055646f55474ef37500626794e7def8dba8bdd1d60e1d98724fd5886995d1680e47a8c9e834833ba545e41 diff --git a/sci-chemistry/molequeue/molequeue-0.7.1.ebuild b/sci-chemistry/molequeue/molequeue-0.7.1.ebuild deleted file mode 100644 index f25259edb5cb..000000000000 --- a/sci-chemistry/molequeue/molequeue-0.7.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils multilib python-single-r1 versionator virtualx - -DESCRIPTION="Abstract, manage and coordinate execution of tasks" -HOMEPAGE="http://www.openchemistry.org/OpenChemistry/project/molequeue.html" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+client doc server test +zeromq" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - server? ( client ) - test? ( server )" - -RDEPEND="${PYTHON_DEPS} - dev-qt/qtcore:4 - dev-qt/qtgui:4 - zeromq? ( net-libs/cppzmq:0= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable test TESTING) - $(cmake-utils_use_use zeromq ZERO_MQ) - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use client MoleQueue_BUILD_CLIENT) - $(cmake-utils_use server MoleQueue_BUILD_APPLICATION) - -DINSTALL_LIBRARY_DIR=$(get_libdir) - ) - use zeromq && \ - mycmakeargs+=( -DZeroMQ_ROOT_DIR=\"${EPREFIX}/usr\" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usex doc documentation "") -} - -src_test() { - VIRTUALX_COMMAND=cmake-utils_src_test - virtualmake -} - -src_install() { - use doc && HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) - cmake-utils_src_install -} diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild index 1fbfe4ba3351..bf36c89f403a 100644 --- a/sci-geosciences/gpsd/gpsd-3.16.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c HOMEPAGE="http://catb.org/gpsd/" LICENSE="BSD" -SLOT="0" +SLOT="0/22" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild index d431599bc0aa..cd3ef4ffa066 100644 --- a/sci-geosciences/gpsd/gpsd-3.17.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c HOMEPAGE="http://catb.org/gpsd/" LICENSE="BSD" -SLOT="0" +SLOT="0/23" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index d431599bc0aa..cd3ef4ffa066 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c HOMEPAGE="http://catb.org/gpsd/" LICENSE="BSD" -SLOT="0" +SLOT="0/23" GPSD_PROTOCOLS=( aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml index 2082a787a8f1..cb80bead87d3 100644 --- a/sci-geosciences/gpsd/metadata.xml +++ b/sci-geosciences/gpsd/metadata.xml @@ -5,10 +5,14 @@ sci-geosciences@gentoo.org Gentoo Geosciences Project - Unbundled GPS daemon and library to support USB and serial - GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and - pygps. - + + Unbundled GPS daemon and library to support USB and serial + GPS devices and various GPS/mapping clients, such as GPSDrive, + kismet, and pygps. + + + Reflect major ABI of libgps.so. + export gpsd data over dbus connections support latency timing information diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild index 2b393e1265de..95cdb6de99d4 100644 --- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild +++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/FFTW/fftw3.git" else SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" fi LICENSE="GPL-2+" diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index b5c0423a6d08..408da47f2984 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit cmake-utils multilib qmake-utils +inherit cmake-utils multilib MY_P=Kst-${PV} @@ -14,39 +14,27 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2 LGPL-2 FDL-1.2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug qt5 test" +IUSE="debug test" RESTRICT="test" RDEPEND=" - !qt5? ( - dev-qt/designer:4 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qtsvg:4 - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} - test? ( - !qt5? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) " S=${WORKDIR}/${MY_P} @@ -58,14 +46,12 @@ src_configure() { local mycmakeargs=( -Dkst_install_libdir="$(get_libdir)" -Dkst_pch=OFF + -Dkst_qt5=ON -Dkst_release=$(usex debug OFF ON) -Dkst_rpath=OFF -Dkst_svnversion=OFF $(cmake-utils_use test kst_test) - $(cmake-utils_use qt5 kst_qt5) ) - use !qt5 && mycmakeargs+=( -DQT_LCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert" ) - cmake-utils_src_configure } diff --git a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild index 52a3a41b32a0..48024bd413af 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="doc elogind +introspection selinux systemd" diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild index 1a52ef267243..68dd62b5a81e 100644 --- a/sys-apps/coreutils/coreutils-8.26.ebuild +++ b/sys-apps/coreutils/coreutils-8.26.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild index d09345d43cf9..a06e263cceda 100644 --- a/sys-apps/file/file-5.32.ebuild +++ b/sys-apps/file/file-5.32.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest index 5bd6896dc95e..4aec74672105 100644 --- a/sys-apps/help2man/Manifest +++ b/sys-apps/help2man/Manifest @@ -1,3 +1,3 @@ DIST help2man-1.46.6.tar.xz 171044 SHA256 615ff5ac38369ddb3707c5fd71672ab122639fd9cf6870de172e0127ed632caf SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c WHIRLPOOL 91d4702d69457090ca58074c05763a085e5bd9da162253a14e86c618a619482e44d7d974c7b0fd0139927d5a67b48bc7160f50990bb622984b122d1bb6c7052c -DIST help2man-1.47.3.tar.xz 184832 SHA256 c232af6475ef65bee02770862a362f4c4c2e6c9967d39e987eb94cadcfc13856 SHA512 c6c41e6492f7a84a3c8c45473f4fa797d243a10b56bbba6029aec5b84a7b5f5054fb55211f5057a5cade7f7d666f5445c528eb6d519b862fe01d0adc64257501 WHIRLPOOL a9141ab75d4d598a7e2ea9b1ca305c5e23288013b6cd214740e5f1d9d3cc73eed607f392609c8c71101a7bd07295f8e78ef4d60db873e9fc002ada47ba017c02 DIST help2man-1.47.4.tar.xz 189456 SHA256 d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd WHIRLPOOL 6e7bf1f1dcf3552bd97c3975e6bd2dd404f5e3bcc62f00c04225e3085f0705882a16fe54ce45e0558ef6e592f54183b89794abd7135eb4b683408108189ee0a6 +DIST help2man-1.47.5.tar.xz 186044 SHA256 7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7 WHIRLPOOL d31885c3a8f5602e0d38a3676e17ee76139a0ab26fc1da61a57609eacad465ae973c8bf8930c22fe7922f2f07882721a0a8d52592d918c81b450f9c6265f7be5 diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild index 877e9c0f9afd..9000a9fc7039 100644 --- a/sys-apps/help2man/help2man-1.47.4.ebuild +++ b/sys-apps/help2man/help2man-1.47.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls" RDEPEND="dev-lang/perl diff --git a/sys-apps/help2man/help2man-1.47.3.ebuild b/sys-apps/help2man/help2man-1.47.5.ebuild similarity index 88% rename from sys-apps/help2man/help2man-1.47.3.ebuild rename to sys-apps/help2man/help2man-1.47.5.ebuild index c2f45caf2079..8a0794c2c588 100644 --- a/sys-apps/help2man/help2man-1.47.3.ebuild +++ b/sys-apps/help2man/help2man-1.47.5.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=6 DESCRIPTION="GNU utility to convert program --help output to a man page" HOMEPAGE="https://www.gnu.org/software/help2man/" @@ -17,7 +16,11 @@ RDEPEND="dev-lang/perl nls? ( dev-perl/Locale-gettext )" DEPEND=${RDEPEND} -DOCS="debian/changelog NEWS README THANKS" #385753 +DOCS=( debian/changelog NEWS README THANKS ) #385753 + +PATCHES=( + "${FILESDIR}"/${PN}-1.46.1-linguas.patch +) src_prepare() { if [[ ${CHOST} == *-darwin* ]] ; then @@ -25,8 +28,7 @@ src_prepare() { -e 's/-shared/-bundle/' \ Makefile.in || die fi - epatch \ - "${FILESDIR}"/${PN}-1.46.1-linguas.patch + default } src_configure() { diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild index 9f0c1f9502eb..1269aa43bf0e 100644 --- a/sys-apps/portage/portage-2.3.8.ebuild +++ b/sys-apps/portage/portage-2.3.8.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index ec0dbbe2a534..3d9a5d94367d 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,3 +1,8 @@ DIST elogind-229.6.tar.gz 765900 SHA256 19f08dba36509b3c5baf1f35d9ac1f5b473b550c081f63fa64ffbe8862ede7aa SHA512 a1bf2937ad2f8d351cd5a0ca5c1c73e85746d14e0a252befa3ed0d396e782df0fde34c49101931189cd56404b59709a7e5ae5beceaac6f30151b50fb32d26ae0 WHIRLPOOL 24d6315d4568b18df4eaa42410f2744b31ab935dd6a7fb0281e4fe2b2e953e411d462db829cbde786c338e823823998e13a9af287252440642499dfe8aca1b1c +DIST elogind-229.8.tar.gz 767750 SHA256 5b9af5dc1e2d2dcd4e4008ba0ff07581fdd6aa1a11e3ebee345ef1b16b491184 SHA512 bc30b9ed604aba4da1d7e743ab4d00bf26845a8febd78e1cf7031e609c1ab4d14d7460ccf0a3782bffcc1a887fc9a6f66cddc21820525a5b209f132e84747c87 WHIRLPOOL 90ae05602969259bbc41b548dd21022dcf70b53c22afcd812bb17d5578b888add90d6fe528f4fe30c045981922fd4285d35814056d9e3b9f600e2d4fe4d80c4e DIST elogind-231.4.tar.gz 812542 SHA256 6a7118abb696d6fd046bb4bbfcbc7bd415770792e6577417d9deb0bcbc4ee8ff SHA512 e1a031b8d6d4ad63043c79b5786b4b5dd890a7911483cdff8652242856edcad99ad811c44b132875a47ff8995d135d843cbfcf4622e4b3e2e7c62ad2d5acf90e WHIRLPOOL 8f5bbec56784eb95b3886c9eb42a9e1a233f68ff8107984e247612e4fd08443b88b69ab033b398fb2d77338ea69fa6607500d481a80a03810ab37a8613e7a703 +DIST elogind-231.6.tar.gz 813666 SHA256 d57ab2f488284e5bc01c6b8d60bf3037e9b43abfc647daacbeb2501352cf0d14 SHA512 cf4c06b930f72fbc93ec253a1f0ba86ae67dc4b1e974a5c7fef3e3985b78cd3cf86b0e7c33261bf27acb347d551c05ab363455c963d5ce817cc5fcee4ad09629 WHIRLPOOL 81291aca139a0316ab200dc000846ab78f4ec262337840c65a8ecd7653e1f6c7a399c3fae335604148fc0c71e48644466b83919d68da364dbfd2023a7138a9f7 DIST elogind-232.3.tar.gz 834210 SHA256 6e1064fdc648e7ebe0aadbcc3c2b4e41f85fec08713dbca3faa5c156f8c76bbc SHA512 359949408549e102923954447c213ed060842846edd126ff233118405521ee553909efaa6ab8ed20c96786534e11b1f3b700e6db18232b7e69691d4712cf014d WHIRLPOOL 36eba13ce1891b40fc85f244b0cb2ca5ba1efbd1bd23fbc07220682706d4071ec15fcaa75ffce2241fd1da040dd207ef9655550cc5ade2962638223a9d126e29 +DIST elogind-232.5.tar.gz 835373 SHA256 b8707534873c1a6198f865ef5d9450627c31f70685c97ffbb18c248ef96c9200 SHA512 40a717dd4ce581e08ce501384c7fbfb1a4830504931f0380fec048594fb6308bf3453806713c137f809538c506a9965ea8f35a2a858f27121b8342bb37745b2a WHIRLPOOL d94d0fdf1db70e72a13a710a7b4d5dce24df9ab2c40cbc1a90756cb4ca59bbec2329b3a92678bf6cabbb1b47ffaeda03110bf2ceeac459e8b851475d4ed3890a +DIST elogind-233.6.tar.gz 902277 SHA256 0efa2c6eb685000c9e0f29a8d7ee7b269c756f013ae83522568a25f6b249822d SHA512 390950893c37d90ee59438822261383a5d0913f5e4cfc82286c505f6db89b06b3d161c209c6ac5bb95e084402352299b7bdbd9c0faa573bb6f8a45309fc872f4 WHIRLPOOL 0b0534f061e319050fafd6450cf3a4a9ab5119069dff52e91c0f8b555bf630701c014d3990235a2cf1b4d224fa70bf934fab6525add63e13c9732f28fed31dfe +DIST elogind-234.3.tar.gz 970679 SHA256 d3a3f272256da3946b0ab2508b6d5a95ad71f0b9b57e509a2264551bb1a4484d SHA512 3aeb33a2c7ba8c75af29cc7844ad7a6fe51edb96a09e364798de62332b04bcb94cb36cd55986cbf517bcf61660b3265b18d5819102f8ab5ecea26738154e21cb WHIRLPOOL 758650da0ba3c6800cf8a81426e2c8f8148cff9d185e0bb7d61e04a227b9eca05a2c32538c1ec7573c0f4ba28fe85a32a374b958ecf547a78667c97c25bbc6df diff --git a/sys-auth/elogind/elogind-229.8.ebuild b/sys-auth/elogind/elogind-229.8.ebuild new file mode 100644 index 000000000000..87ccf720a533 --- /dev/null +++ b/sys-auth/elogind/elogind-229.8.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl debug pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --with-rootprefix="${EPREFIX}/" \ + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + --enable-smack \ + --disable-kdbus \ + --disable-lto \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/elogind-231.6.ebuild b/sys-auth/elogind/elogind-231.6.ebuild new file mode 100644 index 000000000000..9f4a48ace408 --- /dev/null +++ b/sys-auth/elogind/elogind-231.6.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl debug pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --with-rootprefix="${EPREFIX}/" \ + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + --enable-smack \ + --with-cgroup-controller=openrc \ + --disable-lto \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/elogind-232.5.ebuild b/sys-auth/elogind/elogind-232.5.ebuild new file mode 100644 index 000000000000..9f4a48ace408 --- /dev/null +++ b/sys-auth/elogind/elogind-232.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl debug pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --with-rootprefix="${EPREFIX}/" \ + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + --enable-smack \ + --with-cgroup-controller=openrc \ + --disable-lto \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/elogind-233.6.ebuild b/sys-auth/elogind/elogind-233.6.ebuild new file mode 100644 index 000000000000..9f4a48ace408 --- /dev/null +++ b/sys-auth/elogind/elogind-233.6.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl debug pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --with-rootprefix="${EPREFIX}/" \ + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + --enable-smack \ + --with-cgroup-controller=openrc \ + --disable-lto \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/elogind-234.3.ebuild b/sys-auth/elogind/elogind-234.3.ebuild new file mode 100644 index 000000000000..9f4a48ace408 --- /dev/null +++ b/sys-auth/elogind/elogind-234.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools linux-info pam udev + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl debug pam policykit selinux" + +RDEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) + !sys-apps/systemd +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" ) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK + ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch" +} + +src_configure() { + econf \ + --with-pamlibdir=$(getpam_mod_dir) \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --with-rootlibdir="${EPREFIX}"/$(get_libdir) \ + --with-rootprefix="${EPREFIX}/" \ + --with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \ + --enable-smack \ + --with-cgroup-controller=openrc \ + --disable-lto \ + $(use_enable debug debug elogind) \ + $(use_enable acl) \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [ "$(rc-config list boot | grep elogind)" != "" ]; then + ewarn "elogind is currently started from boot runlevel." + elif [ "$(rc-config list default | grep elogind)" != "" ]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +} diff --git a/sys-auth/elogind/files/elogind.conf.in b/sys-auth/elogind/files/elogind.conf.in new file mode 100644 index 000000000000..7b05b3502794 --- /dev/null +++ b/sys-auth/elogind/files/elogind.conf.in @@ -0,0 +1,7 @@ +# /etc/conf.d/elogind: config file for /etc/init.d/elogind + +# this is the elogind executable +ELOGIND_EXEC="/@libdir@/elogind/elogind" + +# this is where elogind will store its pid file +ELOGIND_PIDFILE="/run/elogind.pid" diff --git a/sys-auth/elogind/files/elogind.init b/sys-auth/elogind/files/elogind.init index fc5ac38184a0..019c3afbabc5 100644 --- a/sys-auth/elogind/files/elogind.init +++ b/sys-auth/elogind/files/elogind.init @@ -12,9 +12,9 @@ depend() { start() { ebegin "Starting elogind" - start-stop-daemon --start --quiet --background \ - --make-pidfile --pidfile "${ELOGIND_PIDFILE}" \ - --exec "${ELOGIND_EXEC}" + start-stop-daemon --start --quiet \ + --pidfile "${ELOGIND_PIDFILE}" \ + --exec "${ELOGIND_EXEC}" -- --daemon eend $? } diff --git a/sys-devel/gdb/gdb-8.0.ebuild b/sys-devel/gdb/gdb-8.0.ebuild index 0d6594032e04..be4e6f4f5f09 100644 --- a/sys-devel/gdb/gdb-8.0.ebuild +++ b/sys-devel/gdb/gdb-8.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit flag-o-matic eutils python-single-r1 diff --git a/sys-devel/qconf/qconf-2.3.ebuild b/sys-devel/qconf/qconf-2.3.ebuild index 11d8d88cd3f0..bc7eec1fe011 100644 --- a/sys-devel/qconf/qconf-2.3.ebuild +++ b/sys-devel/qconf/qconf-2.3.ebuild @@ -11,33 +11,26 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="qt4 +qt5" +KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" # There is no one to one match to autotools-based configure QA_CONFIGURE_OPTIONS=".*" RDEPEND=" - qt4? ( dev-qt/qtcore:4 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtxml:5 - ) + dev-qt/qtcore:5 + dev-qt/qtxml:5 " DEPEND="${RDEPEND}" -REQUIRED_USE="^^ ( qt4 qt5 )" - src_configure() { - use qt4 && QTVERSION=4 - use qt5 && QTVERSION=5 econf \ - --qtselect="${QTVERSION}" \ + --qtselect="5" \ --extraconf=QMAKE_STRIP= \ --verbose || die # just to set all the Gentoo toolchain flags - eqmake${QTVERSION} + eqmake5 } src_install() { diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 548d8839e5c1..5bf5f217d813 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -19,6 +19,6 @@ DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa DIST glibc-2.25-patches-8.tar.bz2 47110 SHA256 1dc41664153369886d240a1851b15bf0c3c3739c8319e6d68cb0c2f85fc98901 SHA512 41d772c47770a63502c863f3c9bb05164e0ceab69fb7b7f355c25685ae4285d73e9ab0e3836162bd11852339055329d0bdc7238f3191fde39a50ce0d9a60454c WHIRLPOOL c6e0443d75e2e4607226caa4df1ce2b10ef21ec2564b447e2a287888d1f593d51f334a6e1ab942f5d1602d02c6fee87ce4ef9a7db3409de6063bc377a470a42d DIST glibc-2.25-patches-9.tar.bz2 67901 SHA256 cbd8af837aa0776940fd41e34874e930a7f25d78cdd212e138dd9a85e1349519 SHA512 b4f0be5b20834aff102394df23084cc0adf1ab674e6ce050550f6b6658cf0eab57f7685cac079b1a19388dba927a36b8ca31f58af3dddc559d7230674ffd59b5 WHIRLPOOL 81c18056fe26a79c7a7598da1181ba02e83daf7d9e9883a3c1195804a35fe22a79d7cc4a8411f2f4a4ce6430e506978199f59b61d3ed0a70b4e4f7dd05ecfafe DIST glibc-2.25.tar.xz 13873900 SHA256 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e WHIRLPOOL dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953 -DIST glibc-2.26-patches-0.tar.bz2 22289 SHA256 4b59db44f22c415a3c30a543927e69c04d15ef5d9d5f2ce63eba30e0354ebbd1 SHA512 4afb828d2897c68c7a16e42a2c38a872d38c42954a626d0650cc3fface907d28ba4f5b50504aa4e6c465c5b9c37ab0014d2d228b29ac50335aeb85fec713fd78 WHIRLPOOL 6fa2ad2be084e14e4e9105947232a6b5057d23dd0b55b40bd15bb48c84bfb492a22a27d8a3358f6cc1335b7c9652a0be2d7a977eb266dd08d531ecee12449184 +DIST glibc-2.26-patches-1.tar.bz2 26479 SHA256 ce54a83d17dc2d605e69045a9031d31c729e660fa33e740780de2fea1f186115 SHA512 416cd1e2f4a7eaed2c1f5cd2d483a9d695e82e33add42d0f1c854fd69ccb2ce7f99666aee8fb7bc2320d5d3f44780c3d872134f383279ba573325df91f061dbf WHIRLPOOL deb3a5d12510b20f427a4d82a8b5fff4ab4c4932e6096ddd056efe07d1453f5099040db2c9794c3df4fa79516424a28d2c0c2158e3aec6ae6b05b840ee5e156d DIST glibc-2.26.tar.xz 14682748 SHA256 e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0 WHIRLPOOL 9091c3bccc9b590de6b9595aa391ba01091f0c301bd9199d7c48fbeaeeb013ec9c683c68b65b59c5a69e3905b7f842cca1b0a410431967ecb3a1229b8535486f DIST glibc-9999-patches-3.tar.bz2 19892 SHA256 97f60ed6debd495610b123d7a27227e75942bea1a0fb1e5f78833a6f3bbe6c64 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596 WHIRLPOOL 04a5c30aabf72530fa96fa3a8eadf8207d85d3a2a948ba5f4b72c0deeeae24e7eb71b99875f0e9b1018051fabb4a23630b41873fa4ff0d6ba9778ca6051212bf diff --git a/sys-libs/glibc/glibc-2.26-r1.ebuild b/sys-libs/glibc/glibc-2.26-r1.ebuild index 1616671eda91..29d3ad987099 100644 --- a/sys-libs/glibc/glibc-2.26-r1.ebuild +++ b/sys-libs/glibc/glibc-2.26-r1.ebuild @@ -28,7 +28,7 @@ RELEASE_VER=${PV} GCC_BOOTSTRAP_VER="4.7.3-r1" # Gentoo patchset -PATCH_VER="0" +PATCH_VER="1" SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild index efc32e5b78de..4b473989fc87 100644 --- a/sys-process/acct/acct-6.6.4-r1.ebuild +++ b/sys-process/acct/acct-6.6.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" PATCHES=( diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild index 238b4fd02e26..6db48b04e566 100644 --- a/sys-process/atop/atop-2.3.0-r1.ebuild +++ b/sys-process/atop/atop-2.3.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd67263 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r3.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r4.ebuild similarity index 82% rename from virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r3.ebuild rename to virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r4.ebuild index 10df84922a7e..ceb7c55fe6a6 100644 --- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r3.ebuild +++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r3.ebuild b/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r4.ebuild similarity index 75% rename from virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r3.ebuild rename to virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r4.ebuild index 8c34a253fc67..cf55e20a11cf 100644 --- a/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r3.ebuild +++ b/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r3.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r4.ebuild similarity index 83% rename from virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r3.ebuild rename to virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r4.ebuild index 59b58447dc29..50cda2a8094a 100644 --- a/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r3.ebuild +++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r4.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r3.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r4.ebuild similarity index 80% rename from virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r3.ebuild rename to virtual/perl-Digest/perl-Digest-1.170.100_rc-r4.ebuild index 679eae7c626d..76193ae196ed 100644 --- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r3.ebuild +++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Encode/perl-Encode-2.800.100_rc-r1.ebuild b/virtual/perl-Encode/perl-Encode-2.800.100_rc-r2.ebuild similarity index 83% rename from virtual/perl-Encode/perl-Encode-2.800.100_rc-r1.ebuild rename to virtual/perl-Encode/perl-Encode-2.800.100_rc-r2.ebuild index 0d241330df72..15710a9d9824 100644 --- a/virtual/perl-Encode/perl-Encode-2.800.100_rc-r1.ebuild +++ b/virtual/perl-Encode/perl-Encode-2.800.100_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r1.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild similarity index 83% rename from virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r1.ebuild rename to virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild index 0d241330df72..15710a9d9824 100644 --- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r1.ebuild +++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild similarity index 83% rename from virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r1.ebuild rename to virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild index 0d241330df72..15710a9d9824 100644 --- a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r1.ebuild +++ b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r1.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r2.ebuild similarity index 75% rename from virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r1.ebuild rename to virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r2.ebuild index e1698b7381fe..af030b1a23cd 100644 --- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r1.ebuild +++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.56.1_rc-r2.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r2.ebuild similarity index 87% rename from virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r1.ebuild rename to virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r2.ebuild index f4c33d41da3e..e0da0045d4e0 100644 --- a/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r1.ebuild +++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.69.1_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r1.ebuild b/virtual/perl-IO/perl-IO-1.360.100_rc-r2.ebuild similarity index 82% rename from virtual/perl-XSLoader/perl-XSLoader-0.220.0-r1.ebuild rename to virtual/perl-IO/perl-IO-1.360.100_rc-r2.ebuild index 2ab9488a02ef..ecb35290ca9f 100644 --- a/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r1.ebuild +++ b/virtual/perl-IO/perl-IO-1.360.100_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r3.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r4.ebuild similarity index 82% rename from virtual/perl-Digest/perl-Digest-1.170.100_rc-r3.ebuild rename to virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r4.ebuild index af7050a90f2c..005bcb072022 100644 --- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r3.ebuild +++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r3.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r4.ebuild similarity index 83% rename from virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r3.ebuild rename to virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r4.ebuild index 59b58447dc29..50cda2a8094a 100644 --- a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r3.ebuild +++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r4.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r3.ebuild b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r4.ebuild similarity index 80% rename from virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r3.ebuild rename to virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r4.ebuild index af7050a90f2c..76193ae196ed 100644 --- a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r3.ebuild +++ b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r3.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r4.ebuild similarity index 77% rename from virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r3.ebuild rename to virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r4.ebuild index 342b472b0efc..f89eeae757ca 100644 --- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r3.ebuild +++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/Locale-Maketext-${PV}-r999 diff --git a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r3.ebuild b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r4.ebuild similarity index 79% rename from virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r3.ebuild rename to virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r4.ebuild index c47d41da6905..658b731d573e 100644 --- a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r3.ebuild +++ b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.26* =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild new file mode 100644 index 000000000000..1c1860646ae8 --- /dev/null +++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList +# When bumping this package. +RDEPEND=" + || ( =dev-lang/perl-5.26.1* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.230.ebuild similarity index 91% rename from virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220.ebuild rename to virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.230.ebuild index 7c2d5148b737..c0307e7f9e54 100644 --- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220.ebuild +++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.230.ebuild @@ -10,7 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList # When bumping this package. RDEPEND=" - || ( =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} ) + ~perl-core/${PN#perl-}-${PV} dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r3.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r4.ebuild similarity index 76% rename from virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r3.ebuild rename to virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r4.ebuild index a7d207eecf1f..e24902b7db21 100644 --- a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r3.ebuild +++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/Net-Ping-${PV}-r999 diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r1.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild similarity index 83% rename from virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r1.ebuild rename to virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild index 0d241330df72..15710a9d9824 100644 --- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r1.ebuild +++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.700.100_rc-r2.ebuild @@ -8,7 +8,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Storable/perl-Storable-2.560.100_rc-r1.ebuild b/virtual/perl-Storable/perl-Storable-2.560.100_rc-r1.ebuild deleted file mode 100644 index 0d241330df72..000000000000 --- a/virtual/perl-Storable/perl-Storable-2.560.100_rc-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Virtual for ${PN#perl-}" -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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/virtual/perl-Storable/perl-Storable-2.560.100_rc-r2.ebuild b/virtual/perl-Storable/perl-Storable-2.560.100_rc-r2.ebuild new file mode 100644 index 000000000000..15710a9d9824 --- /dev/null +++ b/virtual/perl-Storable/perl-Storable-2.560.100_rc-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r3.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r4.ebuild similarity index 82% rename from virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r3.ebuild rename to virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r4.ebuild index f77e1ce20f4c..82913152a9fe 100644 --- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r3.ebuild +++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r4.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r1.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r1.ebuild deleted file mode 100644 index 0d241330df72..000000000000 --- a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Virtual for ${PN#perl-}" -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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild new file mode 100644 index 000000000000..15710a9d9824 --- /dev/null +++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" diff --git a/virtual/perl-Test/perl-Test-1.280.100_rc-r1.ebuild b/virtual/perl-Test/perl-Test-1.280.100_rc-r2.ebuild similarity index 82% rename from virtual/perl-Test/perl-Test-1.280.100_rc-r1.ebuild rename to virtual/perl-Test/perl-Test-1.280.100_rc-r2.ebuild index 266989112cd5..67120eada833 100644 --- a/virtual/perl-Test/perl-Test-1.280.100_rc-r1.ebuild +++ b/virtual/perl-Test/perl-Test-1.280.100_rc-r2.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-IO/perl-IO-1.360.100_rc-r1.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r2.ebuild similarity index 82% rename from virtual/perl-IO/perl-IO-1.360.100_rc-r1.ebuild rename to virtual/perl-XSLoader/perl-XSLoader-0.220.0-r2.ebuild index 2ab9488a02ef..ecb35290ca9f 100644 --- a/virtual/perl-IO/perl-IO-1.360.100_rc-r1.ebuild +++ b/virtual/perl-XSLoader/perl-XSLoader-0.220.0-r2.ebuild @@ -8,7 +8,7 @@ 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-bignum/perl-bignum-0.420.100_rc-r1.ebuild b/virtual/perl-bignum/perl-bignum-0.420.100_rc-r2.ebuild similarity index 77% rename from virtual/perl-bignum/perl-bignum-0.420.100_rc-r1.ebuild rename to virtual/perl-bignum/perl-bignum-0.420.100_rc-r2.ebuild index dedcb6a9097a..864592bebc78 100644 --- a/virtual/perl-bignum/perl-bignum-0.420.100_rc-r1.ebuild +++ b/virtual/perl-bignum/perl-bignum-0.420.100_rc-r2.ebuild @@ -8,7 +8,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris" RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 diff --git a/virtual/perl-libnet/perl-libnet-3.80.100_rc-r1.ebuild b/virtual/perl-libnet/perl-libnet-3.80.100_rc-r1.ebuild deleted file mode 100644 index 0d241330df72..000000000000 --- a/virtual/perl-libnet/perl-libnet-3.80.100_rc-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Virtual for ${PN#perl-}" -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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/virtual/perl-libnet/perl-libnet-3.80.100_rc-r2.ebuild b/virtual/perl-libnet/perl-libnet-3.80.100_rc-r2.ebuild new file mode 100644 index 000000000000..15710a9d9824 --- /dev/null +++ b/virtual/perl-libnet/perl-libnet-3.80.100_rc-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.3* =dev-lang/perl-5.24.2* =dev-lang/perl-5.24.1* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" diff --git a/www-apps/nikola/nikola-7.8.8.ebuild b/www-apps/nikola/nikola-7.8.8.ebuild index 9703397c0a4f..a893c02361be 100644 --- a/www-apps/nikola/nikola-7.8.8.ebuild +++ b/www-apps/nikola/nikola-7.8.8.ebuild @@ -15,16 +15,18 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT Apache-2.0 CC0-1.0 public-domain" SLOT="0" -KEYWORDS="~amd64" -IUSE="assets charts ghpages hyphenation ipython jinja markdown watchdog webmedia websocket" +KEYWORDS="amd64" +IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket" RESTRICT="test" # needs coveralls DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage RDEPEND="${DEPEND} >=dev-python/blinker-1.3[${PYTHON_USEDEP}] + >=dev-python/doit-0.29.0[${PYTHON_USEDEP}] >=dev-python/logbook-0.7.0[${PYTHON_USEDEP}] >=dev-python/lxml-3.3.5[${PYTHON_USEDEP}] >=dev-python/mako-1.0[${PYTHON_USEDEP}] + >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] >=dev-python/natsort-3.5.2[${PYTHON_USEDEP}] >=dev-python/piexif-1.0.3[${PYTHON_USEDEP}] >=dev-python/pygments-1.6[${PYTHON_USEDEP}] @@ -37,12 +39,11 @@ RDEPEND="${DEPEND} dev-python/pillow[${PYTHON_USEDEP}] dev-python/cloudpickle[${PYTHON_USEDEP}] assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] ) - charts? ( ~dev-python/pygal-2.0.1[${PYTHON_USEDEP}] ) + charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] ) ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] ) hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] ) jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] ) - markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] ) watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] ) webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] ) websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )" diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index e8a6665e398d..beda0b285c5a 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_61.0.3163.91-1_amd64.deb 63101682 SHA256 d124c94594364c81149d59d0efcb0cd11c9b4302862e5d8ae8d65b9a526c64e4 SHA512 f51f7c437cf8dc7a2a0e1a9a7c994afc3a8fa872abf77047f5b8d0bcb88e40d4e5246dc3a8c4f6005e58bd64f4b59c72a48e9ceeb6a58404664a43217bbb6fab WHIRLPOOL a887d340510bc7c8593797eb91d8909fff72136fff93198c19db09114cc8365a5a9f339f13625f280aaf57e0f5fb5c93388095874cfc3d6b96956692c63b2c5b +DIST google-chrome-stable_61.0.3163.100-1_amd64.deb 65267668 SHA256 5b8b9655db8dcce4b276db7860ae1c8ce1079a33f161a716c17fda24b8d5a9b2 SHA512 ec8b3b29d4af45f0aac67cf564bb7f25e45543bc5aa97c075cb23b6a4f332795a6fb4922ce4c963d1305f41eb455e7b46a874b670dc7bb1b6676fff1c45f1040 WHIRLPOOL ddaf6dfe8d89bf58fcca7fcb2f58365cb82e9b751a8c15025e7ccc2d219b4255869b7d2f9a80ae292f3bfe19818ce55cb90f5e57b13a65d9808e78f8e7bda2f1 diff --git a/www-client/google-chrome/google-chrome-61.0.3163.91.ebuild b/www-client/google-chrome/google-chrome-61.0.3163.100.ebuild similarity index 100% rename from www-client/google-chrome/google-chrome-61.0.3163.91.ebuild rename to www-client/google-chrome/google-chrome-61.0.3163.100.ebuild diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 82784aa7f7da..3e2de1ed0916 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_62.0.3202.29-1_amd64.deb 49583876 SHA256 b6a147ff4d89d71dbf82c0b06411a07003bb94129dd35c818229f4fb5178ae12 SHA512 898e4739c97ccfedfdc64fdf5bfa2414d4d2ef989a89c85b4e9839b02c0d52a6cf648d69b3932cdb82194a1e83251fb8dda9ce1115239d2f1862805e854fe21a WHIRLPOOL 53a05d9a8515f5d76bb0d45d751474b064d7e4495bf1f479b1b1bf72d7b0666b35f83440dcf86c1c656027969c434db6f7ba3fa58c0f615689b6aab75249cf14 -DIST google-chrome-stable_61.0.3163.91-1_amd64.deb 63101682 SHA256 d124c94594364c81149d59d0efcb0cd11c9b4302862e5d8ae8d65b9a526c64e4 SHA512 f51f7c437cf8dc7a2a0e1a9a7c994afc3a8fa872abf77047f5b8d0bcb88e40d4e5246dc3a8c4f6005e58bd64f4b59c72a48e9ceeb6a58404664a43217bbb6fab WHIRLPOOL a887d340510bc7c8593797eb91d8909fff72136fff93198c19db09114cc8365a5a9f339f13625f280aaf57e0f5fb5c93388095874cfc3d6b96956692c63b2c5b +DIST google-chrome-stable_61.0.3163.100-1_amd64.deb 65267668 SHA256 5b8b9655db8dcce4b276db7860ae1c8ce1079a33f161a716c17fda24b8d5a9b2 SHA512 ec8b3b29d4af45f0aac67cf564bb7f25e45543bc5aa97c075cb23b6a4f332795a6fb4922ce4c963d1305f41eb455e7b46a874b670dc7bb1b6676fff1c45f1040 WHIRLPOOL ddaf6dfe8d89bf58fcca7fcb2f58365cb82e9b751a8c15025e7ccc2d219b4255869b7d2f9a80ae292f3bfe19818ce55cb90f5e57b13a65d9808e78f8e7bda2f1 DIST google-chrome-unstable_63.0.3218.0-1_amd64.deb 49945580 SHA256 ebba6546594be2056524310f8b1afc2acfba4bf4531b45ed22fa29e0f22d0b43 SHA512 624bc44c3e007742753c25b99c8ab198c15cfa291ae8be6ff730603ec4905bfa00a77023f5a5812ec5824e6965a48e21620bc1805a427cf6d399bcd70a1457f2 WHIRLPOOL b19e75c70b1718e90c2f8734facff7fdec31d8ab279fecf37fabb7400fd68cbd93fdc3fac8e00481bc06a7330d8dac1e940e1d92ffa8eac3f34e8d823abd91c1 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.91.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.100.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.91.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.100.ebuild diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild index 0435f2c1cf1c..0aad98f00777 100644 --- a/www-servers/apache/apache-2.2.34.ebuild +++ b/www-servers/apache/apache-2.2.34.ebuild @@ -88,7 +88,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" src_configure() { diff --git a/www-servers/apache/apache-2.4.27-r1.ebuild b/www-servers/apache/apache-2.4.27-r1.ebuild index d6cc9ebaf7b8..960206e6c476 100644 --- a/www-servers/apache/apache-2.4.27-r1.ebuild +++ b/www-servers/apache/apache-2.4.27-r1.ebuild @@ -127,7 +127,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )" diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild index d8f7aa213a41..7d0a6347c290 100644 --- a/x11-libs/gtk+/gtk+-3.22.16.ebuild +++ b/x11-libs/gtk+/gtk+-3.22.16.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE=" xinerama? ( X ) " -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Upstream wants us to do their job: # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 diff --git a/x11-libs/pango/pango-1.40.6.ebuild b/x11-libs/pango/pango-1.40.6.ebuild index c521ccac1e02..bc8369565dee 100644 --- a/x11-libs/pango/pango-1.40.6.ebuild +++ b/x11-libs/pango/pango-1.40.6.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/" LICENSE="LGPL-2+ FTL" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="X +introspection test" diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild index ada165f3c4b2..afb64229521e 100644 --- a/x11-libs/vte/vte-0.46.2.ebuild +++ b/x11-libs/vte/vte-0.46.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE" LICENSE="LGPL-2+" SLOT="2.91" IUSE="+crypt debug glade +introspection vala" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris" REQUIRED_USE="vala? ( introspection )" RDEPEND=" diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch new file mode 100644 index 000000000000..de31d9c37ec2 --- /dev/null +++ b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch @@ -0,0 +1,24 @@ +Add missing Qt includes. + +Bug: https://bugs.gentoo.org/563574 + +--- a/src/configurationdata.cpp ++++ b/src/configurationdata.cpp +@@ -25,6 +25,7 @@ + #include + #endif + ++#include + #include + #include + +--- a/src/fractalgenerator.h ++++ b/src/fractalgenerator.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + + #include "abstractjobprovider.h" diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild index 8d3effac98fe..5c0a787ab56a 100644 --- a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild +++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,6 +32,8 @@ DEPEND=" " src_configure() { + epatch "${FILESDIR}/${P}-qt-includes.patch" + tc-export PKG_CONFIG sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die local conf="release" diff --git a/x11-themes/light-themes/light-themes-17.04_p20170406.ebuild b/x11-themes/light-themes/light-themes-17.04_p20170406.ebuild index 682f78430e66..cb2285e554ef 100644 --- a/x11-themes/light-themes/light-themes-17.04_p20170406.ebuild +++ b/x11-themes/light-themes/light-themes-17.04_p20170406.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gtk3" DEPEND="app-arch/xz-utils" diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild index 53a441f8f8bd..602d8d669863 100644 --- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild +++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+xft" RDEPEND="dev-haskell/extensible-exceptions:=[profile?] diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild index 8b2d278e5be8..141d10f46d5f 100644 --- a/x11-wm/xmonad/xmonad-0.13.ebuild +++ b/x11-wm/xmonad/xmonad-0.13.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+default-term" RDEPEND="dev-haskell/data-default:=[profile?]