From 960c7d9d2424462cf230daa49f1c7013c3e57fe4 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 Jan 2017 12:55:35 +0300 Subject: [PATCH] Sync with portage [Sun Jan 8 12:55:35 MSK 2017]. --- app-editors/ghostwriter/Manifest | 1 + .../ghostwriter/ghostwriter-1.4.2.ebuild | 58 + app-emulation/docker/Manifest | 1 - app-emulation/docker/docker-1.13.0_rc4.ebuild | 287 ----- app-emulation/docker/docker-1.13.0_rc5.ebuild | 2 +- app-emulation/docker/docker-9999.ebuild | 4 +- app-misc/ranger/Manifest | 1 + app-misc/ranger/ranger-1.8.0.ebuild | 38 + app-misc/ranger/ranger-9999.ebuild | 9 +- .../bash-completion-2.4-r1.ebuild | 4 +- app-text/libwpg/libwpg-0.3.1.ebuild | 4 +- dev-games/clanlib/Manifest | 1 + dev-games/clanlib/clanlib-4.0.0.ebuild | 77 ++ .../clanlib-4.0.0-fix-build-system.patch | 25 + dev-libs/pugixml/pugixml-1.8.ebuild | 3 +- dev-ml/camlp5/camlp5-6.17.ebuild | 4 +- .../CPAN-Perl-Releases-3.40.0.ebuild | 28 + dev-perl/CPAN-Perl-Releases/Manifest | 1 + .../Digest-GOST/Digest-GOST-0.60.0.ebuild | 26 + dev-perl/Digest-GOST/Manifest | 1 + dev-perl/Digest-GOST/metadata.xml | 13 + .../Exception-Class-1.420.0.ebuild | 29 + dev-perl/Exception-Class/Manifest | 1 + .../IO-Socket-SSL/IO-Socket-SSL-2.43.0.ebuild | 31 + dev-perl/IO-Socket-SSL/Manifest | 1 + .../Lingua-EN-Inflect-1.901.0.ebuild | 21 + dev-perl/Lingua-EN-Inflect/Manifest | 1 + dev-perl/Mojolicious/Manifest | 1 + .../Mojolicious/Mojolicious-7.140.0.ebuild | 35 + dev-perl/Net-DNS/Manifest | 1 + dev-perl/Net-DNS/Net-DNS-1.70.0.ebuild | 59 ++ dev-perl/Net-DNS/metadata.xml | 23 +- dev-perl/Net-HTTP/Manifest | 1 + dev-perl/Net-HTTP/Net-HTTP-6.120.0.ebuild | 38 + .../Net-HTTP/files/6.12-networktest.patch | 131 +++ dev-perl/Net-IDN-Encode/Manifest | 1 + .../Net-IDN-Encode-2.400.0.ebuild | 28 + dev-perl/Net-SSLeay/Manifest | 1 + dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild | 57 + dev-perl/PDF-Create/Manifest | 1 + dev-perl/PDF-Create/PDF-Create-1.410.0.ebuild | 37 + dev-perl/Params-ValidationCompiler/Manifest | 2 +- ... Params-ValidationCompiler-0.220.0.ebuild} | 4 +- dev-perl/Ref-Util/Manifest | 1 + dev-perl/Ref-Util/Ref-Util-0.111.0.ebuild | 32 + dev-php/PEAR-HTTP_Request2/Manifest | 2 - .../PEAR-HTTP_Request2-2.0.0.ebuild | 17 - .../PEAR-HTTP_Request2-2.1.1.ebuild | 17 - .../PEAR-Net_SMTP-1.7.2-r3.ebuild | 4 +- .../PEAR-Net_Sieve-1.5.2-r1.ebuild | 4 +- .../PEAR-Net_Socket-1.0.14-r3.ebuild | 2 +- dev-php/PEAR-PEAR_PackageFileManager/Manifest | 1 - .../PEAR-PEAR_PackageFileManager-1.6.3.ebuild | 17 - dev-php/PEAR-Pager/Manifest | 1 - dev-php/PEAR-Pager/PEAR-Pager-2.4.8.ebuild | 12 - dev-php/PEAR-Pager/metadata.xml | 11 +- .../PEAR-Structures_Graph-1.1.1-r1.ebuild | 4 +- .../PEAR-XML_Util-1.3.0-r1.ebuild | 4 +- dev-php/agavi/Manifest | 2 +- dev-php/agavi/agavi-1.0.7.ebuild | 40 - dev-php/agavi/agavi-1.0.8.ebuild | 40 + dev-php/agavi/files/agavi-executable | 14 + dev-php/agavi/metadata.xml | 18 +- dev-php/phing/Manifest | 2 +- dev-php/phing/files/autoload.php | 14 + dev-php/phing/metadata.xml | 17 +- dev-php/phing/phing-2.10.1.ebuild | 46 - dev-php/phing/phing-2.16.0.ebuild | 58 + dev-python/isodate/isodate-0.5.0.ebuild | 4 +- dev-python/isodate/isodate-0.5.1.ebuild | 4 +- dev-python/isodate/isodate-0.5.4.ebuild | 4 +- dev-python/jinja/Manifest | 1 + dev-python/jinja/jinja-2.9.2.ebuild | 74 ++ dev-ros/urdf/urdf-1.12.6.ebuild | 7 +- dev-ruby/climate_control/Manifest | 1 + .../climate_control-0.1.0.ebuild | 30 + .../hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild | 4 +- dev-ruby/hoe/Manifest | 1 + dev-ruby/hoe/hoe-3.16.0.ebuild | 47 + dev-ruby/rdoc/rdoc-5.0.0-r3.ebuild | 93 ++ dev-ruby/text/Manifest | 1 - dev-ruby/text/text-1.2.3-r2.ebuild | 20 - dev-ruby/xmlrpc/xmlrpc-0.2.1.ebuild | 5 +- kde-apps/ark/ark-16.08.3-r1.ebuild | 2 +- mail-filter/rspamd/Manifest | 1 + mail-filter/rspamd/metadata.xml | 2 + mail-filter/rspamd/rspamd-1.4.2.ebuild | 74 ++ mail-filter/rspamd/rspamd-9999.ebuild | 46 +- media-gfx/feh/Manifest | 2 - media-gfx/feh/feh-2.17.1.ebuild | 57 - media-gfx/feh/feh-2.9.3.ebuild | 63 -- media-gfx/nomacs/Manifest | 2 - .../files/nomacs-3.0.0-quazip-build.patch | 32 - .../files/nomacs-3.0.0-quazip-link.patch | 25 - .../files/nomacs-3.0.0-tiff-build.patch | 28 - media-gfx/nomacs/nomacs-3.0.0.ebuild | 69 -- media-gfx/nomacs/nomacs-3.2.0.ebuild | 59 -- media-gfx/nomacs/nomacs-3.4.ebuild | 63 -- media-libs/exiftool/Manifest | 1 - media-libs/exiftool/exiftool-10.31.ebuild | 23 - media-libs/exiftool/exiftool-10.36.ebuild | 2 +- media-libs/libmediainfo/Manifest | 1 - .../libmediainfo/libmediainfo-0.7.90.ebuild | 84 -- .../libmediainfo/libmediainfo-0.7.91.ebuild | 2 +- media-libs/libzen/Manifest | 1 - media-libs/libzen/libzen-0.4.33.ebuild | 65 -- media-libs/libzen/libzen-0.4.34.ebuild | 2 +- media-video/mediainfo/Manifest | 1 - media-video/mediainfo/mediainfo-0.7.90.ebuild | 72 -- media-video/mediainfo/mediainfo-0.7.91.ebuild | 2 +- .../mkvtoolnix/mkvtoolnix-9.6.0.ebuild | 2 +- .../mkvtoolnix/mkvtoolnix-9.7.1.ebuild | 2 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../md5-cache/app-editors/ghostwriter-1.4.2 | 13 + .../md5-cache/app-emulation/docker-1.13.0_rc4 | 14 - .../md5-cache/app-emulation/docker-1.13.0_rc5 | 4 +- metadata/md5-cache/app-emulation/docker-9999 | 4 +- metadata/md5-cache/app-misc/ranger-1.8.0 | 14 + metadata/md5-cache/app-misc/ranger-9999 | 2 +- .../app-shells/bash-completion-2.4-r1 | 4 +- metadata/md5-cache/app-text/libwpg-0.3.1 | 4 +- metadata/md5-cache/dev-games/clanlib-4.0.0 | 14 + metadata/md5-cache/dev-libs/pugixml-1.8 | 2 +- metadata/md5-cache/dev-ml/camlp5-6.17 | 4 +- .../dev-perl/CPAN-Perl-Releases-3.40.0 | 13 + .../md5-cache/dev-perl/Digest-GOST-0.60.0 | 13 + .../dev-perl/Exception-Class-1.420.0 | 13 + .../md5-cache/dev-perl/IO-Socket-SSL-2.43.0 | 13 + .../dev-perl/Lingua-EN-Inflect-1.901.0 | 13 + .../md5-cache/dev-perl/Mojolicious-7.140.0 | 13 + metadata/md5-cache/dev-perl/Net-DNS-1.70.0 | 14 + metadata/md5-cache/dev-perl/Net-HTTP-6.120.0 | 13 + .../md5-cache/dev-perl/Net-IDN-Encode-2.400.0 | 13 + .../md5-cache/dev-perl/Net-SSLeay-1.800.0 | 13 + .../md5-cache/dev-perl/PDF-Create-1.410.0 | 13 + ...00.0 => Params-ValidationCompiler-0.220.0} | 4 +- metadata/md5-cache/dev-perl/Ref-Util-0.111.0 | 13 + .../dev-php/PEAR-HTTP_Request2-2.0.0 | 13 - .../dev-php/PEAR-HTTP_Request2-2.1.1 | 13 - .../md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 | 4 +- .../md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 | 4 +- .../dev-php/PEAR-Net_Socket-1.0.14-r3 | 4 +- .../PEAR-PEAR_PackageFileManager-1.6.3 | 13 - metadata/md5-cache/dev-php/PEAR-Pager-2.4.8 | 12 - .../dev-php/PEAR-Structures_Graph-1.1.1-r1 | 4 +- .../md5-cache/dev-php/PEAR-XML_Util-1.3.0-r1 | 4 +- metadata/md5-cache/dev-php/agavi-1.0.7 | 12 - metadata/md5-cache/dev-php/agavi-1.0.8 | 11 + metadata/md5-cache/dev-php/phing-2.10.1 | 11 - metadata/md5-cache/dev-php/phing-2.16.0 | 11 + metadata/md5-cache/dev-python/isodate-0.5.0 | 4 +- metadata/md5-cache/dev-python/isodate-0.5.1 | 4 +- metadata/md5-cache/dev-python/isodate-0.5.4 | 4 +- metadata/md5-cache/dev-python/jinja-2.9.2 | 14 + metadata/md5-cache/dev-ros/urdf-1.12.6 | 2 +- .../md5-cache/dev-ruby/climate_control-0.1.0 | 14 + metadata/md5-cache/dev-ruby/hoe-3.16.0 | 14 + .../md5-cache/dev-ruby/hoe-seattlerb-1.3.5 | 10 +- metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3 | 14 + metadata/md5-cache/dev-ruby/text-1.2.3-r2 | 14 - metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 | 2 +- metadata/md5-cache/kde-apps/ark-16.08.3-r1 | 4 +- metadata/md5-cache/mail-filter/rspamd-1.4.2 | 13 + metadata/md5-cache/mail-filter/rspamd-9999 | 10 +- metadata/md5-cache/media-gfx/feh-2.17.1 | 13 - metadata/md5-cache/media-gfx/feh-2.9.3 | 13 - metadata/md5-cache/media-gfx/nomacs-3.0.0 | 14 - metadata/md5-cache/media-gfx/nomacs-3.2.0 | 14 - metadata/md5-cache/media-gfx/nomacs-3.4 | 14 - metadata/md5-cache/media-libs/exiftool-10.31 | 13 - metadata/md5-cache/media-libs/exiftool-10.36 | 4 +- .../md5-cache/media-libs/libmediainfo-0.7.90 | 14 - .../md5-cache/media-libs/libmediainfo-0.7.91 | 4 +- metadata/md5-cache/media-libs/libzen-0.4.33 | 12 - metadata/md5-cache/media-libs/libzen-0.4.34 | 4 +- .../md5-cache/media-video/mediainfo-0.7.90 | 13 - .../md5-cache/media-video/mediainfo-0.7.91 | 4 +- .../md5-cache/media-video/mkvtoolnix-9.6.0 | 4 +- .../md5-cache/media-video/mkvtoolnix-9.7.1 | 4 +- .../md5-cache/net-firewall/nftables-0.6-r4 | 8 +- metadata/md5-cache/net-firewall/nftables-0.7 | 13 + metadata/md5-cache/net-libs/libnftnl-1.0.7 | 14 + .../md5-cache/net-libs/openpgm-5.1.118-r1 | 6 +- metadata/md5-cache/net-libs/openpgm-5.2.122 | 6 +- .../md5-cache/net-mail/fetchmail-6.3.26-r3 | 14 + metadata/md5-cache/net-misc/gcap-0.1.1-r1 | 8 +- metadata/md5-cache/net-misc/openssh-7.3_p1-r7 | 4 +- metadata/md5-cache/net-misc/openssh-7.3_p1-r8 | 4 +- metadata/md5-cache/net-misc/openssh-7.4_p1 | 4 +- metadata/md5-cache/net-p2p/gtk-gnutella-1.1.8 | 13 - .../md5-cache/sci-electronics/fritzing-0.8.7b | 12 - .../md5-cache/sci-electronics/fritzing-0.9.2b | 12 - .../sci-electronics/fritzing-0.9.2b-r1 | 12 - metadata/md5-cache/sys-apps/chname-1.0-r2 | 4 +- .../md5-cache/sys-apps/{ed-1.12 => ed-1.14} | 6 +- .../md5-cache/sys-apps/kexec-tools-2.0.13-r1 | 14 + .../md5-cache/sys-apps/pcmciautils-018_p8-r1 | 4 +- .../md5-cache/sys-fs/multipath-tools-0.6.4 | 13 + .../md5-cache/sys-power/powerman-2.3.9-r1 | 8 +- metadata/md5-cache/sys-process/acct-6.5.5-r4 | 11 + metadata/md5-cache/sys-process/acct-6.6.2-r1 | 11 + .../virtual/perl-IO-Socket-IP-0.370.0-r2 | 4 +- metadata/md5-cache/www-apps/phpBB-3.0.10 | 13 - metadata/md5-cache/www-apps/phpBB-3.0.11 | 13 - metadata/md5-cache/www-apps/phpBB-3.0.12 | 13 - metadata/md5-cache/www-apps/phpBB-3.1.10 | 13 + .../md5-cache/www-servers/nginx-1.10.2-r3 | 15 + .../md5-cache/www-servers/nginx-1.11.6-r1 | 15 + metadata/md5-cache/www-servers/nginx-1.11.8 | 15 + .../x11-plugins/pidgintex-1.1.2_p20170107 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- metadata/xml-schema/timestamp.chk | 2 +- .../files/avahi-0.6.30-automake-1.11.2.patch | 102 -- .../avahi/files/avahi-0.6.30-parallel.patch | 34 - net-firewall/nftables/Manifest | 1 + .../nftables/files/libexec/nftables.sh | 2 +- net-firewall/nftables/files/nftables.init | 5 +- net-firewall/nftables/nftables-0.6-r4.ebuild | 9 +- net-firewall/nftables/nftables-0.7.ebuild | 83 ++ .../files/0.9.0-sys_leveldb.patch | 34 - .../files/9999-sys_libsecp256k1.patch | 80 -- .../files/9999-syslibs.patch | 253 ----- net-libs/libnftnl/Manifest | 1 + net-libs/libnftnl/libnftnl-1.0.7.ebuild | 60 ++ net-libs/openpgm/Manifest | 4 +- net-libs/openpgm/metadata.xml | 3 - net-libs/openpgm/openpgm-5.1.118-r1.ebuild | 10 +- net-libs/openpgm/openpgm-5.2.122.ebuild | 10 +- net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild | 102 ++ net-mail/fetchmail/files/fetchmail_at.service | 11 + .../files/cgminer-4.3.5-system-jansson.patch | 47 - net-misc/gcap/gcap-0.1.1-r1.ebuild | 8 +- .../ipv6calc-0.96.0-fix-link-order.patch | 48 - net-misc/openssh/openssh-7.3_p1-r7.ebuild | 4 +- net-misc/openssh/openssh-7.3_p1-r8.ebuild | 4 +- net-misc/openssh/openssh-7.4_p1.ebuild | 4 +- net-misc/tor/files/tor.initd-r7 | 84 -- .../bitcoin-qt/files/0.8-openssl-101k.patch | 31 - .../bitcoin-qt/files/0.8.2-sys_leveldb.patch | 183 ---- .../bitcoin-qt/files/0.9-openssl-101k.patch | 31 - .../bitcoin-qt/files/0.9.0-sys_leveldb.patch | 34 - .../files/0.9.x-ljr_noblacklist.patch | 12 - .../files/9999-sys_libsecp256k1.patch | 80 -- net-p2p/bitcoin-qt/files/9999-syslibs.patch | 253 ----- net-p2p/bitcoind/files/0.8-openssl-101k.patch | 31 - .../bitcoind/files/0.8.2-sys_leveldb.patch | 185 ---- net-p2p/bitcoind/files/0.9-openssl-101k.patch | 31 - .../bitcoind/files/0.9.0-sys_leveldb.patch | 34 - .../files/0.9.x-ljr_noblacklist.patch | 12 - net-p2p/bitcoind/files/9999-syslibs.patch | 253 ----- net-p2p/bitcoind/files/bitcoin.confd | 10 - net-p2p/bitcoind/files/bitcoin.initd-r1 | 29 - net-p2p/gtk-gnutella/Manifest | 1 - .../gtk-gnutella/gtk-gnutella-1.1.8.ebuild | 86 -- .../files/tribler-6.1.0-fix-desktop.patch | 21 - .../obfsproxy-0.2.8-remove-argparse.patch | 11 - net-proxy/obfsproxy/files/obfsproxy.confd | 45 - net-proxy/obfsproxy/files/obfsproxy.initd | 58 - net-proxy/torsocks/files/fix-docdir.patch | 24 - .../files/suppress-warning-msgs.patch | 15 - .../torsocks/files/torsocks-2.1.0-musl.patch | 121 --- profiles/arch/x86/use.mask | 2 +- profiles/base/use.mask | 13 +- profiles/package.mask | 18 +- profiles/use.desc | 1 - profiles/use.local.desc | 5 + sci-electronics/fritzing/Manifest | 1 - .../fritzing/fritzing-0.8.7b.ebuild | 57 - .../fritzing/fritzing-0.9.2b-r1.ebuild | 77 -- .../fritzing/fritzing-0.9.2b.ebuild | 61 -- sys-apps/chname/chname-1.0-r2.ebuild | 4 +- sys-apps/chname/metadata.xml | 1 - sys-apps/ed/Manifest | 2 +- .../ed/{ed-1.12.ebuild => ed-1.14.ebuild} | 4 +- sys-apps/kexec-tools/files/kexec.init-2.0.12 | 2 +- .../kexec-tools/files/kexec.init-2.0.13-r1 | 187 ++++ .../kexec-tools/kexec-tools-2.0.13-r1.ebuild | 77 ++ .../pcmciautils-018_p8-flex-2.6.3-fix.patch | 27 + .../pcmciautils/pcmciautils-018_p8-r1.ebuild | 17 +- sys-fs/multipath-tools/Manifest | 1 + .../multipath-tools-0.6.4-sysmacros.patch | 60 ++ sys-fs/multipath-tools/metadata.xml | 11 +- .../multipath-tools-0.6.4.ebuild | 92 ++ sys-power/powerman/metadata.xml | 3 - sys-power/powerman/powerman-2.3.9-r1.ebuild | 8 +- sys-process/acct/acct-6.5.5-r4.ebuild | 44 + sys-process/acct/acct-6.6.2-r1.ebuild | 46 + sys-process/acct/files/acct.initd-r1 | 34 + .../perl-IO-Socket-IP-0.370.0-r2.ebuild | 4 +- www-apps/phpBB/Manifest | 4 +- www-apps/phpBB/metadata.xml | 5 + www-apps/phpBB/phpBB-3.0.10.ebuild | 41 - www-apps/phpBB/phpBB-3.0.11.ebuild | 41 - ...hpBB-3.0.12.ebuild => phpBB-3.1.10.ebuild} | 21 +- www-servers/nginx/Manifest | 1 + www-servers/nginx/files/nginx.confd | 32 + www-servers/nginx/files/nginx.initd-r4 | 93 ++ www-servers/nginx/nginx-1.10.2-r3.ebuild | 986 +++++++++++++++++ www-servers/nginx/nginx-1.11.6-r1.ebuild | 999 ++++++++++++++++++ www-servers/nginx/nginx-1.11.8.ebuild | 999 ++++++++++++++++++ x11-plugins/pidgintex/Manifest | 1 + .../pidgintex-1.1.2_p20170107.ebuild | 55 + 306 files changed, 6006 insertions(+), 4230 deletions(-) create mode 100644 app-editors/ghostwriter/ghostwriter-1.4.2.ebuild delete mode 100644 app-emulation/docker/docker-1.13.0_rc4.ebuild create mode 100644 app-misc/ranger/ranger-1.8.0.ebuild create mode 100644 dev-games/clanlib/clanlib-4.0.0.ebuild create mode 100644 dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch create mode 100644 dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.40.0.ebuild create mode 100644 dev-perl/Digest-GOST/Digest-GOST-0.60.0.ebuild create mode 100644 dev-perl/Digest-GOST/Manifest create mode 100644 dev-perl/Digest-GOST/metadata.xml create mode 100644 dev-perl/Exception-Class/Exception-Class-1.420.0.ebuild create mode 100644 dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.43.0.ebuild create mode 100644 dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.901.0.ebuild create mode 100644 dev-perl/Mojolicious/Mojolicious-7.140.0.ebuild create mode 100644 dev-perl/Net-DNS/Net-DNS-1.70.0.ebuild create mode 100644 dev-perl/Net-HTTP/Net-HTTP-6.120.0.ebuild create mode 100644 dev-perl/Net-HTTP/files/6.12-networktest.patch create mode 100644 dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild create mode 100644 dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild create mode 100644 dev-perl/PDF-Create/PDF-Create-1.410.0.ebuild rename dev-perl/Params-ValidationCompiler/{Params-ValidationCompiler-0.200.0.ebuild => Params-ValidationCompiler-0.220.0.ebuild} (92%) create mode 100644 dev-perl/Ref-Util/Ref-Util-0.111.0.ebuild delete mode 100644 dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.0.0.ebuild delete mode 100644 dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.1.1.ebuild delete mode 100644 dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild delete mode 100644 dev-php/PEAR-Pager/PEAR-Pager-2.4.8.ebuild delete mode 100644 dev-php/agavi/agavi-1.0.7.ebuild create mode 100644 dev-php/agavi/agavi-1.0.8.ebuild create mode 100755 dev-php/agavi/files/agavi-executable create mode 100644 dev-php/phing/files/autoload.php delete mode 100644 dev-php/phing/phing-2.10.1.ebuild create mode 100644 dev-php/phing/phing-2.16.0.ebuild create mode 100644 dev-python/jinja/jinja-2.9.2.ebuild create mode 100644 dev-ruby/climate_control/climate_control-0.1.0.ebuild create mode 100644 dev-ruby/hoe/hoe-3.16.0.ebuild create mode 100644 dev-ruby/rdoc/rdoc-5.0.0-r3.ebuild delete mode 100644 dev-ruby/text/text-1.2.3-r2.ebuild create mode 100644 mail-filter/rspamd/rspamd-1.4.2.ebuild delete mode 100644 media-gfx/feh/feh-2.17.1.ebuild delete mode 100644 media-gfx/feh/feh-2.9.3.ebuild delete mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch delete mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch delete mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch delete mode 100644 media-gfx/nomacs/nomacs-3.0.0.ebuild delete mode 100644 media-gfx/nomacs/nomacs-3.2.0.ebuild delete mode 100644 media-gfx/nomacs/nomacs-3.4.ebuild delete mode 100644 media-libs/exiftool/exiftool-10.31.ebuild delete mode 100644 media-libs/libmediainfo/libmediainfo-0.7.90.ebuild delete mode 100644 media-libs/libzen/libzen-0.4.33.ebuild delete mode 100644 media-video/mediainfo/mediainfo-0.7.90.ebuild create mode 100644 metadata/md5-cache/app-editors/ghostwriter-1.4.2 delete mode 100644 metadata/md5-cache/app-emulation/docker-1.13.0_rc4 create mode 100644 metadata/md5-cache/app-misc/ranger-1.8.0 create mode 100644 metadata/md5-cache/dev-games/clanlib-4.0.0 create mode 100644 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.40.0 create mode 100644 metadata/md5-cache/dev-perl/Digest-GOST-0.60.0 create mode 100644 metadata/md5-cache/dev-perl/Exception-Class-1.420.0 create mode 100644 metadata/md5-cache/dev-perl/IO-Socket-SSL-2.43.0 create mode 100644 metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.901.0 create mode 100644 metadata/md5-cache/dev-perl/Mojolicious-7.140.0 create mode 100644 metadata/md5-cache/dev-perl/Net-DNS-1.70.0 create mode 100644 metadata/md5-cache/dev-perl/Net-HTTP-6.120.0 create mode 100644 metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0 create mode 100644 metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0 create mode 100644 metadata/md5-cache/dev-perl/PDF-Create-1.410.0 rename metadata/md5-cache/dev-perl/{Params-ValidationCompiler-0.200.0 => Params-ValidationCompiler-0.220.0} (94%) create mode 100644 metadata/md5-cache/dev-perl/Ref-Util-0.111.0 delete mode 100644 metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.0.0 delete mode 100644 metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.1.1 delete mode 100644 metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.6.3 delete mode 100644 metadata/md5-cache/dev-php/PEAR-Pager-2.4.8 delete mode 100644 metadata/md5-cache/dev-php/agavi-1.0.7 create mode 100644 metadata/md5-cache/dev-php/agavi-1.0.8 delete mode 100644 metadata/md5-cache/dev-php/phing-2.10.1 create mode 100644 metadata/md5-cache/dev-php/phing-2.16.0 create mode 100644 metadata/md5-cache/dev-python/jinja-2.9.2 create mode 100644 metadata/md5-cache/dev-ruby/climate_control-0.1.0 create mode 100644 metadata/md5-cache/dev-ruby/hoe-3.16.0 create mode 100644 metadata/md5-cache/dev-ruby/rdoc-5.0.0-r3 delete mode 100644 metadata/md5-cache/dev-ruby/text-1.2.3-r2 create mode 100644 metadata/md5-cache/mail-filter/rspamd-1.4.2 delete mode 100644 metadata/md5-cache/media-gfx/feh-2.17.1 delete mode 100644 metadata/md5-cache/media-gfx/feh-2.9.3 delete mode 100644 metadata/md5-cache/media-gfx/nomacs-3.0.0 delete mode 100644 metadata/md5-cache/media-gfx/nomacs-3.2.0 delete mode 100644 metadata/md5-cache/media-gfx/nomacs-3.4 delete mode 100644 metadata/md5-cache/media-libs/exiftool-10.31 delete mode 100644 metadata/md5-cache/media-libs/libmediainfo-0.7.90 delete mode 100644 metadata/md5-cache/media-libs/libzen-0.4.33 delete mode 100644 metadata/md5-cache/media-video/mediainfo-0.7.90 create mode 100644 metadata/md5-cache/net-firewall/nftables-0.7 create mode 100644 metadata/md5-cache/net-libs/libnftnl-1.0.7 create mode 100644 metadata/md5-cache/net-mail/fetchmail-6.3.26-r3 delete mode 100644 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.8 delete mode 100644 metadata/md5-cache/sci-electronics/fritzing-0.8.7b delete mode 100644 metadata/md5-cache/sci-electronics/fritzing-0.9.2b delete mode 100644 metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r1 rename metadata/md5-cache/sys-apps/{ed-1.12 => ed-1.14} (84%) create mode 100644 metadata/md5-cache/sys-apps/kexec-tools-2.0.13-r1 create mode 100644 metadata/md5-cache/sys-fs/multipath-tools-0.6.4 create mode 100644 metadata/md5-cache/sys-process/acct-6.5.5-r4 create mode 100644 metadata/md5-cache/sys-process/acct-6.6.2-r1 delete mode 100644 metadata/md5-cache/www-apps/phpBB-3.0.10 delete mode 100644 metadata/md5-cache/www-apps/phpBB-3.0.11 delete mode 100644 metadata/md5-cache/www-apps/phpBB-3.0.12 create mode 100644 metadata/md5-cache/www-apps/phpBB-3.1.10 create mode 100644 metadata/md5-cache/www-servers/nginx-1.10.2-r3 create mode 100644 metadata/md5-cache/www-servers/nginx-1.11.6-r1 create mode 100644 metadata/md5-cache/www-servers/nginx-1.11.8 create mode 100644 metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107 delete mode 100644 net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch delete mode 100644 net-dns/avahi/files/avahi-0.6.30-parallel.patch create mode 100644 net-firewall/nftables/nftables-0.7.ebuild delete mode 100644 net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch delete mode 100644 net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch delete mode 100644 net-libs/libbitcoinconsensus/files/9999-syslibs.patch create mode 100644 net-libs/libnftnl/libnftnl-1.0.7.ebuild create mode 100644 net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild create mode 100644 net-mail/fetchmail/files/fetchmail_at.service delete mode 100644 net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch delete mode 100644 net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch delete mode 100644 net-misc/tor/files/tor.initd-r7 delete mode 100644 net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch delete mode 100644 net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch delete mode 100644 net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch delete mode 100644 net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch delete mode 100644 net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch delete mode 100644 net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch delete mode 100644 net-p2p/bitcoin-qt/files/9999-syslibs.patch delete mode 100644 net-p2p/bitcoind/files/0.8-openssl-101k.patch delete mode 100644 net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch delete mode 100644 net-p2p/bitcoind/files/0.9-openssl-101k.patch delete mode 100644 net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch delete mode 100644 net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch delete mode 100644 net-p2p/bitcoind/files/9999-syslibs.patch delete mode 100644 net-p2p/bitcoind/files/bitcoin.confd delete mode 100644 net-p2p/bitcoind/files/bitcoin.initd-r1 delete mode 100644 net-p2p/gtk-gnutella/gtk-gnutella-1.1.8.ebuild delete mode 100644 net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch delete mode 100644 net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch delete mode 100644 net-proxy/obfsproxy/files/obfsproxy.confd delete mode 100644 net-proxy/obfsproxy/files/obfsproxy.initd delete mode 100644 net-proxy/torsocks/files/fix-docdir.patch delete mode 100644 net-proxy/torsocks/files/suppress-warning-msgs.patch delete mode 100644 net-proxy/torsocks/files/torsocks-2.1.0-musl.patch delete mode 100644 sci-electronics/fritzing/fritzing-0.8.7b.ebuild delete mode 100644 sci-electronics/fritzing/fritzing-0.9.2b-r1.ebuild delete mode 100644 sci-electronics/fritzing/fritzing-0.9.2b.ebuild rename sys-apps/ed/{ed-1.12.ebuild => ed-1.14.ebuild} (95%) create mode 100644 sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 create mode 100644 sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild create mode 100644 sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch create mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch create mode 100644 sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild create mode 100644 sys-process/acct/acct-6.5.5-r4.ebuild create mode 100644 sys-process/acct/acct-6.6.2-r1.ebuild create mode 100644 sys-process/acct/files/acct.initd-r1 delete mode 100644 www-apps/phpBB/phpBB-3.0.10.ebuild delete mode 100644 www-apps/phpBB/phpBB-3.0.11.ebuild rename www-apps/phpBB/{phpBB-3.0.12.ebuild => phpBB-3.1.10.ebuild} (58%) create mode 100644 www-servers/nginx/files/nginx.confd create mode 100644 www-servers/nginx/files/nginx.initd-r4 create mode 100644 www-servers/nginx/nginx-1.10.2-r3.ebuild create mode 100644 www-servers/nginx/nginx-1.11.6-r1.ebuild create mode 100644 www-servers/nginx/nginx-1.11.8.ebuild create mode 100644 x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest index 60107fd5af7c..9961725dfbe0 100644 --- a/app-editors/ghostwriter/Manifest +++ b/app-editors/ghostwriter/Manifest @@ -1 +1,2 @@ DIST ghostwriter-1.2.5.tar.gz 508173 SHA256 4bf0f9450231504416037e4a667d8c8e2940bda0e03e624ba9bb2eda78a7937b SHA512 195e984dc6109a4fedacf92e2e78ec81fee76c1edc701c12afa82aafaed73f90d6a008ac21a4338636235b1d161fc22ad94fee3c8873b85135728c67e63c0260 WHIRLPOOL c172d4cdc2c30faa993242b981b873edf19d58ef060d6c22da4b01fdaee37f756b34a9c6288dec7131a9082b6acd93c8edcecbd365f8a141996e719a773c86e9 +DIST ghostwriter-1.4.2.tar.gz 589182 SHA256 775760d04c5a794c3810cffe9d1daa72ee123c77cc3041fc15a2052503899438 SHA512 b7442c4abe054cf73bbbe43c9537592fb54616a1085f529649b4bd3b4168c2ccb6f1127868d04c751b92edc277480baaf2d78a35b1b3fd285e804a17ec9cfbe2 WHIRLPOOL 685d9e057178f03d40ca8521b46a915e6b56289d42078fe0f1c8fcd601139f229f509865253e9b8ce76fde6aaf800d9c6e612bf37a5a0386ded935c75897f54e diff --git a/app-editors/ghostwriter/ghostwriter-1.4.2.ebuild b/app-editors/ghostwriter/ghostwriter-1.4.2.ebuild new file mode 100644 index 000000000000..3995fbf1bc0f --- /dev/null +++ b/app-editors/ghostwriter/ghostwriter-1.4.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PLOCALES="de en it ja pt_BR ru" + +inherit l10n qmake-utils + +DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor" +HOMEPAGE="http://wereturtle.github.io/ghostwriter/" +SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + app-text/hunspell + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 +" + +DOCS=( CREDITS.md README.md ) + +src_prepare() { + default + + local mylrelease="$(qt5_get_bindir)"/lrelease + + sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version" + + prepare_locale() { + "${mylrelease}" "translations/${PN}_${1}.ts" || die "failed to prepare ${1} locale" + } + + l10n_find_plocales_changes translations ${PN}_ .ts + l10n_for_each_locale_do prepare_locale +} + +src_configure() { + eqmake5 \ + CONFIG+=$(usex debug debug release) \ + PREFIX="${EPREFIX}"/usr +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs +} diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 004225b0c486..dfb5b73271b9 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,4 +1,3 @@ DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f DIST docker-1.12.5.tar.gz 13693501 SHA256 81b337368efafb631a75f6ad5469413fd5828ce672592c374adf894dc05abd38 SHA512 a116f6c7ae83c21a0560b7860872f55d095687bf276685e78ebfaec5d63b6108fb1553ea0f5ea9d143bd495a4b213398a4d1032b6f4f4fb29b6e8c07c509deb2 WHIRLPOOL 8cf85f3954926491996b304bb0b4a136813e78039facf192222fed0d6d054853f6b6dfa221962fb3731884a4d1e01f3a34516b7d64eff4a74365de442faacf3c -DIST docker-1.13.0_rc4.tar.gz 7734320 SHA256 1dedaf5171da17e71b51e5c2fec137dd379096a66be02473f7a2625f3e537aee SHA512 ced0fba2ef279db6061ed07c79e13912fc2af23a3736f5fd41ae7af23fe219b39c9461b878c0e68e40f22af2f4901f1b25466451a36c4f207e2070fa5715af7c WHIRLPOOL 42a33357ea821f772bc9ead821067314809858d00a475378c48aec8eb88ed8c4541a48d43e4b87221ef35c1254e1a9b97610dd12f154c29ea347f4cc2478e490 DIST docker-1.13.0_rc5.tar.gz 7743446 SHA256 6213320b23c9f2bd38e197d0612e695d9677b84c1dd2b71f3c0f998caeb51408 SHA512 f8afaecf42585a46cbeb0457fff46e5c78cdceff437b52bd4009c351310bdc4efdee274031b6354c999308f3b8d376a3c45ebca13272ffc586212553d2f386cb WHIRLPOOL 81ed9d7758ebcd1e0856401dd3a7a37a6038ac69a7690f89082020ba1607bf8d9ca6566e9aa350253cc457789808c49c79f80b8a9cd5b6580df9a123df93086d diff --git a/app-emulation/docker/docker-1.13.0_rc4.ebuild b/app-emulation/docker/docker-1.13.0_rc4.ebuild deleted file mode 100644 index b7b934e4c229..000000000000 --- a/app-emulation/docker/docker-1.13.0_rc4.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -EGO_PN="github.com/docker/docker" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - MY_PV="${PV/_/-}" - DOCKER_GITCOMMIT="88862e7" - EGIT_COMMIT="v${MY_PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev user - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://dockerproject.org" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - device-mapper? ( - >=sys-fs/lvm2-2.02.89[thin] - ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - apparmor? ( sys-libs/libapparmor ) -" - -DEPEND=" - ${CDEPEND} - - dev-go/go-md2man - - btrfs? ( - >=sys-fs/btrfs-progs-3.16.1 - ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${CDEPEND} - - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - - >app-emulation/containerd-0.2.2 - app-emulation/runc[apparmor?,seccomp?] - app-emulation/docker-proxy - container-init? ( >=sys-process/tini-0.13.0[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT ~NF_NAT_NEEDED - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED - - ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT - - ~VXLAN - ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - # for where these kernel versions come from, see: - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* - if ! { - kernel_is ge 3 16 \ - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ - || { kernel_is 3 12 && kernel_is ge 3 12 25; } - }; then - ewarn "" - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" - ewarn "" - ewarn "See also https://github.com/docker/docker/issues/2960" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - - linux-info_pkg_setup - - # create docker group for the code checking for it in /etc/group - enewgroup docker -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-client || die - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' - fi - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor pkcs11 seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - # time to build! - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # build the man pages too - ./man/md2man-all.sh || die "unable to generate man pages" -} - -src_install() { - VERSION="$(cat VERSION)" - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - doman man/man*/* - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot, add Docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog " usermod -aG docker youruser" - elog -} diff --git a/app-emulation/docker/docker-1.13.0_rc5.ebuild b/app-emulation/docker/docker-1.13.0_rc5.ebuild index 7157b9c2df7e..d2917f8c0f12 100644 --- a/app-emulation/docker/docker-1.13.0_rc5.ebuild +++ b/app-emulation/docker/docker-1.13.0_rc5.ebuild @@ -59,7 +59,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 - >app-emulation/containerd-0.2.2 + >=app-emulation/containerd-0.2.5 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index efafc55cfcfc..5cd6a95f5663 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.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 # $Id$ @@ -59,7 +59,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 - >app-emulation/containerd-0.2.2 + >=app-emulation/containerd-0.2.5 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest index 3645e65c5ec3..62d41c68093a 100644 --- a/app-misc/ranger/Manifest +++ b/app-misc/ranger/Manifest @@ -1 +1,2 @@ DIST ranger-1.7.2.tar.gz 269713 SHA256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 SHA512 4815831bceb76bf15a68cdb09d3276192095b211ba06f0abeeec9529b0cb054341666c607f11b2c0acd1ff7de6fa3b71c9aab59db6bd5d1f0137e07619b522bd WHIRLPOOL 7985c470a789cd58a64d2e5e8eb7675ea4df8f71f0cac0bae7e49af599ab07d30a3ebe567e938649e69c812e8e2a4043e10004c708459a9a58b7c523fc34c6f3 +DIST ranger-1.8.0.tar.gz 227368 SHA256 ce02476cb93d51b901eb6f5f0fc9675c58bd0a2f11d2ce0cdb667e15ec314092 SHA512 dd630c8aaca479925bc48982a2fab7c6f8999512985e37f0d7c5906ec1f8ed4b7b59fb0320dee5abf8ab7513a6f58528cdf64eaf8ca8d4528260cfba5916af40 WHIRLPOOL 54d8e9e0efaec5feae5c7d34adeb5d6880076ae2dfedb2cd26e5cdd2c593e7b3cc6e6089436ef44fd39fd4574a0d79a45661621bce0d508bbe317ec718c562cd diff --git a/app-misc/ranger/ranger-1.8.0.ebuild b/app-misc/ranger/ranger-1.8.0.ebuild new file mode 100644 index 000000000000..b9efb3ed911c --- /dev/null +++ b/app-misc/ranger/ranger-1.8.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_REQ_USE="ncurses" + +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git" + inherit git-r3 +else + SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="A vim-inspired file manager for the console" +HOMEPAGE="http://ranger.nongnu.org/" +LICENSE="GPL-3" +SLOT="0" + +RDEPEND="virtual/pager" + +src_prepare() { + # use versioned doc path + sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die + + distutils-r1_src_prepare +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Ranger has many optional dependencies to support enhanced file previews." + elog "See the README or homepage for more details." + fi +} diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild index 982663acf811..a661a5eb28b2 100644 --- a/app-misc/ranger/ranger-9999.ebuild +++ b/app-misc/ranger/ranger-9999.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 # $Id$ @@ -23,6 +23,13 @@ SLOT="0" RDEPEND="virtual/pager" +src_prepare() { + # use versioned doc path + sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die + + distutils-r1_src_prepare +} + pkg_postinst() { if [[ -z ${REPLACING_VERSIONS} ]]; then elog "Ranger has many optional dependencies to support enhanced file previews." diff --git a/app-shells/bash-completion/bash-completion-2.4-r1.ebuild b/app-shells/bash-completion/bash-completion-2.4-r1.ebuild index bb6f5ed1641d..847f8f674cd2 100644 --- a/app-shells/bash-completion/bash-completion-2.4-r1.ebuild +++ b/app-shells/bash-completion/bash-completion-2.4-r1.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 # $Id$ @@ -14,7 +14,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" IUSE="" RDEPEND=">=app-shells/bash-4.3_p30-r1 diff --git a/app-text/libwpg/libwpg-0.3.1.ebuild b/app-text/libwpg/libwpg-0.3.1.ebuild index 284db7e20b63..5a9a149fb687 100644 --- a/app-text/libwpg/libwpg-0.3.1.ebuild +++ b/app-text/libwpg/libwpg-0.3.1.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 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0.3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~x86" IUSE="doc static-libs" RDEPEND=" diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest index 4fda43feeb23..4d6f33c05c60 100644 --- a/dev-games/clanlib/Manifest +++ b/dev-games/clanlib/Manifest @@ -1,2 +1,3 @@ DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87 DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68 +DIST clanlib-4.0.0.tar.gz 7435551 SHA256 9b35052308a2b933bba76596930ab550fc8cd1f80155fc62aa648a23c3f4406f SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe WHIRLPOOL b541c0dca233570f5c203269684de2a187391f35278722e81ca64b5f9fc3d61cb2f3cb615db6d4d7956369c04fbb9aea165a0ee5df0210b5bd50ab669d4fd691 diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild b/dev-games/clanlib/clanlib-4.0.0.ebuild new file mode 100644 index 000000000000..7fa5f2d115c5 --- /dev/null +++ b/dev-games/clanlib/clanlib-4.0.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +MY_PN=ClanLib + +DESCRIPTION="Multi-platform game development library" +HOMEPAGE="https://github.com/sphair/ClanLib" +SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="4.0" +KEYWORDS="~amd64 ~x86" #not big endian safe #82779 +IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X" +REQUIRED_USE="opengl? ( X )" + +RDEPEND=" + sys-libs/zlib + X? ( + media-libs/freetype:2 + media-libs/fontconfig + x11-libs/libX11 + opengl? ( + virtual/opengl + x11-libs/libXrender + ) + ) + sound? ( media-libs/alsa-lib )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-lang/perl + media-gfx/graphviz + )" + +S=${WORKDIR}/${MY_PN}-${PV} + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable doc docs) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable opengl clanGL) \ + $(use_enable opengl clanUI) \ + $(use_enable X clanDisplay) \ + $(use_enable sound clanSound) \ + $(use_enable ipv6 getaddr) \ + $(use_enable static-libs static) +} + +src_compile() { + default + use doc && emake html +} + +src_install() { + default + + use doc && emake DESTDIR="${D}" install-html + use examples && dodoc -r Examples Resources + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch new file mode 100644 index 000000000000..a3500e22f7e1 --- /dev/null +++ b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch @@ -0,0 +1,25 @@ +* Fix AM_CONDITIONAL to always be invoked +* Install html files in proper --htmldir + +--- a/configure.ac ++++ b/configure.ac +@@ -437,8 +437,8 @@ + fi + + if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi +- AM_CONDITIONAL(ALSA, test x$have_alsa = xyes) + fi ++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes) + + if test "$enable_clanNetwork" != "no"; then + echo "Checking for clanNetwork stuff" +--- a/Documentation/Makefile.am ++++ b/Documentation/Makefile.am +@@ -1,6 +1,6 @@ + EXTRA_DIST = $(wildcart images/*.png) + +-HTML_PREFIX = $(datadir)/doc/@PACKAGE@-@LT_RELEASE@ ++HTML_PREFIX = $(htmldir) + + all-local: + diff --git a/dev-libs/pugixml/pugixml-1.8.ebuild b/dev-libs/pugixml/pugixml-1.8.ebuild index 40dd30f96e47..af0347733d2c 100644 --- a/dev-libs/pugixml/pugixml-1.8.ebuild +++ b/dev-libs/pugixml/pugixml-1.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 +CMAKE_MAKEFILE_GENERATOR=emake inherit cmake-utils diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild index f7616f3e0f7c..bb3a5ca5f9b1 100644 --- a/dev-ml/camlp5/camlp5-6.17.ebuild +++ b/dev-ml/camlp5/camlp5-6.17.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 # $Id$ @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~ppc ~x86 ~x86-fbsd" IUSE="doc +ocamlopt" DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.40.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.40.0.ebuild new file mode 100644 index 000000000000..0a1c4ce9cd5b --- /dev/null +++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.40.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=BINGOS +DIST_VERSION=3.04 +inherit perl-module + +DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + virtual/perl-IO + >=virtual/perl-Test-Simple-0.470.0 + ) +" +src_test() { + perl_rm_files t/author-pod-coverage.t t/author-pod-syntax.t + perl-module_src_test +} diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest index 6b98c5ad5975..51ffa2f9d208 100644 --- a/dev-perl/CPAN-Perl-Releases/Manifest +++ b/dev-perl/CPAN-Perl-Releases/Manifest @@ -3,3 +3,4 @@ DIST CPAN-Perl-Releases-2.54.tar.gz 24697 SHA256 f3e0060af2f280ac445523e79297db1 DIST CPAN-Perl-Releases-2.88.tar.gz 24619 SHA256 b5dc969dd6d21e080d1a0f6fa5082c72476ce68da678a69ef64d0a1f9688a590 SHA512 a94a0070be46307bd8b2e31d6219d6ca99620dbf4263ef7685122c8e7690a59e982a4fadb39c5ddb5633b484b6cb74be5ac87901a95a6d3d43566b52227894de WHIRLPOOL 9445b4857a70a5282a7a3764b575008bde23c710870a103f7177431b5dfc8735a38b54d0ede0b1a2feee0089ee5a3d0ec72bef1f421ce52268c3f36f0c76b63b DIST CPAN-Perl-Releases-3.00.tar.gz 25059 SHA256 665f312546ad918cbb567049927c57f38ab0081bb8bcb9ec886effd8e086d882 SHA512 1d8cf1364dae10b52c2b806f6ec889403594e889155583f73c0613f84e54c5ee11a86d7b593a8eb72b4e2c702f0016378e315bbf5bf9140bd4ddeb73209ee46e WHIRLPOOL 378742d197813e055a055ca1c64011ee4615363c5647caba2319f0f75e96ad8b2e7a55b56db8fffbdf77605a8278832c9fb828b06ff649ae9062efb5a5e64c9e DIST CPAN-Perl-Releases-3.02.tar.gz 24777 SHA256 7163311a40da89f7677c3a76662c56b8c565d148f8246265a33cceca1799f9b4 SHA512 c9c07cca5e47a3ac22e061a7689addcc4dfb125eba397160c9670837de5a9a0c17bb1893565546bd021ccde2f019a4e7cba8892e7a4d4a898a7533787826ba5b WHIRLPOOL 068266cc93d989af9e9b17e70966e79c22692900b18bf54bfeeb768a8055fd7c23677522733c78789539db9b198d255decdd7f9f5ae8bf6571fe332d2d60c63b +DIST CPAN-Perl-Releases-3.04.tar.gz 24843 SHA256 3593b96a76ab36a6368076a10f44c877eaae9f10f8735acbba9978d031c28da7 SHA512 7f16e0c5c1962ef978a768dc1196a13d33b537d1403e22361aec5b57b003adbfffbe8f04e7f0d086629a098892489eb6d7d25a94bccbed33d5769e95f8d81c4f WHIRLPOOL c920f7eb21d93d963d2d9c3ef9b0e4b0552ca82c5afa88a63574276f895cb6f0dbabee2d613263cd5d2fa41fae6a27b2ae0dc7c224455f9021cae0bf1f39276f diff --git a/dev-perl/Digest-GOST/Digest-GOST-0.60.0.ebuild b/dev-perl/Digest-GOST/Digest-GOST-0.60.0.ebuild new file mode 100644 index 000000000000..087c63b4d867 --- /dev/null +++ b/dev-perl/Digest-GOST/Digest-GOST-0.60.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=GRAY +DIST_VERSION=0.06 +inherit perl-module + +DESCRIPTION="Perl interface to the GOST R 34.11-94 digest algorithm" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + virtual/perl-Digest + virtual/perl-XSLoader + virtual/perl-parent +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=virtual/perl-Test-Simple-0.820.0 + ) +" diff --git a/dev-perl/Digest-GOST/Manifest b/dev-perl/Digest-GOST/Manifest new file mode 100644 index 000000000000..c292e0cf3a60 --- /dev/null +++ b/dev-perl/Digest-GOST/Manifest @@ -0,0 +1 @@ +DIST Digest-GOST-0.06.tar.gz 39496 SHA256 b2b800f55e407d819de68580cad87038b679be8fc9f3e9ad26430b0ce239a976 SHA512 7df9e5ce9cdc72da417207d197ae41e80ff4405d5fef1f6279a6043708b7688f4ca25c9d634b83a93be633b3ce7e672f6a697bfcc5ffa956379f9375f995e94e WHIRLPOOL 7d0e13a1f1ec76771a5c06897222a2d5ee2528c3124781ee04f3c81f12c14f29c5e03bbbb276c1063e6c692a2df2fe44b05ce2245a1f5e6d74f57af600397498 diff --git a/dev-perl/Digest-GOST/metadata.xml b/dev-perl/Digest-GOST/metadata.xml new file mode 100644 index 000000000000..f017bb0acc4d --- /dev/null +++ b/dev-perl/Digest-GOST/metadata.xml @@ -0,0 +1,13 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + Digest-GOST + Digest::GOST + Digest::GOST::CryptoPro + + diff --git a/dev-perl/Exception-Class/Exception-Class-1.420.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.420.0.ebuild new file mode 100644 index 000000000000..f90213bb9576 --- /dev/null +++ b/dev-perl/Exception-Class/Exception-Class-1.420.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=DROLSKY +DIST_VERSION=1.42 +DIST_EXAMPLES=("bench/*") +inherit perl-module + +DESCRIPTION="A module that allows you to declare real exception classes in Perl" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos" +IUSE="test" + +RDEPEND=" + >=dev-perl/Class-Data-Inheritable-0.20.0 + >=dev-perl/Devel-StackTrace-2.0.0 + virtual/perl-Scalar-List-Utils +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + >=virtual/perl-Test-Simple-0.960.0 + ) +" diff --git a/dev-perl/Exception-Class/Manifest b/dev-perl/Exception-Class/Manifest index 2fe1315ca706..d7bd4e3d0eac 100644 --- a/dev-perl/Exception-Class/Manifest +++ b/dev-perl/Exception-Class/Manifest @@ -1,2 +1,3 @@ DIST Exception-Class-1.39.tar.gz 38936 SHA256 819c756a69a6d1e31f396eca6a508b07b0a522a035b904cd1d432353cc362083 SHA512 c290a0b87b7a5e288c6c954f7ab834204184edc81089f871f1eb994d1445e3938170c1e87119fd952177dd43a3a228522188282fb0151ae33ba3a55b29a28b50 WHIRLPOOL 35bdb9adbb2565703b42d91897d5c698b1d1d378fa7ae11547cccfa844a251644667947403994158b02bdc6e32b830d7d02c4b7d6f154e7fb0125b8030bd3d52 DIST Exception-Class-1.41.tar.gz 45432 SHA256 8efb33371b44dd18471aced1be2376eed292fbd297120783e6e97a47d1fee41d SHA512 32fce6b6307a6fffcbb8f1f0b0955f2a6ff3701fb8a8b1350cb60666591871ed2ac537bfe26a002578347f29b8f1c831f43bb8d66f76c798de0e401075e55f79 WHIRLPOOL 09d7059e1d56af4b4cc516a7717d547355c03d8e99dc4395e96f9030ed11848ab4a24c3cd7c003946984335e4d101a3e05a5f3eeea6305ea8aedb26fe914da17 +DIST Exception-Class-1.42.tar.gz 45718 SHA256 8bb4ee64d3770d6812bda36890ef5df418573287eb8eccbb106f04c981dea22b SHA512 b13f13882a4ca1bb44219dab1ebc7cd730d3b739e8f540b597fa3aa0adc0ede00e927844d293c584f05cce643c23bac73703318873c526c94668b8f9ff98a643 WHIRLPOOL 60777b17ab2599150fadae3c27e621e629334e083f8f8560e16518daca88c10dede9abab66d844ef641d6bcfd530d94bbfa39e41ecbf6140132e37751f326776 diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.43.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.43.0.ebuild new file mode 100644 index 000000000000..ac111332131c --- /dev/null +++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.43.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=SULLR +DIST_VERSION=2.043 +DIST_EXAMPLES=("example/*") +inherit perl-module + +DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="idn" + +RDEPEND=" + >=dev-perl/Net-SSLeay-1.460.0 + virtual/perl-Scalar-List-Utils + idn? ( + || ( + >=dev-perl/URI-1.50 + dev-perl/Net-LibIDN + dev-perl/Net-IDN-Encode + ) + )" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" +mydoc=("docs/debugging.txt") diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest index 66e7dd620c8f..6c6d8be8c570 100644 --- a/dev-perl/IO-Socket-SSL/Manifest +++ b/dev-perl/IO-Socket-SSL/Manifest @@ -1,3 +1,4 @@ DIST IO-Socket-SSL-2.024.tar.gz 209567 SHA256 dab3125b004b24ff8dfc003aa81c00c0f976a1bc34a75e1d8d9de9de837ce6c9 SHA512 b76c43efbffba031b72efebc9f5348eb24ea1d48704e61c2256c0a23a754fb786cad23d7a330884f526ed31fc2878e27f4114793afa8135cc0caf8f251c07c3c WHIRLPOOL 37ae14c700a21a89fad3ca653925e07272d51a2f4ecee2a5342909d49491f42b3d3ee6e318fbb5d6a02ead1479916a6775e48f61cb3722d9526795482ae5ee58 DIST IO-Socket-SSL-2.039.tar.gz 213906 SHA256 c6379a76860c724a22b79ebe9e91d26bd8a04e3ce035bacfd15de3d9beaf83ac SHA512 e107a5bdd1631d87e11fbb339e13b4c3272db3a7ca43488c221bbd17c7a93f2033e175c0ca8ee6e89f45550a68741c4762880845378dca7f0beaa45427399515 WHIRLPOOL e117469c5f0226d80ac3ac714cff72e0c3705a367c5008f57216c50af137928ff3ca99e0741a5e93f76236f60996af830bfbac269f1e045da53cfc685d7403b9 DIST IO-Socket-SSL-2.040.tar.gz 214139 SHA256 7472bba199f9b3b88b9b1ece163bb7de4a5bab95bb8784b4f6d66ac030099645 SHA512 827db6a8b9f2ca51c4dd934ed5cd296d271dc30deafd5e9630bfcc8907d4ada0a7d6e71cf689df9013c6f7333c9b2f3d07643ec94a9b2675138cc669e8a68925 WHIRLPOOL 5adfb74daef5823d82908a6d66eb00996403aedaf836c9880df335b4474857c6e337482737bf8968148ac52539a9a157d7049016c46c9894b983efceea76de86 +DIST IO-Socket-SSL-2.043.tar.gz 214312 SHA256 cc08b1e40a336902a544825520e76a9c4cf8134649d48ae9140de662c35c5315 SHA512 91a49211c8aea107bdcfd886b276e3329f3e62fccce94c1700cd881d2282236b1f5714263dd4a9a3192c9f0bac0b73e11a0e19d18949855252994ed400462886 WHIRLPOOL b8651536c16f0afc9e7b455bc6a13c6c59555dc997a1966bc3dfc85fd42dcf9ca144c727b1032a230a18c8048fb7b28a80d5fa449c53d77c291c584a65544294 diff --git a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.901.0.ebuild b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.901.0.ebuild new file mode 100644 index 000000000000..f5dad7a094cc --- /dev/null +++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.901.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=DCONWAY +DIST_VERSION=1.901 +DIST_EXAMPLES=("demo/*") +inherit perl-module + +DESCRIPTION="Perl module to pluralize English words" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86" +IUSE="test" + +DEPEND=" + virtual/perl-ExtUtils-MakeMaker + test? ( virtual/perl-Test-Simple ) +" diff --git a/dev-perl/Lingua-EN-Inflect/Manifest b/dev-perl/Lingua-EN-Inflect/Manifest index d8f08847c937..9e308479a943 100644 --- a/dev-perl/Lingua-EN-Inflect/Manifest +++ b/dev-perl/Lingua-EN-Inflect/Manifest @@ -1 +1,2 @@ DIST Lingua-EN-Inflect-1.899.tar.gz 59555 SHA256 1599a93020a2fdc0de8db14eea721df8fd772f78dedaf81081081fc93aa6a257 SHA512 5ac836f20992c68ff3edcab5c1431bd967c39295b7b950ed147157c724985b941f4c3229daf1f729219982dfe3eb3b065ca6fa0b54ecd2922ce60d887babd19c WHIRLPOOL 02a94d5eb9f98511a2603eafad66bd0d5432f9feb17bcbb7314e7a1edbed6aa57bc2867fd1b169ac5da8c7598d57b6382446d41aeaa786e4cbeaf2f29d78d826 +DIST Lingua-EN-Inflect-1.901.tar.gz 59500 SHA256 da17e7cd50126bdf1d8f5a6fc1f2f790c85e844b09f5a047fd044e68dca39c55 SHA512 12334a5f345c9d74b599b49cc9594f3360dcf64c72638d8a90950aac2b482fe7213b4323a25e21fe95a9120f6d48b39420e06bff7454282dac82ca5d7a7b6653 WHIRLPOOL 9fc6ae8f8cb1eda297418147cea8f8abf15f3e1b421e1e196995067f9bbf449fb936a10affccf46a85f63938d915957ed6a6dd129c580f55c256e4d9353ce821 diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest index 9976ccf2cb62..b795af7d262a 100644 --- a/dev-perl/Mojolicious/Manifest +++ b/dev-perl/Mojolicious/Manifest @@ -1,3 +1,4 @@ DIST Mojolicious-6.61.tar.gz 652374 SHA256 ee46f8cdea7789a979ff86246f4536ab95c32c629028ed700e3b48ad43e0d0ba SHA512 8b251fb0bb9dec8dc2f2e0279e6ae3591acec626e2c8e5151494f363fe688c6a7c520727620b59d90e38d8192f8cc126fea27ea4177984427976921ff2094ce2 WHIRLPOOL b57d7202dfb3a6c19237fe78892a09b65e0a7dd661480c99f2c69017a6aa81e557a2ebabeb6ab3b27d4c9aa492b590976a8045a0af9fe04040d9bfa2926d2baa DIST Mojolicious-7.11.tar.gz 659859 SHA256 35fe21323fed8cdc8e9e497c7ca634e3aedcd9db0933dcafd6111a35ba8be764 SHA512 4ccb3c2e82328dbd01ecd8fc6d0934dc4ad215d443a0a2a7af0d1822d692b5bee96c8103c0361a89c3708c7c1363842e0a4a008c963fa59f420afbee0aba25ea WHIRLPOOL ac7bc5acf0a2b5308a6fac6cc6e047a33a1df57ca0af08ce788f619f4829948b9963c0331cfcf80c517384b8619a1ddf78aa0bc22bd098f14f7e2e415596910b DIST Mojolicious-7.12.tar.gz 660570 SHA256 daba0097fdf52203a7c81ff800a9d15ea946eea0436ef4ff2da081b9e47e8776 SHA512 0c1e389382e7d4dfdd6fd9eab0baef786f232d88fe2fadb9eff78bb184ef0b63c53c913c7d9410a0c6c910a7e3f4874387eefc02100f832f6c8f34933dd0e728 WHIRLPOOL 20029faffb33ff6bb7b05254506110224396b073704e7da28b85e36377d752668c32e9453059cb6cc30e43e6303cb7a38ee03678ae94c22111981afa593ffffb +DIST Mojolicious-7.14.tar.gz 661916 SHA256 ef358291ffae5e1907427d381140698fdc551b1f8cd64886a9b7703017f91623 SHA512 da65782734664161338a502174c1f778a48e0b4e47498f9ed298a1728ba58bc56f86ab08b88c0076518afdcdb9e0723cee4af9d3ed1213cef6446a90eaae36b6 WHIRLPOOL 1f0a7b6b6ff6c42961a15d0ba4ddb8b014d7359c15a5b7abf8ec224a9e1c35d23b34c4a6e6d9904b35923566883c4d5e0d7cfaf1e8b388f71c2aef5651e54db8 diff --git a/dev-perl/Mojolicious/Mojolicious-7.140.0.ebuild b/dev-perl/Mojolicious/Mojolicious-7.140.0.ebuild new file mode 100644 index 000000000000..5fb17fd9ac2a --- /dev/null +++ b/dev-perl/Mojolicious/Mojolicious-7.140.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=SRI +DIST_VERSION=7.14 +DIST_EXAMPLES=("examples/*") +inherit perl-module + +DESCRIPTION="Real-time web framework" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test minimal" + +RDEPEND=" + !minimal? ( + >=dev-perl/EV-4.0.0 + ) + >=virtual/perl-IO-Socket-IP-0.370.0 + >=virtual/perl-JSON-PP-2.271.30 + >=virtual/perl-Pod-Simple-3.90.0 + >=virtual/perl-Time-Local-1.200.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Test-Simple + ) +" +src_test() { + perl_rm_files t/pod{,_coverage}.t + perl-module_src_test +} diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest index 1b1e7b7098d6..48e98a93f675 100644 --- a/dev-perl/Net-DNS/Manifest +++ b/dev-perl/Net-DNS/Manifest @@ -1 +1,2 @@ DIST Net-DNS-1.04.tar.gz 245064 SHA256 4b9f220304c5722658fbdbe4db31ab77486b5f0aaada78c9d1b528e4b0680965 SHA512 ff32c1bf52e553fcd64f8a0f9fcd30f6eae4e1350c4c5c97da3b745f1713acd75533694ec834e1b1e9bee0a13b7a8ee0c347dfaa36433052f020e41e36829d59 WHIRLPOOL 5c09639ffc7bdaac4625bf9fc592c6109b43ebb7ab0eed29b9bb7cc42d35f155736a9125787adabb3ee47fb2374189b9d940ea6bf626fa8d837cd5be2511ea83 +DIST Net-DNS-1.07.tar.gz 256114 SHA256 5f91497f1af9f690153fa05a27a7d73ddada08bed40536fe2d0ac759b7af8492 SHA512 048cf6c4fb5e8c5721f5c43cc6f3f93189854c54745ab569b2537a1765cbbe4c360b484290d3151a0d0875b8e8a63b15a4ec97cda7f723f5b7be0078f903fb9f WHIRLPOOL 17c6ce70591f1f98b5c266b6884527dbdefd9fabb74ad0c451e752b14501bb7ab09a08d3403904fc985f0e6eb0e10a10378e9b544e03386930a7408f94fe4fa9 diff --git a/dev-perl/Net-DNS/Net-DNS-1.70.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.70.0.ebuild new file mode 100644 index 000000000000..a40a44dcf91c --- /dev/null +++ b/dev-perl/Net-DNS/Net-DNS-1.70.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=NLNETLABS +DIST_VERSION=1.07 +DIST_EXAMPLES=( "contrib" "demo" ) +inherit toolchain-funcs perl-module + +DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ipv6 test minimal" + +PDEPEND="!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 )" +RDEPEND=" + >=dev-perl/Digest-HMAC-1.30.0 + >=virtual/perl-Digest-MD5-2.130.0 + >=virtual/perl-Digest-SHA-5.230.0 + >=virtual/perl-File-Spec-0.860.0 + >=virtual/perl-MIME-Base64-2.110.0 + >=virtual/perl-Time-Local-1.190.0 + ipv6? ( + dev-perl/IO-Socket-INET6 + ) + !minimal? ( + >=dev-perl/Digest-BubbleBabble-0.10.0 + >=dev-perl/Digest-GOST-0.60.0 + >=virtual/perl-IO-Socket-IP-0.320.0 + >=dev-perl/IO-Socket-INET6-2.510.0 + >=dev-perl/Net-LibIDN-0.120.0 + >=virtual/perl-Scalar-List-Utils-1.250.0 + ) +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=virtual/perl-Test-Simple-0.520.0 + ) +" + +src_prepare() { + perl-module_src_prepare + mydoc="TODO" + # --IPv6-tests requires that you have external IPv6 connectivity + # as it connects to 2001:7b8:206:1:0:1234:be21:e31e + myconf="${myconf} --no-online-tests --no-IPv6-tests" +} + +src_compile() { + emake FULL_AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}" +} +src_test() { + perl_rm_files t/00-pod.t + perl-module_src_test +} diff --git a/dev-perl/Net-DNS/metadata.xml b/dev-perl/Net-DNS/metadata.xml index b36f2ae1484f..83de420a2928 100644 --- a/dev-perl/Net-DNS/metadata.xml +++ b/dev-perl/Net-DNS/metadata.xml @@ -26,15 +26,25 @@ Net::DNS::RR::AFSDB Net::DNS::RR::APL Net::DNS::RR::APL::Item + Net::DNS::RR::CAA + Net::DNS::RR::CDNSKEY + Net::DNS::RR::CDS Net::DNS::RR::CERT Net::DNS::RR::CNAME + Net::DNS::RR::CSYNC Net::DNS::RR::DHCID + Net::DNS::RR::DLV Net::DNS::RR::DNAME - Net::DNS::RR::EID + Net::DNS::RR::DNSKEY + Net::DNS::RR::DS + Net::DNS::RR::EUI48 + Net::DNS::RR::EUI64 + Net::DNS::RR::GPOS Net::DNS::RR::HINFO Net::DNS::RR::HIP Net::DNS::RR::IPSECKEY Net::DNS::RR::ISDN + Net::DNS::RR::KEY Net::DNS::RR::KX Net::DNS::RR::L32 Net::DNS::RR::L64 @@ -47,15 +57,20 @@ Net::DNS::RR::MX Net::DNS::RR::NAPTR Net::DNS::RR::NID - Net::DNS::RR::NIMLOC Net::DNS::RR::NS - Net::DNS::RR::NSAP + Net::DNS::RR::NSEC + Net::DNS::RR::NSEC3 + Net::DNS::RR::NSEC3PARAM Net::DNS::RR::NULL + Net::DNS::RR::OPENPGPKEY Net::DNS::RR::OPT Net::DNS::RR::PTR Net::DNS::RR::PX Net::DNS::RR::RP + Net::DNS::RR::RRSIG Net::DNS::RR::RT + Net::DNS::RR::SIG + Net::DNS::RR::SMIMEA Net::DNS::RR::SOA Net::DNS::RR::SPF Net::DNS::RR::SRV @@ -64,12 +79,14 @@ Net::DNS::RR::TLSA Net::DNS::RR::TSIG Net::DNS::RR::TXT + Net::DNS::RR::URI Net::DNS::RR::X25 Net::DNS::Resolver Net::DNS::Resolver::Base Net::DNS::Resolver::MSWin32 Net::DNS::Resolver::Recurse Net::DNS::Resolver::UNIX + Net::DNS::Resolver::android Net::DNS::Resolver::cygwin Net::DNS::Resolver::os2 Net::DNS::Text diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest index ebd7f68e8b31..0bc627a7380b 100644 --- a/dev-perl/Net-HTTP/Manifest +++ b/dev-perl/Net-HTTP/Manifest @@ -1 +1,2 @@ DIST Net-HTTP-6.09.tar.gz 17686 SHA256 52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d SHA512 ae36c8367206f18190237f9c6db417054b78f99cfa79cc651550d3612505faf9d31e415c8b32e7f87f4fd389ccaa0e23f62c3781f6f27485b7296b2fe48d7e45 WHIRLPOOL e29a0193e607507538d4e6c7e08808a4c5c8a58d035fa3054a82fc9e148105961de8a8b12c5dff485246a0f4b97075832785ddfa992cce7720d7e56047ef631c +DIST Net-HTTP-6.12.tar.gz 29548 SHA256 8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6 SHA512 5353f1c5914f90338f05342904224ff7998133e025de4389a68e9abf521040a1f9bb4c9b8c13f65bb014947fc3186c1d7e078a699f40a3edf5afed3a0da8746d WHIRLPOOL a19a97e4b4a6c7aae425bb20926cfc485417a63b60745b13d266fab36857b03dd3da2390ae468fd0d305db808df0521796571e13093b15ea8be46d1ad5d271b9 diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.120.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.120.0.ebuild new file mode 100644 index 000000000000..5c86654bb6b5 --- /dev/null +++ b/dev-perl/Net-HTTP/Net-HTTP-6.120.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=OALDERS +DIST_VERSION=6.12 +inherit perl-module + +DESCRIPTION="Low-level HTTP connection (client)" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="minimal test" + +PATCHES=( "${FILESDIR}/${DIST_VERSION}-networktest.patch" ) +RDEPEND=" + !minimal? ( + virtual/perl-IO-Socket-IP + dev-perl/IO-Socket-INET6 + >=dev-perl/IO-Socket-SSL-1.380.0 + ) + virtual/perl-Carp + ! +Date: Thu, 29 Dec 2016 22:25:12 -0500 +Subject: [PATCH 1/2] Allow for 302s in live tests. + +--- + t/live-https.t | 7 ++----- + t/live.t | 7 ++----- + 2 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/t/live-https.t b/t/live-https.t +index 3482bbf..82e3b3d 100644 +--- a/t/live-https.t ++++ b/t/live-https.t +@@ -63,12 +63,9 @@ for ( 1 .. 2 ) { + $buf .= $tmp; + } + $buf =~ s/\r//g; +- +- # ( my $out = $buf ) =~ s/^/# /gm; +- # print $out; + +- is( $code, "200" ); ++ ok( $code == 302 || $code == 200, 'success' ); + like( $h{'Content-Type'}, qr{text/html} ); +- like( $buf, qr{} ); ++ like( $buf, qr{}i ); + } + +diff --git a/t/live.t b/t/live.t +index 747515a..9a8306d 100644 +--- a/t/live.t ++++ b/t/live.t +@@ -57,12 +57,9 @@ for ( 1 .. 2 ) { + $buf .= $tmp; + } + $buf =~ s/\r//g; +- +- # ( my $out = $buf ) =~ s/^/# /gm; +- # print $out; + +- is( $code, "200" ); ++ ok( $code == 302 || $code == 200, 'success' ); + like( $h{'Content-Type'}, qr{text/html} ); +- like( $buf, qr{} ); ++ like( $buf, qr{}i ); + } + +-- +2.11.0 + +From e9e0dcfb01425e3f620312375eaa50c4d6d0e561 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Sun, 8 Jan 2017 17:54:44 +1300 +Subject: [PATCH 2/2] Use NO_NETWORK_TESTING env var to fence off live tests + +--- + t/live-https.t | 4 ++-- + t/live.t | 4 ++-- + t/rt-112313.t | 25 ++++++++++++++++++++----- + 3 files changed, 24 insertions(+), 9 deletions(-) + +diff --git a/t/live-https.t b/t/live-https.t +index 82e3b3d..7d5d258 100644 +--- a/t/live-https.t ++++ b/t/live-https.t +@@ -1,6 +1,6 @@ + BEGIN { +- unless ( -f "t/LIVE_TESTS" || -f "LIVE_TESTS" ) { +- print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n"; ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP Live tests disabled due to NO_NETWORK_TESTING\n"; + exit; + } + eval { +diff --git a/t/live.t b/t/live.t +index 9a8306d..a7c2f9d 100644 +--- a/t/live.t ++++ b/t/live.t +@@ -1,6 +1,6 @@ + BEGIN { +- unless ( -f "t/LIVE_TESTS" || -f "LIVE_TESTS" ) { +- print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n"; ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP Live tests disabled due to NO_NETWORK_TESTING\n"; + exit; + } + eval { +diff --git a/t/rt-112313.t b/t/rt-112313.t +index 365d498..f98040d 100644 +--- a/t/rt-112313.t ++++ b/t/rt-112313.t +@@ -1,3 +1,23 @@ ++BEGIN { ++ if ( $ENV{NO_NETWORK_TESTING} ) { ++ print "1..0 # SKIP Live tests disabled due to NO_NETWORK_TESTING\n"; ++ exit; ++ } ++ eval { ++ require IO::Socket::INET; ++ my $s = IO::Socket::INET->new( ++ PeerHost => "httpbin.org:80", ++ Timeout => 5, ++ ); ++ die "Can't connect: $@" unless $s; ++ }; ++ if ($@) { ++ print "1..0 # SKIP Can't connect to httpbin.org\n"; ++ print $@; ++ exit; ++ } ++} ++ + use strict; + use warnings; + use Test::More; +@@ -15,11 +35,6 @@ use Net::HTTP; + # So, we check that the reponse growth is only one byte after each iteration and also test multiple + # times across the 1024, 2048 and 3072 boundaries... + +-unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") +-{ +- print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n"; +- exit; +-} + + sub try + { +-- +2.11.0 + diff --git a/dev-perl/Net-IDN-Encode/Manifest b/dev-perl/Net-IDN-Encode/Manifest index 691b46caaa2c..feec532725c3 100644 --- a/dev-perl/Net-IDN-Encode/Manifest +++ b/dev-perl/Net-IDN-Encode/Manifest @@ -2,3 +2,4 @@ DIST Net-IDN-Encode-2.300.tar.gz 433068 SHA256 46b18a0a933af6709079eb5090cab2f4b DIST Net-IDN-Encode-2.301.tar.gz 433213 SHA256 681dc68318d237d6722eb035e40578744accd2c2e3b5a700735feb89fce27ae4 SHA512 7f0e2ffa7493c2ee28aa911240f23dd9a55633bd56c7655a7d00cdcf7ca7c747fc144bf6f06e6a76ceeee2a0fed20f85993765a25bee1999bd0ed0fd8b02ec90 WHIRLPOOL b611a029d06b5d5bea3065b0795e387921c8856342d5febfd8a9ef48629d18ffd0a2867f036792d945adf1af7cb92f67827406490c86fc6f03dccfe3cddccdbf DIST Net-IDN-Encode-2.302.tar.gz 433145 SHA256 f88e0036f2f4e3998bbf9a99f16b641c4f1782b528fbc6edcc067f25f17c9c31 SHA512 e213025fea99e8084bb856eeee30f188231be4a460742686571fbef522f8b0fdd5deea7c89ab12aa77bd2fb3117281e3ef1172c2285a63700f86f9683751793f WHIRLPOOL d26d26d311436510a86a9e6b20da26351561f43953b024a9083b9b2689744e5f08e6feaba936d277c32ef20303da9d9d862974ad1e8be0680dd1b2b83121e1d8 DIST Net-IDN-Encode-2.303.tar.gz 432454 SHA256 cbabac0f731e7c79312675b0b87b6e4f80c1b0cd2e27e3b30b7f056bcf0c47d4 SHA512 3053792fdba9dfa5239b20f21f8b9922d438a5e247cc3066d5097df588ec3fe2800b013c72dcebaff847468fefeb709fc2f2dbb8c2e984a384a2d66aa318d379 WHIRLPOOL 5e536b5f627e622ed974a1d9c42be6dd237e67247b1e250d7b977dd93b86eb3fa52d4476b9dcae5ef59f9431672599ab302c938b69a6a9eaf3d783f88803273c +DIST Net-IDN-Encode-2.400.tar.gz 432177 SHA256 98b6f0b57ab0c56ea17f58a158e71fe28eb6e32133f43e73a3722657b6b23329 SHA512 ea58d8825a9552851a0cac898744cdeb0e99e48f76809b58e7586d6992919339cc670506584df2d81c4e98cf7e6cfd1e96330e00f0e216f33033a743cb872d94 WHIRLPOOL c1acd3894367469aa43d038c2594e46d0342005f792820b8867da2b069459f22bf8b477bdc565dc5cd807c9bb6e433d1fc4e36dff241d5edb1f67bd90e1a604c diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild new file mode 100644 index 000000000000..8bc66fa98a63 --- /dev/null +++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=CFAERBER +DIST_VERSION=2.400 +DIST_EXAMPLES=("eg/*") +inherit perl-module + +DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="test" + +RDEPEND=" + virtual/perl-Unicode-Normalize +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-CBuilder + >=dev-perl/Module-Build-0.420.0 + test? ( + virtual/perl-Test-Simple + dev-perl/Test-NoWarnings + ) +" diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest index cdc6c260dfa1..0b940583b1ba 100644 --- a/dev-perl/Net-SSLeay/Manifest +++ b/dev-perl/Net-SSLeay/Manifest @@ -1,2 +1,3 @@ DIST Net-SSLeay-1.65.tar.gz 384413 SHA256 2fb1371120b85f018944d95736c107163f04ba56b6029c0709a2c3d6247b9c06 SHA512 e347ac7cc5ee22b9785953a5318d35fa3a2d5a21a2e726f49c74621d2dad9ea68373e208068dcd60d8a8d5ab027ae6e32fc0b671995d1645a14c2934eb5a884f WHIRLPOOL 15f38b5a026734f7a074b290979f3e346dfea125d02d8f63e7f5c163de7a4514456d3948ade61b74a53173e27aa221b9142736a98b9d6631c61f0239e6f0833b DIST Net-SSLeay-1.72.tar.gz 386011 SHA256 1baac39f0f12cee515d8bec633175bb5916ca542e5356e26420437bd6195d2f4 SHA512 33d8355af22bf76da21a6fc1f336970c6baf5a4595cd445a986bfd2de6ae4fac479d63a97d54c4cb2c9f3f1a7024c893ad0961be419adb6c51e0916829b53a88 WHIRLPOOL 13bceb86968209ae257d8144f4fc11ba9c39fe201cd9799b0135160c5b2ba17831ba35bc608739a2051a93516d4fa39738ec4d5737f2d824eb082fe25dd37a83 +DIST Net-SSLeay-1.80.tar.gz 395820 SHA256 a541a66d59fc5f9bb7af09d3a0b68305e4c43ba9488b12915728fd282ea01b93 SHA512 03b5f2ba86d20f31ef50029af94b1bcf513c7b99d9666a04e83aba4f7c8cce3e30daf6df85932619949f059177660f49a928488e61b967a12dd4aec41eafad95 WHIRLPOOL 8f11141c3caaa1e9d32368183ab9742e8c1bba5efd6702efa9e4142b6f54871f2380cdb6fe3d1aef2b63db388bdf69f3167d592eca935d93af484dd00511b03c diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild new file mode 100644 index 000000000000..b3836a480676 --- /dev/null +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=MIKEM +DIST_VERSION=1.80 +DIST_EXAMPLES=("examples/*") +inherit multilib perl-module + +DESCRIPTION="Perl extension for using OpenSSL" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="libressl test minimal examples" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + virtual/perl-MIME-Base64 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + !minimal? ( + dev-perl/Test-Exception + dev-perl/Test-Warn + dev-perl/Test-NoWarnings + ) + virtual/perl-Test-Simple + ) +" +export OPTIMIZE="$CFLAGS" +export OPENSSL_PREFIX=${EPREFIX}/usr + +src_prepare() { + sed -i \ + -e "/\$opts->{optimize} = '-O2 -g';/d" \ + -e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \ + inc/Module/Install/PRIVATE/Net/SSLeay.pm || die + + local my_test_control + my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} + + if use test; then + perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t' + fi + if use test && has network ${my_test_control} ; then + eapply "${FILESDIR}/1.72-config-nettest-yes.patch" + else + eapply "${FILESDIR}/1.72-config-nettest-no.patch" + fi + + perl-module_src_prepare +} diff --git a/dev-perl/PDF-Create/Manifest b/dev-perl/PDF-Create/Manifest index 84ea9326773d..46f7fb5da131 100644 --- a/dev-perl/PDF-Create/Manifest +++ b/dev-perl/PDF-Create/Manifest @@ -3,3 +3,4 @@ DIST PDF-Create-1.37.tar.gz 120384 SHA256 fd2e76a5d5aefe40421dd2ebd90d61f9239344 DIST PDF-Create-1.38.tar.gz 120542 SHA256 9052441d861ef2d5c8f64e975a5b9e2a0a9011092534ea4e2dfde58f381c4406 SHA512 ad42cd9c2d6e072f3660b34a378995a1a8c5bc9661e906cc78810927980b33d78999a5b1ba06a157087a83e3aa3f9532866f6ef4ad8806d40192d1492a58995b WHIRLPOOL 8bf899a4d6c6d46f6d8be15c14dfce25caf322f656dc8298451b95d75a2792ffbfb7540c5508e557632b0f47fd6e49c9e93a804af7f42eff0d76f3793c7979e4 DIST PDF-Create-1.39.tar.gz 120549 SHA256 85d0d7b2213bb7c2dccef316028c95b0e8ef78790ffcc8f110b5d0f306e83718 SHA512 cb73bc7074a7a5a174643a53bd072313390240966f94ac61109dd540aa56ca23096b169177caa3b337ac6265cd108f9cccb374b858c33be5673b26c2a0a5a0a0 WHIRLPOOL c4d2aea7495d1055ec699e2b9669d4fdca97ac95d3480e44550ced7c554eaf86ddbb28aa2875600d28aad3b7800bde9efc969dd7d1d01c6822197eb68907d15b DIST PDF-Create-1.40.tar.gz 120567 SHA256 947a2f4d6dfcdacc65270f84dbfc05672b80dda03a1d8a3275a37a76561e41e1 SHA512 b791e3c99c48c8c9eb9f45b68c67e279b482b4e49053c803e8264910f127cf62b17461abf49534e96d35e6fc31848ffc15ffc288061033847afb63f377f56369 WHIRLPOOL 490b38d653d633f9a7a30bd405cd2dba41349f649562010b48772c5a7626acca88c297b3c11fb2ce2abf4cb8bbb8e67221116358b8226fb658fd04adeec70850 +DIST PDF-Create-1.41.tar.gz 120862 SHA256 cd7a08778d93cf5047a0d47a8981d9917554815e100a29800e6c869f479b3fdd SHA512 d554e2f26d6bb36978eb325b0e64b1f326f9c6f44543cfb7c6bda11927322f45344f6663e83d43a68249435f414324fe54ec62d5fe6f3aee988f12b36c8f3bab WHIRLPOOL edf349f3e83725bb2f71f0c4b3b40fcbf806283bbf8e1803844da3a89693f83d32582309aa4160465fb4f4cf352e3845377b7ed237c167641cb8815749d93c19 diff --git a/dev-perl/PDF-Create/PDF-Create-1.410.0.ebuild b/dev-perl/PDF-Create/PDF-Create-1.410.0.ebuild new file mode 100644 index 000000000000..49d338f67496 --- /dev/null +++ b/dev-perl/PDF-Create/PDF-Create-1.410.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=MANWAR +DIST_VERSION=1.41 +DIST_EXAMPLES=( "eg/*" ) +inherit perl-module + +DESCRIPTION="Create PDF documents in Perl" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~x86" +IUSE="test examples" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Data-Dumper + >=dev-perl/File-Share-0.250.0 + dev-perl/JSON + virtual/perl-Scalar-List-Utils +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + dev-perl/File-ShareDir-Install + test? ( + virtual/perl-File-Temp + >=dev-perl/Test-LeakTrace-0.140.0 + >=virtual/perl-Test-Simple-1.0.0 + ) +" +src_test() { + perl_rm_files "t/changes.t" "t/meta-json.t" "t/meta-yml.t" "t/pod.t" "t/manifest.t" + perl-module_src_test +} diff --git a/dev-perl/Params-ValidationCompiler/Manifest b/dev-perl/Params-ValidationCompiler/Manifest index b903edd75bad..0097f1ae66e4 100644 --- a/dev-perl/Params-ValidationCompiler/Manifest +++ b/dev-perl/Params-ValidationCompiler/Manifest @@ -1 +1 @@ -DIST Params-ValidationCompiler-0.20.tar.gz 39926 SHA256 bff602a1819d5400884d65ad9df7622394c8b44db3553a86e5b54416d89c2d94 SHA512 c3d6e48dc24aca2c91fe42a7cd74232f98f5fd2deddc5b4a4115a3100e294351ffd20112ec6e408932a9f88ffaa60f6ff5cb8ae891717de2d9a8f3bceab5494d WHIRLPOOL 43448af29139a64d188277412b3511761c37077b10f7734cdab2d681a3b7d21fd100d4e2e7e1d561e4a9ecae91b037aa7e782ca7cbad9851b29810f887cae2fb +DIST Params-ValidationCompiler-0.22.tar.gz 39995 SHA256 bbec2b029e8f07801916b8ead4df5016a24daacac7a680f78dfcf70bd8d5f847 SHA512 078b54bc18e840dc19b0cb9f2507728c2977d22276c3ed7b239ea31db91188eac3de69229884a150093c6d70d07872906c545eb044c9d360b96de438c23adf9c WHIRLPOOL ffe4f61faac4aa8ca980ee5a8f72bda04a4b11f1fb183ff25ba42f40e75d2730f8ec316a77e1effb17dc65893bd8172007544d4c67f31d44dc6eb9c9e9984d3b diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.200.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.220.0.ebuild similarity index 92% rename from dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.200.0.ebuild rename to dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.220.0.ebuild index b699842438ed..65eae56bf1d6 100644 --- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.200.0.ebuild +++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.220.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 DIST_AUTHOR=DROLSKY -DIST_VERSION=0.20 +DIST_VERSION=0.22 DIST_EXAMPLES=("eg/*") inherit perl-module diff --git a/dev-perl/Ref-Util/Manifest b/dev-perl/Ref-Util/Manifest index 3b1574d2e68b..a92ce0221032 100644 --- a/dev-perl/Ref-Util/Manifest +++ b/dev-perl/Ref-Util/Manifest @@ -1 +1,2 @@ DIST Ref-Util-0.101.tar.gz 62957 SHA256 89e3db1e21dfbbb3544ce8e42079b513ca3f76c28a2bec4f8cdaa94abfdff493 SHA512 3b5ec65a6d3098615ada29be8f2a61800c351549dc33b6133522dba528108b2199e73a941212bba381de91508b7e7a01189b4c0728a669ed78c25f06641c10fb WHIRLPOOL dd2e3bb54adb1e81f57a933e4933d368f1b928ffbbd586de8cb543d199c176b50fb098114a83a7d3749bcc92054c82299b0f140d1658809a3021cdfa65cef631 +DIST Ref-Util-0.111.tar.gz 66847 SHA256 13db11e34d6fbb1fbcb493ec6f9e84ef0d3aaafc27e2f4f6f754184b88e92616 SHA512 a5f1b9c480f637484445607e679ec90989b3787c3dea0876ea69f15da24925a9a205ecd6f04af5869629597d968528115da0550f504f9502cc02b2cade8c6ae4 WHIRLPOOL 2573079dd0f35c01b16cf7dbb0eef6b131aee6d530701a84dd5a7b5609a0ac3d21ca793a30a6d7e0343f7ee14353ca79341bfd97359998681cd7aad3cee17ec6 diff --git a/dev-perl/Ref-Util/Ref-Util-0.111.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.111.0.ebuild new file mode 100644 index 000000000000..dea1572a5e66 --- /dev/null +++ b/dev-perl/Ref-Util/Ref-Util-0.111.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=XSAWYERX +DIST_VERSION=0.111 +inherit perl-module + +DESCRIPTION="Utility functions for checking references" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="MIT" +IUSE="test" + +RDEPEND=" + >=virtual/perl-Exporter-5.570.0 + virtual/perl-XSLoader +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=virtual/perl-CPAN-Meta-2.120.900 + virtual/perl-Test-Simple + virtual/perl-File-Spec + ) +" +src_test() { + perl_rm_files t/author-* t/release-* + perl-module_src_test +} diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest index aaab14523548..8497a0e77759 100644 --- a/dev-php/PEAR-HTTP_Request2/Manifest +++ b/dev-php/PEAR-HTTP_Request2/Manifest @@ -1,3 +1 @@ -DIST HTTP_Request2-2.0.0.tgz 97476 SHA256 39697e6059db1f1fcf8f45bbd9cf157e9f7e037565a235c2f1a28c9875af14bf SHA512 e77010002741e5dde07d84f03ac05b65c77812bdee624e464e7e787b2b706b20fae50fe145ea268b62b051facbcaf00da57562cada990fd98ae71bad4e6ca9bf WHIRLPOOL feaa45c75ab38c015b9f554363f994a02e320304518a047ccc2fa4a62cc12603d3439a282915c1d5db2b9b1b896e1a156d88a6164d6dfb963a01cbb559d647fa -DIST HTTP_Request2-2.1.1.tgz 99151 SHA256 6f809dcdf3912847d43068791a0565b9e69f2bf41200aa23aad436498c665918 SHA512 b01f4dfbad090e26fb0457f9ffdb857c804b15aa25a94296b064b2cc25dc7878dfd99788dc0fc161bb53cb4c506e3f9db13cdbf307edd41d8cb91db63910bb47 WHIRLPOOL 5b8dfbf7f55a05bad79cf78646656c9a2badc7434340adf133032b360d7c05d789e1ab9ddf2aeb1dbbb885cbb99345956769d62033f148bba10cc7540051dee1 DIST HTTP_Request2-2.2.1.tgz 107339 SHA256 1cb082560db3344a1189cd33a354091bd55ad1944a5c9152a2573b031d960704 SHA512 377421f521184b3dc4f28b1d37a1f673ee2b40b8786e39c3803ed6c60f57a2aa8353018ea588598b7ef23a1345227a41481519932998dd01958df623d00dcd82 WHIRLPOOL c70f8f159546f2fc0464ce4a199aa9ad14555a77ed2bf7a0ec0f9110b824fc72c0c4267e20dab021ee10489ba476b011ff6a64c5276535514d6b7f675f67787c diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.0.0.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.0.0.ebuild deleted file mode 100644 index 31f8df8c433e..000000000000 --- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.0.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit php-pear-r1 - -DESCRIPTION="Provides an easy way to perform HTTP requests" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86" -IUSE="+curl +fileinfo +ssl +zlib" - -RDEPEND="dev-lang/php[curl?,fileinfo?,ssl?,zlib?] ->=dev-php/PEAR-Net_URL2-0.3.0" diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.1.1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.1.1.ebuild deleted file mode 100644 index 70b4532c9eca..000000000000 --- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.1.1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit php-pear-r1 - -DESCRIPTION="Provides an easy way to perform HTTP requests" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+curl +fileinfo +ssl +zlib" - -RDEPEND="dev-lang/php[curl?,fileinfo?,ssl?,zlib?] ->=dev-php/PEAR-Net_URL2-0.3.0" diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild index cd16ba312226..1c46a3b05a93 100644 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild +++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.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 # $Id$ @@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" IUSE="examples sasl" DEPEND="" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild index f8acd6af728e..c957c7976359 100644 --- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild +++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.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 # $Id$ @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/roundcube/${MY_PN}" SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" IUSE="sasl" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild index 0bb7e9da4a0c..304741010ffc 100644 --- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild +++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://pear.php.net/package/${MY_PN}" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" IUSE="" DEPEND="" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest index e23b5616547d..dc7c6d497be5 100644 --- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest +++ b/dev-php/PEAR-PEAR_PackageFileManager/Manifest @@ -1,2 +1 @@ -DIST PEAR_PackageFileManager-1.6.3.tgz 82393 SHA256 c2b392a4807510659bfe77470d7732b21eab2aa752d2a53601d55ff335f9068d SHA512 33b790a15db6cb4b14369472291f6815d6d2fdf4918ea57f9fb7fee78b4a39e811e6ab8217878bcf0b7c4c5b239477a4da1fba5cea86e80023838de43bdc9492 WHIRLPOOL 061a7084b8afe49f8ddf501bfcd48cdfe99b8bc360142f801d61e3ba719c2e902e592bbe6b65c553be61544a379a034d623a24cec53b5b6c35c6a9941a7abb43 DIST PEAR_PackageFileManager-1.7.2.tgz 38104 SHA256 596fa07ab384cd360cdcf0fc4c288f77220564c2dbd5594eea9de3ed4d5286b1 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056 WHIRLPOOL 098f99f3b9d770ea7d471fde7ca2f7ffa11c633adc8d8dc038e846e00fbe0eabcd904a87baa8018c9bb8193158dd3a468f2054b9416f942837426a6afaf706f5 diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild deleted file mode 100644 index 963eb193b7dc..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.6.3.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit php-pear-r1 - -DESCRIPTION="Takes an existing package.xml file and updates it with a new filelist and changelog" - -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="minimal" - -RDEPEND="dev-lang/php[xml,simplexml] - !minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )" diff --git a/dev-php/PEAR-Pager/Manifest b/dev-php/PEAR-Pager/Manifest index 2ee4720b2394..1e52ddcc61bb 100644 --- a/dev-php/PEAR-Pager/Manifest +++ b/dev-php/PEAR-Pager/Manifest @@ -1,2 +1 @@ -DIST Pager-2.4.8.tgz 36122 SHA256 4325e159159731cb21a4282d014c3f7a6b89968f5e3403a7a7fcd7598e218209 SHA512 c5190ab4a52446470b8b62529cbb50970919c4668ee324a88d646f0f3c057b6feb642fd1eaaad39a846afd1d35b621fdbdabfbae2946732afe53b002662f1c3f WHIRLPOOL 6af7f4310416a59961a32d60de49ec1f7f91a98bf942c49b980af450aa794d4b2632f31fdfaec007bccebe271a1bf95f4c0c65662231b305801a6abfc90a54c3 DIST Pager-2.4.9.tgz 36055 SHA256 80f3136cb806342311fcfbf866ef0f7ddedae7d7dd002e569b5c7bf0d7d6ae8f SHA512 1bd4cef68d0f0ef3a6cf4b44eec1d6ec99725bcbc4ac575a111e8de67538c09a4b09fe0dbbd57cdfd6d4f395e55857eb71cb6914a94e7efd03e6f6d78a592864 WHIRLPOOL 60f6b32cb48c3e6070a97e884c25830663dc8353454d6c9c8a437c78922cc3a8b2f43452e3cee485b8667fa288b26c68133916fcfe4e7da089b9f7bf79df0356 diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.4.8.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.4.8.ebuild deleted file mode 100644 index 130ca688721d..000000000000 --- a/dev-php/PEAR-Pager/PEAR-Pager-2.4.8.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit php-pear-r1 - -DESCRIPTION="Data paging class" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="" diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml index aca42932b833..f08fcb2b1823 100644 --- a/dev-php/PEAR-Pager/metadata.xml +++ b/dev-php/PEAR-Pager/metadata.xml @@ -1,8 +1,11 @@ - - php-bugs@gentoo.org - PHP - + + php-bugs@gentoo.org + PHP + + + pear/Pager + diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild index 21792447cf51..4723602f5946 100644 --- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild +++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.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 # $Id$ @@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}" SRC_URI="http://pear.php.net/get/${MY_P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" IUSE="" DEPEND="" diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0-r1.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0-r1.ebuild index 54779be2087d..2eba6c2ee8e1 100644 --- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0-r1.ebuild +++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.3.0-r1.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 # $Id$ @@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}" SRC_URI="http://pear.php.net/get/${MY_P}.tgz" LICENSE="PHP-2.02" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" IUSE="examples" # PCRE is needed for a few calls to preg_replace and preg_match. diff --git a/dev-php/agavi/Manifest b/dev-php/agavi/Manifest index 032184971862..0f3f747c0403 100644 --- a/dev-php/agavi/Manifest +++ b/dev-php/agavi/Manifest @@ -1 +1 @@ -DIST 1.0.7.tgz 2064782 SHA256 46cb0f9a4f9381ec06e0b82b11683930ac732140188b2e841d3e73d2574173f7 SHA512 157d1213b8279a4edd1706f66334bc60889b51b1e71c6d398b74272c72ff47f540f7c7eaf3b1c57c0d6e4397c647f80264a74fa5929d5521ec67799aa9f58156 WHIRLPOOL 999d7275a3a42dd1abdec017597015c6c500abdf80a9b0d40ff1fab3ff19694225f9f080eae7389e7fedf97ef46c96587f95e78b9793c7ec53c1561d5beee9ff +DIST agavi-1.0.8.tgz 2074126 SHA256 9770662721b9f59ca2324a02ca9f698a08b517beeae30cc5e14677b175440b9b SHA512 9e75ef0be455e329db8b2389d7fd7a7acb25d04dda6c31dea15496dc4e24ab17cf0e44e199d0c2a9fb11987331d582cf0c700adee815cac7276c32643b9183ee WHIRLPOOL 273c347182669e0d2f345ee5353a529edfff46eec645f069228e3fc71ca65222e3cb1214c70bbaa433545ee1d0ce65c2b2f2d24605ee399690576cbb95410e83 diff --git a/dev-php/agavi/agavi-1.0.7.ebuild b/dev-php/agavi/agavi-1.0.7.ebuild deleted file mode 100644 index b0bee74d27c0..000000000000 --- a/dev-php/agavi/agavi-1.0.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit php-pear-lib-r1 - -DESCRIPTION="PHP5 MVC Application Framework" -HOMEPAGE="http://www.agavi.org/" -SRC_URI="http://www.agavi.org/download/${PV}.tgz" - -LICENSE="LGPL-2.1+ icu unicode ZLIB public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# currently fails to install with dev-php/PEAR-PEAR_PackageFileManager-1.7.0 -DEPEND=" - >=dev-lang/php-5[xml] - >=dev-php/PEAR-PEAR-1.6.2-r1 - >=dev-php/phing-2.4[-minimal] - - - php-bugs@gentoo.org - PHP - + + php-bugs@gentoo.org + PHP + + + + Install the "agavi" executable used to manage projects. This + requires dev-php/phing, and may be omitted if you are + (for example) deploying an existing site to a production server. + + + + agavi/agavi + diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest index 7688dea01ea7..c937f4417086 100644 --- a/dev-php/phing/Manifest +++ b/dev-php/phing/Manifest @@ -1 +1 @@ -DIST phing-2.10.1.phar 851181 SHA256 7df436757a0a9427e1983af4847abfbadc92a6b4535b1e60b69bacfb139da6f8 SHA512 026b08945f189be30b29268aa9a8fb889975addd385e7087cb3f1e1bd2b5a01cabddff47fa52d197bbc520c4d5ad6e47edaa5446300e0baeebff24165f7c4246 WHIRLPOOL ae60318f2551510ca40b011f538849928256d2e081d6d910f14f519db2838edf0925256df2a33dee4d37797d7b670e8761e3a93340fe1d44ad951b841fa08492 +DIST phing-2.16.0.tgz 4142331 SHA256 86276306cbb5e692951199fc658a545eec38279fe1e4b1823b71b2bd08715bab SHA512 f738d08a195d69c32a035dd3739e0cbc56946173dc31e8fdc8fc07664139b2b97832a6bbb527785e5dfe025530c364a1ed1075a0b77baecfc2395ec78549ba72 WHIRLPOOL 263510867e1cc4896f075b4d0b75da7f0dbbaa9acba202adacfd0524ecf8a57500a934c35a3b21384ccb892376cf2cfe87d1d4416d097c0896b51ccb02f0dbca diff --git a/dev-php/phing/files/autoload.php b/dev-php/phing/files/autoload.php new file mode 100644 index 000000000000..437a7dc7ee1e --- /dev/null +++ b/dev-php/phing/files/autoload.php @@ -0,0 +1,14 @@ + - - php-bugs@gentoo.org - PHP - + + php-bugs@gentoo.org + PHP + + + phingofficial/phing + + + + Support zip archives by requiring said support in + dev-lang/php. + + diff --git a/dev-php/phing/phing-2.10.1.ebuild b/dev-php/phing/phing-2.10.1.ebuild deleted file mode 100644 index ecc1044d8500..000000000000 --- a/dev-php/phing/phing-2.10.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -DESCRIPTION="PHP project build system based on Apache Ant" -HOMEPAGE="http://www.phing.info/" -SRC_URI="http://www.phing.info/get/phing-${PV}.phar" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+minimal" - -DEPEND="" -RDEPEND="!minimal? ( dev-php/phpDocumentor - dev-php/PHP_CodeCoverage - >=dev-php/PEAR-HTTP_Request2-2.1.1 - >=dev-php/PEAR-PEAR_PackageFileManager-1.5.2 - >=dev-php/PEAR-VersionControl_SVN-0.3.0_alpha1 - >=dev-php/phpmd-1.1.0 - >=dev-php/phpunit-4.0 - >=dev-php/xdebug-2.0.5 - >=dev-php/simpletest-1.0.1_beta2 ) - dev-lang/php:*[cli,phar,xml,xslt] - " - -S=${WORKDIR} - -src_unpack() { :; } - -src_install() { - insinto /usr/share/php/phing - insopts -m755 - newins "${DISTDIR}/${P}.phar" phing.phar - dosym /usr/share/php/phing/phing.phar /usr/bin/phing -} - -pkg_postinst() { - if use minimal; then - elog "You have enabled the minimal USE flag. If you want to use features" - elog "from xdebug, phpunit, simpletest and more, disable the" - elog "USE flag or emerge the packages manually" - fi -} diff --git a/dev-php/phing/phing-2.16.0.ebuild b/dev-php/phing/phing-2.16.0.ebuild new file mode 100644 index 000000000000..c46dc8178220 --- /dev/null +++ b/dev-php/phing/phing-2.16.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="PHP project build system based on Apache Ant" +HOMEPAGE="http://www.phing.info/" +SRC_URI="http://www.phing.info/get/${P}.tgz" + +LICENSE="FDL-1.3 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples minimal zip" + +RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?] + dev-php/symfony-yaml + !minimal? ( + dev-php/PEAR-HTTP_Request2 + dev-php/PEAR-PEAR_PackageFileManager + dev-php/PEAR-VersionControl_SVN + dev-php/PHP_CodeCoverage + dev-php/phpDocumentor + dev-php/phpmd + dev-php/phpunit + dev-php/simpletest + dev-php/xdebug + )" + +S="${WORKDIR}" + +src_install() { + dodoc CHANGELOG.md CREDITS.md README.md + dodoc -r docs/docbook5/en/output/hlhtml + use doc && dodoc -r docs/api + use examples && dodoc -r docs/example + + # Install the executable (and the PHP file it wraps) outside of the + # PHP include directory, since nobody should be including it. + exeinto "/usr/share/${PN}/bin" + doexe "bin/${PN}" + insinto "/usr/share/${PN}/bin" + doins "bin/${PN}.php" + dosym "/usr/share/${PN}/bin/${PN}" "/usr/bin/${PN}" + + # Phing tries to get the version number from this file. + insinto "/usr/share/${PN}/etc" + doins etc/VERSION.TXT + + # The executable will only look for autoload.php in one place, so we + # create an (otherwise pointless) vendor directory to house it. + insinto "/usr/share/${PN}/vendor" + doins "${FILESDIR}/autoload.php" + + # But install the library under /usr/share/php. + insinto "/usr/share/php" + doins -r "classes/${PN}" +} diff --git a/dev-python/isodate/isodate-0.5.0.ebuild b/dev-python/isodate/isodate-0.5.0.ebuild index 0e25a5b5d9b4..bcd182ced7f4 100644 --- a/dev-python/isodate/isodate-0.5.0.ebuild +++ b/dev-python/isodate/isodate-0.5.0.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 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy ) inherit distutils-r1 -DESCRIPTION="ISO 8601 date/time/duration parser and formater" +DESCRIPTION="ISO 8601 date/time/duration parser and formatter" HOMEPAGE="https://pypi.python.org/pypi/isodate" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/isodate/isodate-0.5.1.ebuild b/dev-python/isodate/isodate-0.5.1.ebuild index 0e25a5b5d9b4..bcd182ced7f4 100644 --- a/dev-python/isodate/isodate-0.5.1.ebuild +++ b/dev-python/isodate/isodate-0.5.1.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 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy ) inherit distutils-r1 -DESCRIPTION="ISO 8601 date/time/duration parser and formater" +DESCRIPTION="ISO 8601 date/time/duration parser and formatter" HOMEPAGE="https://pypi.python.org/pypi/isodate" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild index 15437cb6c83d..a9e5d814be19 100644 --- a/dev-python/isodate/isodate-0.5.4.ebuild +++ b/dev-python/isodate/isodate-0.5.4.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 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) inherit distutils-r1 -DESCRIPTION="ISO 8601 date/time/duration parser and formater" +DESCRIPTION="ISO 8601 date/time/duration parser and formatter" HOMEPAGE="https://pypi.python.org/pypi/isodate" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest index ba01da42b1e5..a1d1f76490c9 100644 --- a/dev-python/jinja/Manifest +++ b/dev-python/jinja/Manifest @@ -1,3 +1,4 @@ DIST Jinja2-2.7.3.tar.gz 378470 SHA256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb SHA512 2810db2b52fe800e2a4a47ea41a07f997b1647a2b7ad05fe564f9d554d6a402283c84c4e2491e5dad8d22acd83d3ca420f0983ed2effc732f6d79600a846071b WHIRLPOOL ece9b68dff414739103eac202b5903d96802939f5742a2bf3ff421d87ef49043ed9a4b2a3a6bf0c2f3d9be0d8295b73c47b253553731b44912cb58add8f233c0 DIST Jinja2-2.8.1.tar.gz 358129 SHA256 35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891 SHA512 0a2e2aa94f5c2f04f79d59d34d5324d2a440385b71192e85e960c761b4a073400e4ab0458e57305650f696a474593d6fbf398fb1d9518be261bb2a5cb866e163 WHIRLPOOL 380636268f903d05afda9c41296986d1c83949dead6c78d3e3cb880137a6c6ec06f0e2297169fc0ea8fd1348c9928f5841d37f951dd941fe89a8ccc96080e191 DIST Jinja2-2.8.tar.gz 357055 SHA256 bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb WHIRLPOOL 31adc38738848aa224cceb0d0afb2b85eb080d166ed84f145eb0576eeedfb91cf8d99d7c98b6a6cc6ab4fedf33fdbe3171c80fd559df48036a7441232702e749 +DIST Jinja2-2.9.2.tar.gz 368290 SHA256 2333eae399fb538f934d661f7debab8a9736002c343c8e95c56f1e413076c0ce SHA512 989b9a0c8975916a98f5caaa85e4d18dad751d3373b9a1e7539740d456438aa9d2f1ffcd81b20c0a262da6579b4b4a9228969c8a7dc42c8959bd887ba4c59766 WHIRLPOOL debe3027a5a9ac108344bd591ec4d37d1957bc05a4bc6edc7c3d24420f1828dba1ad769babc1cad8ccde407637dc3ea1cb3e05950f183aab1a347ff46c8cf33a diff --git a/dev-python/jinja/jinja-2.9.2.ebuild b/dev-python/jinja/jinja-2.9.2.ebuild new file mode 100644 index 000000000000..2517c5c6dfc9 --- /dev/null +++ b/dev-python/jinja/jinja-2.9.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit eutils distutils-r1 + +MY_PN=Jinja2 +MY_P=${MY_PN}-${PV} + +DESCRIPTION="A full-featured template engine for Python" +HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +IUSE="doc examples" + +RDEPEND=" + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + !dev-python/jinja:compat" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +# XXX: handle Babel better? + +S=${WORKDIR}/${MY_P} + +wrap_opts() { + local mydistutilsargs=() + + if [[ ${EPYTHON} == python* ]]; then + mydistutilargs+=( --with-debugsupport ) + fi + + "${@}" +} + +python_compile() { + wrap_opts distutils-r1_python_compile + if [[ ${EPYTHON} == python3.2 ]]; then + 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die + fi +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + esetup.py test +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + use examples && local EXAMPLES=( examples/. ) + + distutils-r1_python_install_all + + insinto /usr/share/vim/vimfiles/syntax + doins ext/Vim/* +} + +pkg_postinst() { + if ! has_version dev-python/Babel; then + elog "For i18n support, please emerge dev-python/Babel." + fi +} diff --git a/dev-ros/urdf/urdf-1.12.6.ebuild b/dev-ros/urdf/urdf-1.12.6.ebuild index ce8d3c0baed6..8ad9688b02c1 100644 --- a/dev-ros/urdf/urdf-1.12.6.ebuild +++ b/dev-ros/urdf/urdf-1.12.6.ebuild @@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm" ROS_SUBDIR=${PN} PYTHON_COMPAT=( python2_7 ) -inherit ros-catkin +inherit ros-catkin flag-o-matic DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)" LICENSE="BSD" @@ -28,3 +28,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ros/cmake_modules test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )" + +src_prepare() { + append-cxxflags -std=gnu++11 + ros-catkin_src_prepare +} diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest index 378daa99a8b0..95ed6687f3ce 100644 --- a/dev-ruby/climate_control/Manifest +++ b/dev-ruby/climate_control/Manifest @@ -1 +1,2 @@ DIST climate_control-0.0.3.gem 7168 SHA256 a5e8109935ad74e63ddbc20f37fb25f01737cd8a7dc99964d89ca26526b7334f SHA512 9e3b5fbf494e0757fdf52b2b6015d11b2b3aaece95e7226b98ca817a9af731a393ddf9a2278877e7f2ed75c68ff05a06769df03b08cc62757b5af123f7d95f30 WHIRLPOOL 7a1a8bf5981c1c69f525794c305868dab8ac450e9eefb91a5049b5a386e66ae48622178482b812063657de4fe63816aac70c97f36c2cb2d34c962f384acc331a +DIST climate_control-0.1.0.gem 9216 SHA256 96ba15abdaaa9647e638cc4b3631d5ddf4a29478d96630947fdf0c345131ef72 SHA512 59e96a8b8b833b7370ed4a11e854ae6088c9f637ed7a1a6dda1666ccbe072f48ea2467508c4b1aa675e88f595aee6d9cc9f3617d75594c388ef6a8d3af44831f WHIRLPOOL 922b87074fe13f87083e8b639d04ad4f6929307da346adefd511791d14963390ca8fde9741733e91769fbfcabab5620fecbeb68ebd98972cd767653b9e9d89e3 diff --git a/dev-ruby/climate_control/climate_control-0.1.0.ebuild b/dev-ruby/climate_control/climate_control-0.1.0.ebuild new file mode 100644 index 000000000000..6fc1722792d5 --- /dev/null +++ b/dev-ruby/climate_control/climate_control-0.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="NEWS README.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Easily manage your environment" +HOMEPAGE="https://github.com/thoughtbot/climate_control" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +all_ruby_prepare() { + # Avoid dependencies on simplecov and git. + sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die + sed -i -e 's/git ls-files/echo ""/' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild index 34f782594b61..84f31010cc70 100644 --- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild +++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.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 # $Id$ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby21 ruby22 ruby23 ruby24" # no tests present RUBY_FAKEGEM_TASK_TEST="" diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest index e8460393e8e5..2b23fcfe50b7 100644 --- a/dev-ruby/hoe/Manifest +++ b/dev-ruby/hoe/Manifest @@ -2,3 +2,4 @@ DIST hoe-3.13.0.gem 130048 SHA256 a74013aa6749ab10f0db92e9ad56e735d407104baa0981 DIST hoe-3.14.1.gem 130048 SHA256 dc2a2cc4ce1d856fd57a8e1d87455eae4025c9b1380e362fb75397de8ec323e5 SHA512 2bce2691a0cfa1d573987cdbf6f54390b5f3a5c93b06d5542309ccff7a17e834ecd5eec50b41cab9c6c5d355721428626644b17fb3ac8c9db23b74984666d3dc WHIRLPOOL 14b4cfca20346b07c2d584988864baea38098bb07a60e86e77d01e3b4bf1be40e2470729f81083d1172f3a2b2a1c85b5e917a2d2a7c530adfa453ddde4a24b69 DIST hoe-3.15.2.gem 188416 SHA256 f76b3503ba8dc1906ccd37e293a979b54dbc43ef49f6c2effbeddc9d64723ee6 SHA512 1d15551c59b9314d8c5a4514f93491100c9d31c0011fde34c937d9ee12cba3b073e112950659173034f754cf57f5d4b602487fd933b23ed8c23c3a1bcbcacf3f WHIRLPOOL d423ad2c5eee095045299877ea65cb04991096f89878f4d245b51463524952feff8a0002cd46841d51d587d5b85d950ed933238a52f0e0b68e2fae2a3313aee3 DIST hoe-3.15.3.gem 188416 SHA256 4e772892e8f23055adc7f8579153fc37b0636cbcb31e6e57b1e06b7fd55de717 SHA512 04800928b5966334bb4529fb1d1374f2027020f936f1e890bbc429a7995cac2e7951054bfe26388c42b2809d802fb234da83aaca97358ff9356a8347a7cf12ac WHIRLPOOL 92008c05bad3e1c14f12e8defd15f97a173f5a8ad98f55d998af6ce7a617b1ebf9b9e53965ffacdfb3a9ef1a1b92cd1515ee88c744eec25cbbfc1c4cc85da38a +DIST hoe-3.16.0.gem 188416 SHA256 8bee33376af7dacbd0f3440614453589e60df14c13471c938ab6124bb8b6280f SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606 WHIRLPOOL 778b59cab2ed778fa8e4ad62e90ca26b346bd0942e747f17594fbc475bc233f7495e5b4457818fc97e04b6111197d40012ebaa65acf5d2a27862c09d2a61acbe diff --git a/dev-ruby/hoe/hoe-3.16.0.ebuild b/dev-ruby/hoe/hoe-3.16.0.ebuild new file mode 100644 index 000000000000..75c7c87dbca7 --- /dev/null +++ b/dev-ruby/hoe/hoe-3.16.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby21 ruby22 ruby23 ruby24" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc" + +RUBY_FAKEGEM_EXTRAINSTALL="template" + +inherit ruby-fakegem + +DESCRIPTION="Hoe extends rake to provide full project automation" +HOMEPAGE="https://www.zenspider.com/projects/hoe.html" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )" + +ruby_add_rdepend ">=dev-ruby/rake-0.8.7 =dev-ruby/minitest-5.8:5 + )" + +ruby_add_rdepend "dev-ruby/json:2" + +all_ruby_prepare() { + # Other packages also have use for a nonexistent directory, bug 321059 + sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die + + # Avoid unneeded dependency on bundler, bug 603696 + sed -i -e '/bundler/ s:^:#:' \ + -e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die + + # Remove test that is depending on the locale, which we can't garantuee. + sed -i -e '/def test_encode_with/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die + + # Remove test depending on FEATURES=userpriv, bug 361959 + sed -i -e '/def test_check_files/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die + + # Remove tests for code that is not included and not listed in Manifest.txt + rm -f test/test_rdoc_i18n_{locale,text}.rb \ + test/test_rdoc_generator_pot* || die +} + +all_ruby_compile() { + all_fakegem_compile + + if use doc ; then + ruby -Ilib -S exe/rdoc || die + fi +} + +each_ruby_compile() { + ${RUBY} -S rake generate || die +} + +each_ruby_test() { + ${RUBY} -Ilib:. -e 'gem "json", "~>2.0"; Dir["test/test_*.rb"].each{|f| require f}' || die +} + +all_ruby_install() { + all_fakegem_install + + for bin in rdoc ri; do + ruby_fakegem_binwrapper $bin /usr/bin/$bin-2 + + for version in ${USE_RUBY}; do + version=`echo ${version} | cut -c 5-` + if use ruby_targets_ruby${version}; then + ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version} + sed -i -e "1s/env ruby/ruby${version}/" \ + "${ED}/usr/bin/${bin}${version}" || die + fi + done + done +} + +pkg_postinst() { + if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then + eselect ruby set $(eselect --brief --colour=no ruby show | head -n1) + fi +} diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest index 24e495b35821..fb9bc74479f7 100644 --- a/dev-ruby/text/Manifest +++ b/dev-ruby/text/Manifest @@ -1,2 +1 @@ -DIST text-1.2.3.gem 136192 SHA256 a0e9fb0fa88b6fb5d89e370f898064604f28d0873c342b27235a767dea58e192 SHA512 bc4ad5a00dc8bb7275b5481ce3be1efe1b32a9bb83e818025c0d815c19addf1fa7ed99855ac3188aef5ce54150323a8dc9573bd193e195614731c093fb7fd917 WHIRLPOOL db7d6f2d0472467ee594f05ba8fdbf20159869342d6fba77ff31407428e7eabe6e5b3808cc2aa10d8cf223e544fae10cbe8ab1e28b0621eae85c490eae31141d DIST text-1.3.1.gem 138752 SHA256 2fbbbc82c1ce79c4195b13018a87cbb00d762bda39241bb3cdc32792759dd3f4 SHA512 0380fc77e2f0d427afd9015ed904947311139e52adf3d49b748d0e6ee32c579073ec979f0cdbc117b53e3d841f25ce9f271637dd7edb5f6e124e369cca788eb8 WHIRLPOOL 66da2d453d3a4dc332166b5ccabcdb586748d3a3d979a4b7281e69157c04d389a95ff8ecb6727b0952a6dbaba4068f262b856e19c39a7cfd9d296d1eb4b70a91 diff --git a/dev-ruby/text/text-1.2.3-r2.ebuild b/dev-ruby/text/text-1.2.3-r2.ebuild deleted file mode 100644 index c41746d3bc4a..000000000000 --- a/dev-ruby/text/text-1.2.3-r2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby20 ruby21" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.rdoc" - -inherit ruby-fakegem - -DESCRIPTION="A collection of text algorithms" -HOMEPAGE="https://github.com/threedaymonk/text" - -LICENSE="MIT" - -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="" diff --git a/dev-ruby/xmlrpc/xmlrpc-0.2.1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.2.1.ebuild index c66b687f42aa..3edf785a0038 100644 --- a/dev-ruby/xmlrpc/xmlrpc-0.2.1.ebuild +++ b/dev-ruby/xmlrpc/xmlrpc-0.2.1.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 # $Id$ @@ -24,4 +24,7 @@ IUSE="" all_ruby_prepare() { sed -i -e '/bundler/ s:^:#:' Rakefile || die + + # Avoid dependency on git + sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die } diff --git a/kde-apps/ark/ark-16.08.3-r1.ebuild b/kde-apps/ark/ark-16.08.3-r1.ebuild index 5c128ad38e71..15ffd5dbc888 100644 --- a/kde-apps/ark/ark-16.08.3-r1.ebuild +++ b/kde-apps/ark/ark-16.08.3-r1.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="KDE Archiving tool" HOMEPAGE="https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="bzip2 lzma zlib" RDEPEND=" diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index ae5b36c33a28..9a440db5bd80 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,3 +1,4 @@ DIST rspamd-1.3.5.tar.xz 1483044 SHA256 d4413ccfc238c3023e2b8a9441b101a6437f521f333fc9db2dd924d473fee696 SHA512 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c WHIRLPOOL 4017484d4653a23b5a987ab0bdd40a709cd5d116dea5c02a767c5cad94bd5399d6319aa8f75e726cec5d0bd7ae9e0722786cacc33963e2f9b8fbdd0fb0986729 DIST rspamd-1.4.0.tar.xz 1769860 SHA256 30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c SHA512 39bfccee070b829f3ea5019ebde0020a850abf7fe92f7e5bb5b9212088d4c98544e6f55228984d3422c09c31f356b209237da6a6eb9c18e3feb7940429de663a WHIRLPOOL 449a15148067e4af38ca7d4218dca69064679d1a064c53d0edf99e63418d6a898fd80cdfce8707f706f19da659d44efadedab3a7ea8c3dcd54c65794f695e3d0 DIST rspamd-1.4.1.tar.xz 1779492 SHA256 11e39e4b44a85feaf546696d28a72ffc32e35c01a028a251d5175ba58343eb28 SHA512 bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d WHIRLPOOL 1cbe02c664596cd467f2f955691ec79c70ccf23a89cadf8853a1881264d555af248a1503a58da1df59142c73193074af556ca768aad349b832b95314f61615d5 +DIST rspamd-1.4.2.tar.xz 1777596 SHA256 d106f98a632ffc5cbc5e7482067d568db7687a2ffb078f97f528f9202f90a5a1 SHA512 7a2c9c736d6612088eb8d48e313feec310c740263aa3a5e30b1ae88937ecf088de533589a8ef783e238fe3dc5e579592220bd86ea0e45672bd3fc06c52f96782 WHIRLPOOL b39e81a6ddbc7f639db9373116f48ca30c031f76c888945f30d5578289d62270f649b29004ffa937549b9d529973f52ad802bd23f42130cd67fb6949e296a57f diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index aee0fd268f81..b628e7d07744 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -10,5 +10,7 @@ Enable neural network plugin (requires sci-mathematics/fann). + Use dev-libs/libpcre2 + Use dev-libs/jemalloc for allocations diff --git a/mail-filter/rspamd/rspamd-1.4.2.ebuild b/mail-filter/rspamd/rspamd-1.4.2.ebuild new file mode 100644 index 000000000000..af049b0ac70e --- /dev/null +++ b/mail-filter/rspamd/rspamd-1.4.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils pax-utils user systemd + +DESCRIPTION="Rapid spam filtering system" +SRC_URI="https://rspamd.com/downloads/${P}.tar.xz" +HOMEPAGE="https://github.com/vstakhov/rspamd" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="fann jemalloc +jit libressl pcre2" + +RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + fann? ( sci-mathematics/fann ) + pcre2? ( dev-libs/libpcre2[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] ) + jit? ( dev-lang/luajit:2 ) + jemalloc? ( dev-libs/jemalloc ) + dev-libs/libevent + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/gmime + dev-util/ragel + sys-apps/file + virtual/libiconv" +DEPEND="dev-util/ragel + ${RDEPEND}" + +QA_MULTILIB_PATHS="usr/lib/rspamd/.*" + +pkg_setup() { + enewgroup rspamd + enewuser rspamd -1 -1 /var/lib/rspamd rspamd +} + +src_configure() { + local mycmakeargs=( + -DCONFDIR=/etc/rspamd + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + -DENABLE_LUAJIT=$(usex jit ON OFF) + -DENABLE_FANN=$(usex fann ON OFF) + -DENABLE_PCRE2=$(usex pcre2 ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}/rspamd.init-r2" rspamd + + # Remove mprotect for JIT support + if use jit; then + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die + fi + + dodir /var/lib/rspamd + dodir /var/log/rspamd + + fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd + + insinto /etc/logrotate.d + newins "${FILESDIR}/rspamd.logrotate" rspamd + + systemd_newunit rspamd.service rspamd.service +} diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild index 2721f1060f3f..fd5281eda79e 100644 --- a/mail-filter/rspamd/rspamd-9999.ebuild +++ b/mail-filter/rspamd/rspamd-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils user systemd git-r3 +inherit cmake-utils user systemd git-r3 pax-utils DESCRIPTION="Rapid spam filtering system" HOMEPAGE="https://github.com/vstakhov/rspamd" @@ -13,29 +13,24 @@ EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="" -IUSE="fann +gd +jit libressl" +IUSE="fann +gd jemalloc +jit libressl pcre2" -RDEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) - libressl? ( dev-libs/libressl:0 ) - fann? ( sci-mathematics/fann ) - jit? ( - dev-libs/libpcre[jit] - dev-lang/luajit:2 - ) - !jit? ( - dev-libs/libpcre[-jit] - >=dev-lang/lua-5.1:0 - ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/gmime - dev-util/ragel - sys-apps/file - virtual/libiconv - gd? ( media-libs/gd[jpeg] )" +RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + fann? ( sci-mathematics/fann ) + pcre2? ( dev-libs/libpcre2[jit=] ) + !pcre2? ( dev-libs/libpcre[jit=] ) + jit? ( dev-lang/luajit:2 ) + jemalloc? ( dev-libs/jemalloc ) + dev-libs/libevent + dev-db/sqlite:3 + dev-libs/glib:2 + dev-util/ragel + sys-apps/file + virtual/libiconv + gd? ( media-libs/gd[jpeg] )" DEPEND="dev-util/ragel - ${RDEPEND}" + ${RDEPEND}" QA_MULTILIB_PATHS="usr/lib/rspamd/.*" @@ -52,6 +47,8 @@ src_configure() { -DLOGDIR=/var/log/rspamd -DENABLE_LUAJIT=$(usex jit ON OFF) -DENABLE_FANN=$(usex fann ON OFF) + -DENABLE_PCRE2=$(usex pcre2 ON OFF) + -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) -DENABLE_GD=$(usex gd ON OFF) ) cmake-utils_src_configure @@ -61,6 +58,11 @@ src_install() { cmake-utils_src_install newinitd "${FILESDIR}/rspamd.init-r2" rspamd + # Remove mprotect for JIT support + if use jit; then + pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die + fi + dodir /var/lib/rspamd dodir /var/log/rspamd diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index a61996d67d98..dcf4480bb691 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,3 +1 @@ -DIST feh-2.17.1.tar.bz2 2126936 SHA256 a9e818a4ad6ab427597e1799527a7576856c233525e67afb1eb2cb3ae709d853 SHA512 d8fd67ace39c690880398232ff73d315c2f0db4dad356e31edb72d02e8d31da96276c45968e0a13764c99b8c54a861478663471ca5b4cc0e9217019e6944cf07 WHIRLPOOL b87476aad62c1ab7491be1a851a79d87e14c2fde2a1168dba8f39d370c11cd0986c3e8a421d8d9936dc378f294cc2c3b99ab6c4ee8e8ef993c42b8a78816d088 DIST feh-2.18.tar.bz2 2127627 SHA256 9daebf5195511a5bde8061c932b5585b956c81193dfc00abcd758316d07ed40c SHA512 f18493dd202dfa8f51756d466012ba5f668b4e0a4b075e14c8e246724eef11192c1cc0fcd87356a461e7da2b673960112166bf5fddb0916af66d2a229f965365 WHIRLPOOL bcb4ec37be4cc7f34c7c676f4985054d01f09caf359b43c18fa972d5b4934223d63639cbf8571873ad433d45019914bda492864e15f80f72b5e8e3f87ffdf316 -DIST feh-2.9.3.tar.bz2 2082188 SHA256 b4e8d603033af12afa77ae8020bcf4ff51c6950b9a6880a0fe32b04fdf7290f2 SHA512 9a0194d43037b1f1b1bd19dc4a9a1c6073504622283c466de1d1952798f37db21b5f2f61c14eeb732c49cc22707a5b47c7009fdaec6141eb3e1b936e2b7b038d WHIRLPOOL e77bd586e26b6ad1e2fb4189fdd33a19e7b45347417223ed65669955903b4ee5efbfa9fd52763b0724efc3bd9f490fa62c77323b5ee3f89445a0338e5fb2eed5 diff --git a/media-gfx/feh/feh-2.17.1.ebuild b/media-gfx/feh/feh-2.17.1.ebuild deleted file mode 100644 index 850e5b1f0d32..000000000000 --- a/media-gfx/feh/feh-2.17.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="http://feh.finalrewind.org/" -SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="debug curl exif test xinerama" - -COMMON_DEPEND="media-libs/imlib2[X] - >=media-libs/libpng-1.2:0= - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-libs/libXt - x11-proto/xproto - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - )" - -PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch ) - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX=/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} diff --git a/media-gfx/feh/feh-2.9.3.ebuild b/media-gfx/feh/feh-2.9.3.ebuild deleted file mode 100644 index dbdc636aabdc..000000000000 --- a/media-gfx/feh/feh-2.9.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="A fast, lightweight imageviewer using imlib2" -HOMEPAGE="http://feh.finalrewind.org/" -SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2" - -LICENSE="feh" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="debug curl exif test xinerama" - -COMMON_DEPEND=">=media-libs/giblib-1.2.4 - media-libs/imlib2[X] - >=media-libs/libpng-1.2:0 - x11-libs/libX11 - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - virtual/jpeg:0" -DEPEND="${COMMON_DEPEND} - x11-libs/libXt - x11-proto/xproto - test? ( - >=dev-lang/perl-5.10 - dev-perl/Test-Command - )" - -pkg_setup() { - use_feh() { usex $1 1 0; } - - fehopts=( - DESTDIR="${D}" - PREFIX=/usr - doc_dir='${main_dir}'/share/doc/${PF} - example_dir='${main_dir}'/share/doc/${PF}/examples - curl=$(use_feh curl) - debug=$(use_feh debug) - xinerama=$(use_feh xinerama) - exif=$(use_feh exif) - ) -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch - # fix desktop file - sed -i -e "s:^Icon=.*:Icon=/usr/share/feh/images/logo.svg:" \ - share/applications/${PN}.pre || die -} - -src_compile() { - tc-export CC - emake "${fehopts[@]}" -} - -src_install() { - emake "${fehopts[@]}" install -} diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index e2e9dbf21f05..e0d58320a636 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,4 +1,2 @@ DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940 -DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d -DIST nomacs-3.2.0-source.tar.bz2 1090076 SHA256 82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad SHA512 efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049 WHIRLPOOL 076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch deleted file mode 100644 index 5f33b6565350..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 204dd809ae0d6287385905d44c1a60a38a7c4084 Mon Sep 17 00:00:00 2001 -From: diemmarkus -Date: Thu, 14 Jan 2016 16:35:55 +0100 -Subject: [PATCH] #44 (github) fix proposed by @kensingtion - ---- - ImageLounge/src/DkImageLoader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ImageLounge/src/DkImageLoader.cpp b/ImageLounge/src/DkImageLoader.cpp -index 5d66e09..3a00010 100644 ---- a/ImageLounge/src/DkImageLoader.cpp -+++ b/ImageLounge/src/DkImageLoader.cpp -@@ -512,6 +512,7 @@ QSharedPointer DkImageLoader::getSkippedImage(int skipIdx, bo - - } - -+#ifdef WITH_QUAZIP - if (mCurrentImage && (newFileIdx < 0 || newFileIdx >= mImages.size()) && mCurrentImage->isFromZip() && mCurrentImage->getZipData()) { - - // load the zip again and go on from there -@@ -522,6 +523,7 @@ QSharedPointer DkImageLoader::getSkippedImage(int skipIdx, bo - - return getSkippedImage(newFileIdx); - } -+#endif - - // this should never happen! - if (mImages.empty()) { --- -2.4.10 - diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch deleted file mode 100644 index d31f6507b836..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 060f4e972fec0308404a7e535b43254b06908a84 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Thu, 14 Jan 2016 00:24:05 +1100 -Subject: [PATCH] Fix linking failure with system quazip. - ---- - ImageLounge/cmake/UnixBuildTarget.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ImageLounge/cmake/UnixBuildTarget.cmake b/ImageLounge/cmake/UnixBuildTarget.cmake -index ce95617..8a59c97 100644 ---- a/ImageLounge/cmake/UnixBuildTarget.cmake -+++ b/ImageLounge/cmake/UnixBuildTarget.cmake -@@ -93,7 +93,7 @@ else() - - add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC}) - target_include_directories(${DLL_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS}) -- target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) -+ target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${QUAZIP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) - add_dependencies(${BINARY_NAME} ${DLL_NAME}) - set_target_properties(${DLL_NAME} PROPERTIES PREFIX "") - --- -2.4.10 - diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch deleted file mode 100644 index 71f564cb9de1..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0ac51051b7e9460a2958917750d7c31072318313 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Thu, 14 Jan 2016 00:55:24 +1100 -Subject: [PATCH] Fix build with tiff disabled. - ---- - ImageLounge/src/DkBasicLoader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ImageLounge/src/DkBasicLoader.cpp b/ImageLounge/src/DkBasicLoader.cpp -index 67ef31f..8c2c71e 100644 ---- a/ImageLounge/src/DkBasicLoader.cpp -+++ b/ImageLounge/src/DkBasicLoader.cpp -@@ -98,9 +98,11 @@ - #endif - - #else -+#ifdef WIN32 - #include - #pragma comment(lib, "oleaut32.lib") - #endif -+#endif - - #pragma warning(pop) - --- -2.4.10 - diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild deleted file mode 100644 index 3915d6dc5b15..000000000000 --- a/media-gfx/nomacs/nomacs-3.0.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="opencv raw tiff webp zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=media-gfx/exiv2-0.25:= - opencv? ( media-libs/opencv:=[qt5] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - webp? ( >=media-libs/libwebp-0.3.1:= ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-tiff-build.patch" - "${FILESDIR}/${P}-quazip-build.patch" - "${FILESDIR}/${P}-quazip-link.patch" - "${FILESDIR}/${P}-opencv3.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable opencv) - $(cmake-utils_use_enable raw) - $(cmake-utils_use_enable tiff) - $(cmake-utils_use_enable webp) - $(cmake-utils_use_enable zip QUAZIP) - -DUSE_SYSTEM_WEBP=ON - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.2.0.ebuild b/media-gfx/nomacs/nomacs-3.2.0.ebuild deleted file mode 100644 index 7ddaeb30cffd..000000000000 --- a/media-gfx/nomacs/nomacs-3.2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="opencv raw tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=media-gfx/exiv2-0.25:= - opencv? ( media-libs/opencv:=[qt5] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.4.ebuild b/media-gfx/nomacs/nomacs-3.4.ebuild deleted file mode 100644 index a113420e5a07..000000000000 --- a/media-gfx/nomacs/nomacs-3.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit cmake-utils fdo-mime - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="http://www.nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="+jpeg opencv raw tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg?] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=media-gfx/exiv2-0.25:= - opencv? ( media-libs/opencv:=[-qt4(-)] ) - raw? ( >=media-libs/libraw-0.14:= ) - tiff? ( media-libs/tiff:0 ) - zip? ( dev-libs/quazip[qt5] ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P}/ImageLounge" - -PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134 - -src_configure() { - local mycmakeargs=( - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - -DUSE_SYSTEM_QUAZIP=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest index e488c71706ee..f956bd26f0eb 100644 --- a/media-libs/exiftool/Manifest +++ b/media-libs/exiftool/Manifest @@ -1,3 +1,2 @@ -DIST Image-ExifTool-10.31.tar.gz 4201613 SHA256 192884639ff4934ecdb9edc107a0b9f1a49c9afadf457bae8fa97e15816dc1ea SHA512 6ae905be7f4670d9110d6dc9b7248b25a8aec50db89286aa85cb0bcf2de0a3f4cfabc89e32abd5cabcaa4da34d26b4efe3ed64fb7678076ea5999219502f70b4 WHIRLPOOL 73140eb16a5837e0784ef09ca8403d607070e53c22e4a182a3d381a926f24cf1b58082326ddc615dd2cc802d17377f12e329399bf6b757defb87b927eae752fa DIST Image-ExifTool-10.36.tar.gz 4214374 SHA256 2019427b6565e2cff3c1301ab3281a40e602e70eff931448a1601b96ef4a67f3 SHA512 e6075755cd7510166995100459f80fb90d356c7a0d1073d414324c43386fa2487a28588e8035dbdb9815dc0b6df7044643916f85bfd68d659fb30f8350242685 WHIRLPOOL c19fb77f3275c1e9158ab00024352bb914e84bfed7fd9736a8664056000ddf5feee499293fcb34e86f1cc534e54460c713180c05c0027aaa5100782e17bbabc4 DIST Image-ExifTool-10.38.tar.gz 4219285 SHA256 b94a406f63cff2c0cccc75037076d0f54775c5adfc620ceae7e7523d85c9fc7b SHA512 e8ca1de6807d4ab71bebc8433cc24a77ef06ff81e93835f9c1bb69a7d4c482a4886f07b3f362214e55a817545f2e17efe5fb62020c8951ffc4de7f5c36648c96 WHIRLPOOL 596f29e85dfb9cd126fffc33893941309ce6515ec980ee4f5851eb1dda6ab0156fa4b0767efa50254ef1ffe7ca930ce1de58c5dffc72048d2fc6ea48bf36ea51 diff --git a/media-libs/exiftool/exiftool-10.31.ebuild b/media-libs/exiftool/exiftool-10.31.ebuild deleted file mode 100644 index 2a3c8fef617d..000000000000 --- a/media-libs/exiftool/exiftool-10.31.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DIST_NAME=Image-ExifTool -inherit perl-module - -DESCRIPTION="Read and write meta information in image, audio and video files" -HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}" -SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz" - -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos" -IUSE="doc" - -SRC_TEST="do" - -src_install() { - perl-module_src_install - use doc && dodoc -r html/ -} diff --git a/media-libs/exiftool/exiftool-10.36.ebuild b/media-libs/exiftool/exiftool-10.36.ebuild index e1513a94b78d..2a3c8fef617d 100644 --- a/media-libs/exiftool/exiftool-10.36.ebuild +++ b/media-libs/exiftool/exiftool-10.36.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}" SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos" IUSE="doc" SRC_TEST="do" diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest index 0e956e46f48a..0d0b549663d7 100644 --- a/media-libs/libmediainfo/Manifest +++ b/media-libs/libmediainfo/Manifest @@ -1,2 +1 @@ -DIST libmediainfo_0.7.90.tar.xz 1578580 SHA256 85551ba92802df3f5e1026b3752c6d4b7cae1304b783de7b893a27cdefa9a795 SHA512 49a5dc9532bb1fb3aebef4476346089f685b6782b9b380fde5822ae97680bbc0db22f45a5a2e9b17a7cf2947696e10eda233771b50f8ab7bfb54b250620c3fcb WHIRLPOOL 2256bc5b4b20a9a0cccc2ffa79c180aa5bb22a49d339d3b13e3369a45f4323f41a36a43c953bfdf0baf6fa461f2affa6d3622be2be8b6b493425759bdf202a57 DIST libmediainfo_0.7.91.tar.xz 1575876 SHA256 28818b88cedc8d5bc6b6c2a32d37ec456cb9784b4bf105416ef1e5821a6769c0 SHA512 7b05ae099cd8fd1f1f4134a16cff407bd6016095bad8769444f14eecd34b3771634c9a59f4fb41b04f5fc0381cf755ef1d5cbd05fd0bee57fcafacbb52293f5c WHIRLPOOL f86664ce7931f08f17370ece5e20669a3762ab9cc51532dfd00ce05b0081335863795bb9de966566bf006076a579b3f23023ab40804f07355e57c4b6ece66c51 diff --git a/media-libs/libmediainfo/libmediainfo-0.7.90.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.90.ebuild deleted file mode 100644 index 64025de747c5..000000000000 --- a/media-libs/libmediainfo/libmediainfo-0.7.90.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools eutils flag-o-matic - -MY_PN="MediaInfo" -DESCRIPTION="MediaInfo libraries" -HOMEPAGE="http://mediaarea.net/mediainfo/" -SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="curl doc mms static-libs" - -RDEPEND="sys-libs/zlib - dev-libs/tinyxml2:= - >=media-libs/libzen-0.4.28[static-libs=] - curl? ( net-misc/curl ) - mms? ( >=media-libs/libmms-0.6.1[static-libs=] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -# tests try to fetch data from online sources -RESTRICT="test" - -S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library - -src_prepare() { - eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch - eapply_user - - sed -i 's:-O2::' configure.ac || die - append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0 - - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - --with-libtinyxml2 \ - $(use_with curl libcurl) \ - $(use_with mms libmms) \ - $(use_enable static-libs static) \ - $(use_enable static-libs staticlibs) -} - -src_compile() { - default - - if use doc; then - cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc - doxygen Doxyfile || die - fi -} - -src_install() { - if use doc; then - local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html ) - fi - - default - - edos2unix ${PN}.pc #414545 - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - - for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do - insinto /usr/include/${MY_PN}/${x} - doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h - done - - insinto /usr/include/${MY_PN}DLL - doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h - - dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt - - prune_libtool_files -} diff --git a/media-libs/libmediainfo/libmediainfo-0.7.91.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.91.ebuild index 2b934ef8d103..1d93bffe0665 100644 --- a/media-libs/libmediainfo/libmediainfo-0.7.91.ebuild +++ b/media-libs/libmediainfo/libmediainfo-0.7.91.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="curl doc mms static-libs" RDEPEND="sys-libs/zlib diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest index e51e6467b6c8..68adb673a6b6 100644 --- a/media-libs/libzen/Manifest +++ b/media-libs/libzen/Manifest @@ -1,2 +1 @@ -DIST libzen_0.4.33.tar.bz2 117892 SHA256 a289197a24ca94c506abab3113a1af2dcc82bc97736b23e02fd57ca99e8ac55f SHA512 c05773d2d8fb4ec095d442f384c21f87ca97a2d5ea58645d7af0b68210533c1a1bd1083d2d70dfdedb087acc776ac2f1158a617e5bd5f3611cd1be5504463a08 WHIRLPOOL 213301a278f8560700df8de65b0097cdc0c20575cb8b73949ffca696316957a634332bc2efbdd3a784226a7cfd18425992c26d8d4c98854cd8fa2c289e5a8c9b DIST libzen_0.4.34.tar.bz2 119347 SHA256 83774fe093bd14fb72da9c537021a8ffc3f6ff952a1401cd6f91de6628ac790a SHA512 46a2457b72c5f8b585eaec9ca99405cc795ea96174494651ccb57c0ef9317f1b7632992bb1d430fe5e62cab9849f102effd3558e8f5b0c36bc9515ed81c4e386 WHIRLPOOL 9817dfc03af8c47dbde1b808c658b3523fc9494d875629b83f49677c6d4e5314b016ce3a467c4bcf5f65fb32052659fd1b9b4499e9705722096ae082ecbe52e8 diff --git a/media-libs/libzen/libzen-0.4.33.ebuild b/media-libs/libzen/libzen-0.4.33.ebuild deleted file mode 100644 index d3c697fc7f00..000000000000 --- a/media-libs/libzen/libzen-0.4.33.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools multilib eutils - -MY_PN="ZenLib" -DESCRIPTION="Shared library for libmediainfo and mediainfo" -HOMEPAGE="http://mediaarea.net/mediainfo/" -SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc static-libs" - -DEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen )" - -S=${WORKDIR}/${MY_PN}/Project/GNU/Library - -src_prepare() { - sed -i 's:-O2::' configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --enable-unicode \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - default - - if use doc ; then - cd "${WORKDIR}"/${MY_PN}/Source/Doc - doxygen Doxyfile || die - fi -} - -src_install() { - default - - # remove since the pkgconfig file should be used instead - rm "${D}"/usr/bin/libzen-config - - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - - for x in ./ Format/Html Format/Http HTTP_Client ; do - insinto /usr/include/${MY_PN}/${x} - doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h - done - - dodoc "${WORKDIR}"/${MY_PN}/History.txt - if use doc ; then - dohtml "${WORKDIR}"/${MY_PN}/Doc/* - fi - - prune_libtool_files -} diff --git a/media-libs/libzen/libzen-0.4.34.ebuild b/media-libs/libzen/libzen-0.4.34.ebuild index 33d21d93fe82..f603c4352ee6 100644 --- a/media-libs/libzen/libzen-0.4.34.ebuild +++ b/media-libs/libzen/libzen-0.4.34.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc static-libs" DEPEND="virtual/pkgconfig diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest index b18781d0e8cd..06ec728c10e0 100644 --- a/media-video/mediainfo/Manifest +++ b/media-video/mediainfo/Manifest @@ -1,2 +1 @@ -DIST mediainfo_0.7.90.tar.xz 1310820 SHA256 a9332bbbd8c2c30fb2ca123ff31a7733f63f06a9c3ebe40185ca93356e9b0b12 SHA512 9b2d750057cb553c57153edbdd0edb9a2655b589e7894e83256ae8f0c34115d82d6df29c8cce2acb0f69477d17553abbd00fe5988ba06279b4ecd797aa286fb1 WHIRLPOOL b14331eca30b1e579f664a4cffe4780e827f19d2d0143e5c01777fac6874607c75b2b4d0722fced1dc47f7ce9661e5a0064dff92884afaa76c0284d66873e94e DIST mediainfo_0.7.91.tar.xz 1309324 SHA256 b501e2776319448a1664371f05498af21db1133b3a8d530f62447d0913bc5996 SHA512 fd62e9ce42ae860630b5a79a226b5361c2225bbb3bb3655500341e77fe4ccb6db5402fdc8c50a67d74b246d3aed23a71f4828eb38c507eaed9f98e5f47ffb843 WHIRLPOOL 83f15525e8e3d9607374d81721e781d1e609aa658dd0f9ceaf428d595e1086f2d3d24a04586d4aa50f695e124b733a4f02f5af53e95e3bc3bd81df73dc41d243 diff --git a/media-video/mediainfo/mediainfo-0.7.90.ebuild b/media-video/mediainfo/mediainfo-0.7.90.ebuild deleted file mode 100644 index a2d6dec5cff1..000000000000 --- a/media-video/mediainfo/mediainfo-0.7.90.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -WX_GTK_VER="3.0" - -inherit eutils autotools wxwidgets - -DESCRIPTION="MediaInfo supplies technical and tag information about media files" -HOMEPAGE="http://mediaarea.net/mediainfo/" -SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="curl mms wxwidgets" - -RDEPEND="sys-libs/zlib - media-libs/libzen - ~media-libs/lib${P}[curl=,mms=] - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/MediaInfo - -pkg_setup() { - TARGETS="CLI" - use wxwidgets && TARGETS+=" GUI" -} - -src_prepare() { - eapply_user - - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} - sed -i -e "s:-O2::" configure.ac - eautoreconf - done -} - -src_configure() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} - local args="" - [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui" - econf ${args} - done -} - -src_compile() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} - default - done -} -src_install() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} - default - dodoc "${S}"/History_${target}.txt - if [[ ${target} == "GUI" ]]; then - newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png - make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK" - fi - done -} diff --git a/media-video/mediainfo/mediainfo-0.7.91.ebuild b/media-video/mediainfo/mediainfo-0.7.91.ebuild index 9a1da4e0dee7..3cd04d594bb0 100644 --- a/media-video/mediainfo/mediainfo-0.7.91.ebuild +++ b/media-video/mediainfo/mediainfo-0.7.91.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="curl mms wxwidgets" RDEPEND="sys-libs/zlib diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild index a7667d8bf22e..75fccdd80eb2 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild @@ -22,7 +22,7 @@ ruby_atom() { # hacks to avoid using the ruby eclasses since this requires something similar # to the python-any-r1 eclass for ruby which currently doesn't exist -RUBY_IMPLS=( ruby23 ruby22 ruby21 ) +RUBY_IMPLS=( ruby24 ruby23 ruby22 ruby21 ) RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)" diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.7.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.7.1.ebuild index e5d26a1938b5..f5f2c65a3539 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9.7.1.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9.7.1.ebuild @@ -22,7 +22,7 @@ ruby_atom() { # hacks to avoid using the ruby eclasses since this requires something similar # to the python-any-r1 eclass for ruby which currently doesn't exist -RUBY_IMPLS=( ruby23 ruby22 ruby21 ) +RUBY_IMPLS=( ruby24 ruby23 ruby22 ruby21 ) RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)" diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 1955e479856b..32153f3836b5 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Sat, 07 Jan 2017 18:38:26 +0000 +Sun, 08 Jan 2017 09:13:21 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index ab266efe9de9..32153f3836b5 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Sat, 07 Jan 2017 18:38:27 +0000 +Sun, 08 Jan 2017 09:13:21 +0000 diff --git a/metadata/md5-cache/app-editors/ghostwriter-1.4.2 b/metadata/md5-cache/app-editors/ghostwriter-1.4.2 new file mode 100644 index 000000000000..9e009c55eb9a --- /dev/null +++ b/metadata/md5-cache/app-editors/ghostwriter-1.4.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 +DESCRIPTION=Cross-platform, aesthetic, distraction-free markdown editor +EAPI=6 +HOMEPAGE=http://wereturtle.github.io/ghostwriter/ +IUSE=debug linguas_de linguas_en linguas_it linguas_ja linguas_pt_BR linguas_ru +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 +SLOT=0 +SRC_URI=https://github.com/wereturtle/ghostwriter/archive/v1.4.2.tar.gz -> ghostwriter-1.4.2.tar.gz +_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=e080d2a6b907e75eb4ca67cf18bb4a77 diff --git a/metadata/md5-cache/app-emulation/docker-1.13.0_rc4 b/metadata/md5-cache/app-emulation/docker-1.13.0_rc4 deleted file mode 100644 index 4cea780f65e6..000000000000 --- a/metadata/md5-cache/app-emulation/docker-1.13.0_rc4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install postinst setup unpack -DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.4.2:= virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=The core functions you need to create Docker images and run Docker containers -EAPI=6 -HOMEPAGE=https://dockerproject.org -IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp -KEYWORDS=~amd64 -LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) -RESTRICT=installsources strip -SLOT=0 -SRC_URI=https://github.com/docker/docker/archive/v1.13.0-rc4.tar.gz -> docker-1.13.0_rc4.tar.gz -_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 017377e73405d964cd0137088cddb9c3 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=cfe6c76203975de6f674a2cf9da44e02 diff --git a/metadata/md5-cache/app-emulation/docker-1.13.0_rc5 b/metadata/md5-cache/app-emulation/docker-1.13.0_rc5 index f82687c2803e..c221fc4e6fd5 100644 --- a/metadata/md5-cache/app-emulation/docker-1.13.0_rc5 +++ b/metadata/md5-cache/app-emulation/docker-1.13.0_rc5 @@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp KEYWORDS=~amd64 LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) +RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-0.2.5 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) RESTRICT=installsources strip SLOT=0 SRC_URI=https://github.com/docker/docker/archive/v1.13.0-rc5.tar.gz -> docker-1.13.0_rc5.tar.gz _eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 017377e73405d964cd0137088cddb9c3 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=a58567b8d06da3a9282c3d6edf12e309 +_md5_=0d5720f5402fcc520423352b61826889 diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999 index 9d9f1ec93b94..519f45471a99 100644 --- a/metadata/md5-cache/app-emulation/docker-9999 +++ b/metadata/md5-cache/app-emulation/docker-9999 @@ -5,8 +5,8 @@ EAPI=6 HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) +RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-0.2.5 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] ) RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 017377e73405d964cd0137088cddb9c3 git-r3 e928b84a9f6f1d9076d1d27687876dc6 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=257fb61b09e1ce15fa6b10f19f953aa3 +_md5_=db745e0b209872a32d69ced3f26f8a27 diff --git a/metadata/md5-cache/app-misc/ranger-1.8.0 b/metadata/md5-cache/app-misc/ranger-1.8.0 new file mode 100644 index 000000000000..c2dd5ad157f9 --- /dev/null +++ b/metadata/md5-cache/app-misc/ranger-1.8.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] +DESCRIPTION=A vim-inspired file manager for the console +EAPI=6 +HOMEPAGE=http://ranger.nongnu.org/ +IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-3 +RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) +SLOT=0 +SRC_URI=http://nongnu.org/ranger/ranger-1.8.0.tar.gz +_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 +_md5_=2f44fba325a05eab438ae9fdc6358c49 diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999 index 009d41fed064..ea3f35cc3397 100644 --- a/metadata/md5-cache/app-misc/ranger-9999 +++ b/metadata/md5-cache/app-misc/ranger-9999 @@ -9,4 +9,4 @@ RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) SLOT=0 _eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 git-r3 e928b84a9f6f1d9076d1d27687876dc6 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=a3e91f4af2c1c68728fc5fa8f394690e +_md5_=ae9b41d6ad44155ba9ea7b3ad3e1b999 diff --git a/metadata/md5-cache/app-shells/bash-completion-2.4-r1 b/metadata/md5-cache/app-shells/bash-completion-2.4-r1 index 2b6e74373a4c..1941a48b33da 100644 --- a/metadata/md5-cache/app-shells/bash-completion-2.4-r1 +++ b/metadata/md5-cache/app-shells/bash-completion-2.4-r1 @@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils DESCRIPTION=Programmable Completion for bash EAPI=6 HOMEPAGE=https://github.com/scop/bash-completion -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris +KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris LICENSE=GPL-2 PDEPEND=>=app-shells/gentoo-bashcomp-20140911 RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp SLOT=0 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz _eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=ae42e21efc6f04b01b9a0a67d99a8c61 +_md5_=478b9bceac46fd52e64da02e1a03ed5c diff --git a/metadata/md5-cache/app-text/libwpg-0.3.1 b/metadata/md5-cache/app-text/libwpg-0.3.1 index 84282b88f209..b3d800613818 100644 --- a/metadata/md5-cache/app-text/libwpg-0.3.1 +++ b/metadata/md5-cache/app-text/libwpg-0.3.1 @@ -4,10 +4,10 @@ DESCRIPTION=C++ library to read and parse graphics in WPG EAPI=6 HOMEPAGE=http://libwpg.sourceforge.net/libwpg.htm IUSE=doc static-libs -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~x86 +KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~x86 LICENSE=|| ( LGPL-2.1 MPL-2.0 ) RDEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge SLOT=0.3 SRC_URI=mirror://sourceforge/libwpg/libwpg-0.3.1.tar.xz _eclasses_=alternatives b19e1ec28e600fa497461bddfb9c1f16 -_md5_=9c0cab15f7dc7a910cbaf5eca6cda2b0 +_md5_=e7ff1943a3acf3ea6e860e60e1710cc7 diff --git a/metadata/md5-cache/dev-games/clanlib-4.0.0 b/metadata/md5-cache/dev-games/clanlib-4.0.0 new file mode 100644 index 000000000000..7967d91d9965 --- /dev/null +++ b/metadata/md5-cache/dev-games/clanlib-4.0.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=sys-libs/zlib X? ( media-libs/freetype:2 media-libs/fontconfig x11-libs/libX11 opengl? ( virtual/opengl x11-libs/libXrender ) ) sound? ( media-libs/alsa-lib ) virtual/pkgconfig doc? ( app-doc/doxygen dev-lang/perl media-gfx/graphviz ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Multi-platform game development library +EAPI=6 +HOMEPAGE=https://github.com/sphair/ClanLib +IUSE=cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X +KEYWORDS=~amd64 ~x86 +LICENSE=ZLIB +RDEPEND=sys-libs/zlib X? ( media-libs/freetype:2 media-libs/fontconfig x11-libs/libX11 opengl? ( virtual/opengl x11-libs/libXrender ) ) sound? ( media-libs/alsa-lib ) +REQUIRED_USE=opengl? ( X ) +SLOT=4.0 +SRC_URI=https://github.com/sphair/ClanLib/archive/v4.0.0.tar.gz -> clanlib-4.0.0.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=51d5742a3f53117b5487b469894c152c diff --git a/metadata/md5-cache/dev-libs/pugixml-1.8 b/metadata/md5-cache/dev-libs/pugixml-1.8 index e3a0a1bb5972..0da8f486980f 100644 --- a/metadata/md5-cache/dev-libs/pugixml-1.8 +++ b/metadata/md5-cache/dev-libs/pugixml-1.8 @@ -8,4 +8,4 @@ LICENSE=MIT SLOT=0 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.8/pugixml-1.8.tar.gz _eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=0e7f84f72b37b2719783f83365ff7d7d +_md5_=b44d49b7efb687de9873934989f5bb5a diff --git a/metadata/md5-cache/dev-ml/camlp5-6.17 b/metadata/md5-cache/dev-ml/camlp5-6.17 index 30b49eb18f07..7ac29d3f5f52 100644 --- a/metadata/md5-cache/dev-ml/camlp5-6.17 +++ b/metadata/md5-cache/dev-ml/camlp5-6.17 @@ -4,10 +4,10 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml EAPI=5 HOMEPAGE=https://camlp5.github.io/ IUSE=doc +ocamlopt -KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~x86-fbsd +KEYWORDS=~alpha amd64 ~ppc ~x86 ~x86-fbsd LICENSE=BSD RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] SLOT=0/6.17 SRC_URI=https://github.com/camlp5/camlp5/archive/rel617.tar.gz -> camlp5-6.17.tar.gz _eclasses_=eutils 017377e73405d964cd0137088cddb9c3 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=deb52b83bf9a5a84d857797f28873f53 +_md5_=c2aaf13d64b32e21abdc05ea2cb71aaa diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.40.0 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.40.0 new file mode 100644 index 000000000000..54e59716e2a4 --- /dev/null +++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.40.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:= +DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/CPAN-Perl-Releases/ +IUSE=test +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.04.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=3d965b675bae6b453786e2396d995331 diff --git a/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0 b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0 new file mode 100644 index 000000000000..4eb0770c522a --- /dev/null +++ b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=virtual/perl-Digest virtual/perl-XSLoader virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.820.0 ) dev-lang/perl:= +DESCRIPTION=Perl interface to the GOST R 34.11-94 digest algorithm +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Digest-GOST/ +IUSE=test +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=virtual/perl-Digest virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/G/GR/GRAY/Digest-GOST-0.06.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=f8a8c3a2bf8b926275df7d449ca158fa diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.420.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.420.0 new file mode 100644 index 000000000000..9fc53bff7af8 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Exception-Class-1.420.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:= +DESCRIPTION=A module that allows you to declare real exception classes in Perl +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Exception-Class/ +IUSE=test examples +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.42.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=8680b77cd8f2eef182a2e822f129966c diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.43.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.43.0 new file mode 100644 index 000000000000..7e3c25de2c67 --- /dev/null +++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.43.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl:= +DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/ +IUSE=idn examples +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.043.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=1a3949ac5dc06122b637d06e5e0eb035 diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.901.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.901.0 new file mode 100644 index 000000000000..6f6d18b250eb --- /dev/null +++ b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.901.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:= +DESCRIPTION=Perl module to pluralize English words +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Lingua-EN-Inflect/ +IUSE=test examples +KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.901.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=119c1ce6026bd31fcdc870ae2ac9365a diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.140.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.140.0 new file mode 100644 index 000000000000..1eda899f0dd0 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Mojolicious-7.140.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:= +DESCRIPTION=Real-time web framework +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Mojolicious/ +IUSE=test minimal examples +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.14.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=5cec8f3a83497e9cfd2b758e3e73e27f diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.70.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.70.0 new file mode 100644 index 000000000000..aeedfa6c060e --- /dev/null +++ b/metadata/md5-cache/dev-perl/Net-DNS-1.70.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( dev-perl/IO-Socket-INET6 ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Digest-GOST-0.60.0 >=virtual/perl-IO-Socket-IP-0.320.0 >=dev-perl/IO-Socket-INET6-2.510.0 >=dev-perl/Net-LibIDN-0.120.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:= +DESCRIPTION=Perl Net::DNS - Perl DNS Resolver Module +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Net-DNS/ +IUSE=ipv6 test minimal examples +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 ) +RDEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( dev-perl/IO-Socket-INET6 ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Digest-GOST-0.60.0 >=virtual/perl-IO-Socket-IP-0.320.0 >=dev-perl/IO-Socket-INET6-2.510.0 >=dev-perl/Net-LibIDN-0.120.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.07.tar.gz +_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=44af980a03d08a32057001f1b125239c diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.120.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.120.0 new file mode 100644 index 000000000000..250f838f01f3 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.120.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-1.380.0 ) virtual/perl-Carp !=dev-perl/IO-Socket-SSL-1.380.0 ) virtual/perl-Carp !=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl:= +DESCRIPTION=Internationalizing Domain Names in Applications (IDNA) +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Net-IDN-Encode/ +IUSE=test examples +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=47c7a3872b42ec6876e2b01e7c589cb5 diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0 new file mode 100644 index 000000000000..ab96ade9a46c --- /dev/null +++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.800.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-NoWarnings ) virtual/perl-Test-Simple ) dev-lang/perl:= +DESCRIPTION=Perl extension for using OpenSSL +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/ +IUSE=libressl test minimal examples examples +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=openssl +RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.80.tar.gz +_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=f5b5a77fc3a4d2832618f3971b167a92 diff --git a/metadata/md5-cache/dev-perl/PDF-Create-1.410.0 b/metadata/md5-cache/dev-perl/PDF-Create-1.410.0 new file mode 100644 index 000000000000..15f283d5dbbe --- /dev/null +++ b/metadata/md5-cache/dev-perl/PDF-Create-1.410.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/File-Share-0.250.0 dev-perl/JSON virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker dev-perl/File-ShareDir-Install test? ( virtual/perl-File-Temp >=dev-perl/Test-LeakTrace-0.140.0 >=virtual/perl-Test-Simple-1.0.0 ) dev-lang/perl:= +DESCRIPTION=Create PDF documents in Perl +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/PDF-Create/ +IUSE=test examples examples +KEYWORDS=~alpha ~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/File-Share-0.250.0 dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/PDF-Create-1.41.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=9b849e47b7edbeea87866acc244e9cee diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.200.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.220.0 similarity index 94% rename from metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.200.0 rename to metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.220.0 index a4f06e729524..e7a1b6c3c14c 100644 --- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.200.0 +++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.220.0 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=|| ( Artistic GPL-1+ ) RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:= SLOT=0 -SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.20.tar.gz +SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.22.tar.gz _eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 -_md5_=bbb7a486c590762bf97655be2d9bf3fe +_md5_=b1c66cf3d0850c6c213d054db1718725 diff --git a/metadata/md5-cache/dev-perl/Ref-Util-0.111.0 b/metadata/md5-cache/dev-perl/Ref-Util-0.111.0 new file mode 100644 index 000000000000..763d3a6b7e89 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Ref-Util-0.111.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-Test-Simple virtual/perl-File-Spec ) dev-lang/perl:= +DESCRIPTION=Utility functions for checking references +EAPI=6 +HOMEPAGE=http://search.cpan.org/dist/Ref-Util/ +IUSE=test +KEYWORDS=~amd64 ~x86 +LICENSE=MIT +RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:= +SLOT=0 +SRC_URI=mirror://cpan/authors/id/X/XS/XSAWYERX/Ref-Util-0.111.tar.gz +_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 +_md5_=cf138a24f010a6c6e286448557d3b37d diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.0.0 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.0.0 deleted file mode 100644 index aab3bed58b32..000000000000 --- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.0.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install setup -DEPEND=dev-lang/php >=dev-php/pear-1.8.1 -DESCRIPTION=Provides an easy way to perform HTTP requests -EAPI=4 -HOMEPAGE=http://pear.php.net/HTTP_Request2 -IUSE=+curl +fileinfo +ssl +zlib -KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 -LICENSE=BSD -RDEPEND=dev-lang/php[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-0.3.0 dev-lang/php >=dev-php/pear-1.8.1 -SLOT=0 -SRC_URI=http://pear.php.net/get/HTTP_Request2-2.0.0.tgz -_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-r1 7d1434952f2d1483feac6ad812d605dd toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=551aa710d13bae66e17bed4c00acabd2 diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.1.1 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.1.1 deleted file mode 100644 index d9be64df00ca..000000000000 --- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.1.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install setup -DEPEND=dev-lang/php >=dev-php/pear-1.8.1 -DESCRIPTION=Provides an easy way to perform HTTP requests -EAPI=4 -HOMEPAGE=http://pear.php.net/HTTP_Request2 -IUSE=+curl +fileinfo +ssl +zlib -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=BSD -RDEPEND=dev-lang/php[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-0.3.0 dev-lang/php >=dev-php/pear-1.8.1 -SLOT=0 -SRC_URI=http://pear.php.net/get/HTTP_Request2-2.1.1.tgz -_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-r1 7d1434952f2d1483feac6ad812d605dd toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=bccc4d5be277f1cd9b1c935fea8fa1aa diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 index 432784d00672..b8154de274e6 100644 --- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 +++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 @@ -3,9 +3,9 @@ DESCRIPTION=A PHP implementation of the SMTP protocol EAPI=6 HOMEPAGE=http://pear.php.net/package/Net_SMTP IUSE=examples sasl -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 LICENSE=PHP-3.01 RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL ) SLOT=0 SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.2.tgz -_md5_=19b61ce0e6b2f8d2b6b68557c879ce6d +_md5_=c4221d50035187d12b0b3ad6c79e6708 diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 index 18f48ebf318b..b0389014d144 100644 --- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 +++ b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 @@ -3,9 +3,9 @@ DESCRIPTION=An API for talking to sieve (RFC 3028) servers EAPI=6 HOMEPAGE=https://github.com/roundcube/Net_Sieve IUSE=sasl -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 LICENSE=BSD RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL ) SLOT=0 SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.2.tar.gz -> PEAR-Net_Sieve-1.5.2.tar.gz -_md5_=4a904844b801a2507ba52d5afa72e258 +_md5_=2e422a3776c9d2445141967adfa1937d diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14-r3 b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14-r3 index 67f782ce6fe6..63c512ff8848 100644 --- a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14-r3 +++ b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14-r3 @@ -2,9 +2,9 @@ DEFINED_PHASES=install DESCRIPTION=PHP class interface to TCP sockets EAPI=6 HOMEPAGE=https://pear.php.net/package/Net_Socket -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 LICENSE=PHP-3.01 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR SLOT=0 SRC_URI=http://download.pear.php.net/package/Net_Socket-1.0.14.tgz -_md5_=f7536d9a0e75139ac6d88b9724bb8ffe +_md5_=30926bf4ea70612892190f2a0c5d29b3 diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.6.3 b/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.6.3 deleted file mode 100644 index 8a5faca1b0a1..000000000000 --- a/metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager-1.6.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install setup -DEPEND=dev-lang/php >=dev-php/pear-1.8.1 -DESCRIPTION=Takes an existing package.xml file and updates it with a new filelist and changelog -EAPI=4 -HOMEPAGE=http://pear.php.net/PEAR_PackageFileManager -IUSE=minimal -KEYWORDS=~amd64 ~x86 -LICENSE=PHP-3.01 -RDEPEND=dev-lang/php[xml,simplexml] !minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 ) dev-lang/php >=dev-php/pear-1.8.1 -SLOT=0 -SRC_URI=http://pear.php.net/get/PEAR_PackageFileManager-1.6.3.tgz -_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-r1 7d1434952f2d1483feac6ad812d605dd toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=d2825da4cab546c71eb73062152f3b25 diff --git a/metadata/md5-cache/dev-php/PEAR-Pager-2.4.8 b/metadata/md5-cache/dev-php/PEAR-Pager-2.4.8 deleted file mode 100644 index 97dd87afb5bb..000000000000 --- a/metadata/md5-cache/dev-php/PEAR-Pager-2.4.8 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install setup -DEPEND=dev-lang/php >=dev-php/pear-1.8.1 -DESCRIPTION=Data paging class -EAPI=0 -HOMEPAGE=http://pear.php.net/Pager -KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 -LICENSE=BSD -RDEPEND=dev-lang/php >=dev-php/pear-1.8.1 -SLOT=0 -SRC_URI=http://pear.php.net/get/Pager-2.4.8.tgz -_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-r1 7d1434952f2d1483feac6ad812d605dd toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=5bb588db7da2d0f3913a3ac592f7e536 diff --git a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 index ec0b7a0e93af..2436399966e5 100644 --- a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 +++ b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 @@ -2,10 +2,10 @@ DEFINED_PHASES=install DESCRIPTION=Graph datastructure manipulation library EAPI=6 HOMEPAGE=http://pear.php.net/package/Structures_Graph -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 LICENSE=LGPL-2.1 PDEPEND=dev-php/PEAR-PEAR RDEPEND=dev-lang/php:* SLOT=0 SRC_URI=http://pear.php.net/get/Structures_Graph-1.1.1.tgz -_md5_=155a044178fe191138ecaab8de3011cd +_md5_=5b77591bac33d31eb184cb36d55ed4a2 diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.3.0-r1 index 58b8c2f44284..0b54532293e2 100644 --- a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.3.0-r1 +++ b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.3.0-r1 @@ -3,10 +3,10 @@ DESCRIPTION=XML utility class EAPI=6 HOMEPAGE=http://pear.php.net/package/XML_Util IUSE=examples -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 LICENSE=PHP-2.02 PDEPEND=dev-php/PEAR-PEAR RDEPEND=dev-lang/php:*[pcre(+)] SLOT=0 SRC_URI=http://pear.php.net/get/XML_Util-1.3.0.tgz -_md5_=97bef124cdd6ae5035ba3950f1af7646 +_md5_=4f8d848bc35c881ba5c2d315c8b362ad diff --git a/metadata/md5-cache/dev-php/agavi-1.0.7 b/metadata/md5-cache/dev-php/agavi-1.0.7 deleted file mode 100644 index 35511032b13d..000000000000 --- a/metadata/md5-cache/dev-php/agavi-1.0.7 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install setup -DEPEND=>=dev-lang/php-5[xml] >=dev-php/PEAR-PEAR-1.6.2-r1 >=dev-php/phing-2.4[-minimal] =dev-php/pear-1.9.0 -DESCRIPTION=PHP5 MVC Application Framework -EAPI=4 -HOMEPAGE=http://www.agavi.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=LGPL-2.1+ icu unicode ZLIB public-domain -RDEPEND=>=dev-php/phing-2.4 dev-lang/php >=dev-php/pear-1.9.0 -SLOT=0 -SRC_URI=http://www.agavi.org/download/1.0.7.tgz -_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-lib-r1 ddea8bba98cb56b7acc5a966ea40cb2c toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=c9813ed7172290756fa7d0d6fbd74279 diff --git a/metadata/md5-cache/dev-php/agavi-1.0.8 b/metadata/md5-cache/dev-php/agavi-1.0.8 new file mode 100644 index 000000000000..51e80da4cca0 --- /dev/null +++ b/metadata/md5-cache/dev-php/agavi-1.0.8 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install +DESCRIPTION=PHP MVC application framework +EAPI=6 +HOMEPAGE=http://www.agavi.org/ +IUSE=examples +executable iconv session soap xmlrpc +KEYWORDS=~amd64 ~x86 +LICENSE=BSD LGPL-2.1+ icu unicode public-domain +RDEPEND=dev-lang/php[iconv?,session?,soap?,xml,xmlrpc?] executable? ( dev-php/phing ) +SLOT=0 +SRC_URI=http://www.agavi.org/download/1.0.8.tgz -> agavi-1.0.8.tgz +_md5_=4c3371fa751deb1c2f77129975cef68b diff --git a/metadata/md5-cache/dev-php/phing-2.10.1 b/metadata/md5-cache/dev-php/phing-2.10.1 deleted file mode 100644 index 3e64b9bfb0a3..000000000000 --- a/metadata/md5-cache/dev-php/phing-2.10.1 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install postinst unpack -DESCRIPTION=PHP project build system based on Apache Ant -EAPI=5 -HOMEPAGE=http://www.phing.info/ -IUSE=+minimal -KEYWORDS=~amd64 ~x86 -LICENSE=LGPL-2.1 -RDEPEND=!minimal? ( dev-php/phpDocumentor dev-php/PHP_CodeCoverage >=dev-php/PEAR-HTTP_Request2-2.1.1 >=dev-php/PEAR-PEAR_PackageFileManager-1.5.2 >=dev-php/PEAR-VersionControl_SVN-0.3.0_alpha1 >=dev-php/phpmd-1.1.0 >=dev-php/phpunit-4.0 >=dev-php/xdebug-2.0.5 >=dev-php/simpletest-1.0.1_beta2 ) dev-lang/php:*[cli,phar,xml,xslt] -SLOT=0 -SRC_URI=http://www.phing.info/get/phing-2.10.1.phar -_md5_=550d3c8e0740099a5589914fd9aa526f diff --git a/metadata/md5-cache/dev-php/phing-2.16.0 b/metadata/md5-cache/dev-php/phing-2.16.0 new file mode 100644 index 000000000000..db60808e701a --- /dev/null +++ b/metadata/md5-cache/dev-php/phing-2.16.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install +DESCRIPTION=PHP project build system based on Apache Ant +EAPI=6 +HOMEPAGE=http://www.phing.info/ +IUSE=doc examples minimal zip +KEYWORDS=~amd64 ~x86 +LICENSE=FDL-1.3 LGPL-2.1 +RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug ) +SLOT=0 +SRC_URI=http://www.phing.info/get/phing-2.16.0.tgz +_md5_=5a59a4e505691ba4eb4b7d24f4b7feba diff --git a/metadata/md5-cache/dev-python/isodate-0.5.0 b/metadata/md5-cache/dev-python/isodate-0.5.0 index 79bbb22dbea0..544200613d77 100644 --- a/metadata/md5-cache/dev-python/isodate-0.5.0 +++ b/metadata/md5-cache/dev-python/isodate-0.5.0 @@ -1,6 +1,6 @@ DEFINED_PHASES=compile configure install prepare test DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] -DESCRIPTION=ISO 8601 date/time/duration parser and formater +DESCRIPTION=ISO 8601 date/time/duration parser and formatter EAPI=5 HOMEPAGE=https://pypi.python.org/pypi/isodate IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py SLOT=0 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.0.tar.gz _eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=bdc9e5f4602e438f34ea21a3041a7833 +_md5_=55e8a880edae59797a7c1ffb1d4d8f5c diff --git a/metadata/md5-cache/dev-python/isodate-0.5.1 b/metadata/md5-cache/dev-python/isodate-0.5.1 index 2b630b3d586a..5a9cb7774677 100644 --- a/metadata/md5-cache/dev-python/isodate-0.5.1 +++ b/metadata/md5-cache/dev-python/isodate-0.5.1 @@ -1,6 +1,6 @@ DEFINED_PHASES=compile configure install prepare test DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] -DESCRIPTION=ISO 8601 date/time/duration parser and formater +DESCRIPTION=ISO 8601 date/time/duration parser and formatter EAPI=5 HOMEPAGE=https://pypi.python.org/pypi/isodate IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py SLOT=0 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.1.tar.gz _eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=bdc9e5f4602e438f34ea21a3041a7833 +_md5_=55e8a880edae59797a7c1ffb1d4d8f5c diff --git a/metadata/md5-cache/dev-python/isodate-0.5.4 b/metadata/md5-cache/dev-python/isodate-0.5.4 index e68c420d0fec..136f275e7705 100644 --- a/metadata/md5-cache/dev-python/isodate-0.5.4 +++ b/metadata/md5-cache/dev-python/isodate-0.5.4 @@ -1,6 +1,6 @@ DEFINED_PHASES=compile configure install prepare test DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] -DESCRIPTION=ISO 8601 date/time/duration parser and formater +DESCRIPTION=ISO 8601 date/time/duration parser and formatter EAPI=5 HOMEPAGE=https://pypi.python.org/pypi/isodate IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py SLOT=0 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.4.tar.gz _eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=0b8b857bbb25b94bce72a0d8fa4daa9c +_md5_=66c412fa022c75ddba56ceaea7231002 diff --git a/metadata/md5-cache/dev-python/jinja-2.9.2 b/metadata/md5-cache/dev-python/jinja-2.9.2 new file mode 100644 index 000000000000..56cfd29cf237 --- /dev/null +++ b/metadata/md5-cache/dev-python/jinja-2.9.2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] +DESCRIPTION=A full-featured template engine for Python +EAPI=5 +HOMEPAGE=http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2 +IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris +LICENSE=BSD +RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !dev-python/jinja:compat python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_pypy3? ( virtual/pypy3:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] +REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) +SLOT=0 +SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.9.2.tar.gz +_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 +_md5_=c626b019f8271f5a9a9f41bafc8588b0 diff --git a/metadata/md5-cache/dev-ros/urdf-1.12.6 b/metadata/md5-cache/dev-ros/urdf-1.12.6 index acfeaa1e654d..0c0fed617809 100644 --- a/metadata/md5-cache/dev-ros/urdf-1.12.6 +++ b/metadata/md5-cache/dev-ros/urdf-1.12.6 @@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev- SLOT=0 SRC_URI=https://github.com/ros/robot_model/archive/1.12.6.tar.gz -> robot_model-1.12.6.tar.gz _eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 ros-catkin 8b7e3d7128bd81dfe56a947e63201e78 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=2682782c72d30561a4b9f746892142d3 +_md5_=3212ed1cc131e6b7873074c21bb4b1cf diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.1.0 b/metadata/md5-cache/dev-ruby/climate_control-0.1.0 new file mode 100644 index 000000000000..a30e400846b0 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/climate_control-0.1.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ) +DESCRIPTION=Easily manage your environment +EAPI=5 +HOMEPAGE=https://github.com/thoughtbot/climate_control +IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test +KEYWORDS=~amd64 +LICENSE=MIT +RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) +REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ) +SLOT=0 +SRC_URI=mirror://rubygems/climate_control-0.1.0.gem +_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 2b249022d4895a29827658b7d630c461 ruby-ng 934780d41ab18a9ff091703f511371be ruby-utils 382c3a262907e1219a21618dfd1a01a0 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=36565cdf7736f1854708a40ec7f06192 diff --git a/metadata/md5-cache/dev-ruby/hoe-3.16.0 b/metadata/md5-cache/dev-ruby/hoe-3.16.0 new file mode 100644 index 000000000000..8bc6a5bd4a77 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/hoe-3.16.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby21] =dev-ruby/rake-0.8.7[ruby_targets_ruby22] =dev-ruby/rake-0.8.7[ruby_targets_ruby23] =dev-ruby/rake-0.8.7[ruby_targets_ruby24] =dev-ruby/rake-0.8.7[ruby_targets_ruby21] =dev-ruby/rake-0.8.7[ruby_targets_ruby22] =dev-ruby/rake-0.8.7[ruby_targets_ruby23] =dev-ruby/rake-0.8.7[ruby_targets_ruby24] =dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) +DESCRIPTION=An extended version of the RDoc library from Ruby 1.8 +EAPI=5 +HOMEPAGE=https://github.com/rdoc/rdoc/ +IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd +LICENSE=Ruby MIT +RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby21? ( dev-ruby/json:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) +REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ) +SLOT=0 +SRC_URI=https://github.com/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.0.tar.gz +_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 2b249022d4895a29827658b7d630c461 ruby-ng 934780d41ab18a9ff091703f511371be ruby-utils 382c3a262907e1219a21618dfd1a01a0 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=378a0613332c04ffb0e58b98abc6d07b diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r2 b/metadata/md5-cache/dev-ruby/text-1.2.3-r2 deleted file mode 100644 index f654a57c03f5..000000000000 --- a/metadata/md5-cache/dev-ruby/text-1.2.3-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) -DESCRIPTION=A collection of text algorithms -EAPI=5 -HOMEPAGE=https://github.com/threedaymonk/text -IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test -KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 -LICENSE=MIT -RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ) -SLOT=0 -SRC_URI=mirror://rubygems/text-1.2.3.gem -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 2b249022d4895a29827658b7d630c461 ruby-ng 934780d41ab18a9ff091703f511371be ruby-utils 382c3a262907e1219a21618dfd1a01a0 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=ae71aef10c898d1d506e4dca8cee664f diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 index a41004b88e96..42383293eb04 100644 --- a/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 +++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.2.1 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ) SLOT=0 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.2.1.tar.gz -> xmlrpc-0.2.1.tar.gz _eclasses_=eutils 017377e73405d964cd0137088cddb9c3 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 2b249022d4895a29827658b7d630c461 ruby-ng 934780d41ab18a9ff091703f511371be ruby-utils 382c3a262907e1219a21618dfd1a01a0 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=18889a21efcbf89ab63597ef928902bf +_md5_=dc170c776830ada58c1ef33a07c5cf57 diff --git a/metadata/md5-cache/kde-apps/ark-16.08.3-r1 b/metadata/md5-cache/kde-apps/ark-16.08.3-r1 index b540547b78a8..82bfd8a23cde 100644 --- a/metadata/md5-cache/kde-apps/ark-16.08.3-r1 +++ b/metadata/md5-cache/kde-apps/ark-16.08.3-r1 @@ -4,11 +4,11 @@ DESCRIPTION=KDE Archiving tool EAPI=6 HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark IUSE=bzip2 lzma zlib test debug +handbook test -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 ~x86 LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpty-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-arch/libarchive-3.1.0[bzip2?,lzma?,zlib?] >=kde-frameworks/kf-env-3 !kde-apps/ark:4 >=dev-qt/qtcore-5.6.1:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ark-16.08.3.tar.xz _eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 kde5 cb60e5fcd45072e40188c7c37ce0a4fc kde5-functions e944f934c4768113a108eb0184031467 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=e32c5629cb585a67ad0ee115adc1b76c +_md5_=cf428a95a62e6f32a339a024818911d7 diff --git a/metadata/md5-cache/mail-filter/rspamd-1.4.2 b/metadata/md5-cache/mail-filter/rspamd-1.4.2 new file mode 100644 index 000000000000..0b759ae330db --- /dev/null +++ b/metadata/md5-cache/mail-filter/rspamd-1.4.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv sys-devel/make >=dev-util/cmake-3.5.2 virtual/pkgconfig +DESCRIPTION=Rapid spam filtering system +EAPI=5 +HOMEPAGE=https://github.com/vstakhov/rspamd +IUSE=fann jemalloc +jit libressl pcre2 +KEYWORDS=~amd64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv +SLOT=0 +SRC_URI=https://rspamd.com/downloads/rspamd-1.4.2.tar.xz +_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e pax-utils 4c2654a34ebe732e85fda354f6ee642f systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=3db28bb5ffe84011d39cf0a3f2c117fd diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999 index 8cad9f4aa31d..3262da713561 100644 --- a/metadata/md5-cache/mail-filter/rspamd-9999 +++ b/metadata/md5-cache/mail-filter/rspamd-9999 @@ -1,11 +1,11 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 ) fann? ( sci-mathematics/fann ) jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv gd? ( media-libs/gd[jpeg] ) sys-devel/make >=dev-util/cmake-3.5.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 +DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-util/ragel sys-apps/file virtual/libiconv gd? ( media-libs/gd[jpeg] ) sys-devel/make >=dev-util/cmake-3.5.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 DESCRIPTION=Rapid spam filtering system EAPI=5 HOMEPAGE=https://github.com/vstakhov/rspamd -IUSE=fann +gd +jit libressl +IUSE=fann +gd jemalloc +jit libressl pcre2 LICENSE=Apache-2.0 -RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 ) fann? ( sci-mathematics/fann ) jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv gd? ( media-libs/gd[jpeg] ) +RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-util/ragel sys-apps/file virtual/libiconv gd? ( media-libs/gd[jpeg] ) SLOT=0 -_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 git-r3 e928b84a9f6f1d9076d1d27687876dc6 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=c1c2711372de6643904aee56ece0c6bf +_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 git-r3 e928b84a9f6f1d9076d1d27687876dc6 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e pax-utils 4c2654a34ebe732e85fda354f6ee642f systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=eda286cfadb621e14d105cc6c1c51aa6 diff --git a/metadata/md5-cache/media-gfx/feh-2.17.1 b/metadata/md5-cache/media-gfx/feh-2.17.1 deleted file mode 100644 index ac1550eaf5dc..000000000000 --- a/metadata/md5-cache/media-gfx/feh-2.17.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install setup -DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXt x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command ) -DESCRIPTION=A fast, lightweight imageviewer using imlib2 -EAPI=6 -HOMEPAGE=http://feh.finalrewind.org/ -IUSE=debug curl exif test xinerama -KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 -LICENSE=feh -RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0 -SLOT=0 -SRC_URI=http://feh.finalrewind.org/feh-2.17.1.tar.bz2 -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=fec5e1ddc588fb316d3060bccffb77f0 diff --git a/metadata/md5-cache/media-gfx/feh-2.9.3 b/metadata/md5-cache/media-gfx/feh-2.9.3 deleted file mode 100644 index 2064d9b44ce3..000000000000 --- a/metadata/md5-cache/media-gfx/feh-2.9.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare setup -DEPEND=>=media-libs/giblib-1.2.4 media-libs/imlib2[X] >=media-libs/libpng-1.2:0 x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXt x11-proto/xproto test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command ) -DESCRIPTION=A fast, lightweight imageviewer using imlib2 -EAPI=5 -HOMEPAGE=http://feh.finalrewind.org/ -IUSE=debug curl exif test xinerama -KEYWORDS=amd64 ~arm ppc ppc64 x86 -LICENSE=feh -RDEPEND=>=media-libs/giblib-1.2.4 media-libs/imlib2[X] >=media-libs/libpng-1.2:0 x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0 -SLOT=0 -SRC_URI=http://feh.finalrewind.org/feh-2.9.3.tar.bz2 -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=d0fca9161982d20802b161a7f1ce1461 diff --git a/metadata/md5-cache/media-gfx/nomacs-3.0.0 b/metadata/md5-cache/media-gfx/nomacs-3.0.0 deleted file mode 100644 index c39b4d6cd8be..000000000000 --- a/metadata/md5-cache/media-gfx/nomacs-3.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.3.1:= ) zip? ( dev-libs/quazip[qt5] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 -DESCRIPTION=Qt-based image viewer -EAPI=5 -HOMEPAGE=http://www.nomacs.org/ -IUSE=opencv raw tiff webp zip -KEYWORDS=~amd64 ~amd64-linux -LICENSE=GPL-3 -RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.3.1:= ) zip? ( dev-libs/quazip[qt5] ) -REQUIRED_USE=raw? ( opencv ) tiff? ( opencv ) -SLOT=0 -SRC_URI=https://github.com/nomacs/nomacs/releases/download/3.0.0/nomacs-3.0.0-source.tar.bz2 -_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=84cb73b81ecd5402001c89e9e6086e38 diff --git a/metadata/md5-cache/media-gfx/nomacs-3.2.0 b/metadata/md5-cache/media-gfx/nomacs-3.2.0 deleted file mode 100644 index 16d1ca3ab9bf..000000000000 --- a/metadata/md5-cache/media-gfx/nomacs-3.2.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 -DESCRIPTION=Qt-based image viewer -EAPI=6 -HOMEPAGE=http://www.nomacs.org/ -IUSE=opencv raw tiff zip -KEYWORDS=~amd64 ~amd64-linux -LICENSE=GPL-3 -RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] ) -REQUIRED_USE=raw? ( opencv ) tiff? ( opencv ) -SLOT=0 -SRC_URI=https://github.com/nomacs/nomacs/releases/download/3.2.0/nomacs-3.2.0-source.tar.bz2 -_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=b6b8efa83dabef153d70a2d41fb08d1d diff --git a/metadata/md5-cache/media-gfx/nomacs-3.4 b/metadata/md5-cache/media-gfx/nomacs-3.4 deleted file mode 100644 index e5c9524d3d56..000000000000 --- a/metadata/md5-cache/media-gfx/nomacs-3.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 -DESCRIPTION=Qt-based image viewer -EAPI=6 -HOMEPAGE=http://www.nomacs.org/ -IUSE=+jpeg opencv raw tiff zip -KEYWORDS=~amd64 ~amd64-linux -LICENSE=GPL-3+ -RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] ) -REQUIRED_USE=raw? ( opencv ) tiff? ( opencv ) -SLOT=0 -SRC_URI=https://github.com/nomacs/nomacs/archive/3.4.tar.gz -> nomacs-3.4.tar.gz -_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=d00979ffc138b56c8b8d7739c5cadc0e diff --git a/metadata/md5-cache/media-libs/exiftool-10.31 b/metadata/md5-cache/media-libs/exiftool-10.31 deleted file mode 100644 index 340bb5b219ba..000000000000 --- a/metadata/md5-cache/media-libs/exiftool-10.31 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-lang/perl:= -DESCRIPTION=Read and write meta information in image, audio and video files -EAPI=6 -HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/ -IUSE=doc -KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos -LICENSE=|| ( Artistic GPL-1+ ) -RDEPEND=dev-lang/perl:= -SLOT=0 -SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.31.tar.gz -_eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 -_md5_=167f938f6b60cb3508eacee30b64fa5b diff --git a/metadata/md5-cache/media-libs/exiftool-10.36 b/metadata/md5-cache/media-libs/exiftool-10.36 index f44008f9ffd4..c253c7441c5e 100644 --- a/metadata/md5-cache/media-libs/exiftool-10.36 +++ b/metadata/md5-cache/media-libs/exiftool-10.36 @@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files EAPI=6 HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/ IUSE=doc -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos +KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos LICENSE=|| ( Artistic GPL-1+ ) RDEPEND=dev-lang/perl:= SLOT=0 SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.36.tar.gz _eclasses_=multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 -_md5_=4601702180ec547ebbe0d32fbc7b8e29 +_md5_=167f938f6b60cb3508eacee30b64fa5b diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.90 b/metadata/md5-cache/media-libs/libmediainfo-0.7.90 deleted file mode 100644 index 1f6621fc3364..000000000000 --- a/metadata/md5-cache/media-libs/libmediainfo-0.7.90 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=MediaInfo libraries -EAPI=6 -HOMEPAGE=http://mediaarea.net/mediainfo/ -IUSE=curl doc mms static-libs -KEYWORDS=amd64 x86 -LICENSE=BSD-2 -RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) -RESTRICT=test -SLOT=0 -SRC_URI=http://mediaarea.net/download/source/libmediainfo/0.7.90/libmediainfo_0.7.90.tar.xz -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=c6fff55fe641afba06e2bf49aaeecffa diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.91 b/metadata/md5-cache/media-libs/libmediainfo-0.7.91 index ab9028e01b28..f9465085250a 100644 --- a/metadata/md5-cache/media-libs/libmediainfo-0.7.91 +++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.91 @@ -4,11 +4,11 @@ DESCRIPTION=MediaInfo libraries EAPI=6 HOMEPAGE=http://mediaarea.net/mediainfo/ IUSE=curl doc mms static-libs -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=BSD-2 RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.34[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) RESTRICT=test SLOT=0 SRC_URI=http://mediaarea.net/download/source/libmediainfo/0.7.91/libmediainfo_0.7.91.tar.xz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=a12f009e159642dd66cf869429878ac5 +_md5_=70842e8f026afd762f4e4d2aa7bde0b9 diff --git a/metadata/md5-cache/media-libs/libzen-0.4.33 b/metadata/md5-cache/media-libs/libzen-0.4.33 deleted file mode 100644 index 83e3f51ab393..000000000000 --- a/metadata/md5-cache/media-libs/libzen-0.4.33 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Shared library for libmediainfo and mediainfo -EAPI=5 -HOMEPAGE=http://mediaarea.net/mediainfo/ -IUSE=doc static-libs -KEYWORDS=amd64 x86 -LICENSE=ZLIB -SLOT=0 -SRC_URI=http://mediaarea.net/download/source/libzen/0.4.33/libzen_0.4.33.tar.bz2 -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=a18ca30fad4eb8ff5f02577ab342deb9 diff --git a/metadata/md5-cache/media-libs/libzen-0.4.34 b/metadata/md5-cache/media-libs/libzen-0.4.34 index 23c0c6830ed0..4a7f1024a20b 100644 --- a/metadata/md5-cache/media-libs/libzen-0.4.34 +++ b/metadata/md5-cache/media-libs/libzen-0.4.34 @@ -4,9 +4,9 @@ DESCRIPTION=Shared library for libmediainfo and mediainfo EAPI=6 HOMEPAGE=https://github.com/MediaArea/ZenLib http://mediaarea.net/mediainfo/ IUSE=doc static-libs -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=ZLIB SLOT=0 SRC_URI=http://mediaarea.net/download/source/libzen/0.4.34/libzen_0.4.34.tar.bz2 _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=5d809771d77167cfe77edb7aee01b648 +_md5_=e91c350eeed5bc2d502dbb2817f68a57 diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.90 b/metadata/md5-cache/media-video/mediainfo-0.7.90 deleted file mode 100644 index ee3cdb95b6cf..000000000000 --- a/metadata/md5-cache/media-video/mediainfo-0.7.90 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup -DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.90[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=MediaInfo supplies technical and tag information about media files -EAPI=6 -HOMEPAGE=http://mediaarea.net/mediainfo/ -IUSE=curl mms wxwidgets -KEYWORDS=amd64 x86 -LICENSE=BSD-2 -RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.90[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) -SLOT=0 -SRC_URI=http://mediaarea.net/download/source/mediainfo/0.7.90/mediainfo_0.7.90.tar.xz -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 wxwidgets 9b34ce3ca77f4e418e8fd9951c4c1cb1 -_md5_=6aef89de1380957c0ad3dae86fbafbb9 diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.91 b/metadata/md5-cache/media-video/mediainfo-0.7.91 index 22a9f62f3bae..9d1303d9505d 100644 --- a/metadata/md5-cache/media-video/mediainfo-0.7.91 +++ b/metadata/md5-cache/media-video/mediainfo-0.7.91 @@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo supplies technical and tag information about media files EAPI=6 HOMEPAGE=http://mediaarea.net/mediainfo/ IUSE=curl mms wxwidgets -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=BSD-2 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.34 ~media-libs/libmediainfo-0.7.91[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) SLOT=0 SRC_URI=http://mediaarea.net/download/source/mediainfo/0.7.91/mediainfo_0.7.91.tar.xz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 wxwidgets 9b34ce3ca77f4e418e8fd9951c4c1cb1 -_md5_=e814cf27e85dc207d62c33c0bcc38043 +_md5_=f97b5f977971702c873992c2ef37f22e diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 index c6a444a2edc8..56e60ea81904 100644 --- a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 +++ b/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare pretend test -DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.4 virtual/rubygems[ruby_targets_ruby24] ) ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Tools to create, alter, and inspect Matroska files EAPI=6 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix @@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml me SLOT=0 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.6.0.tar.xz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=454f4d5ece4d0002bdb94485f5d3058b +_md5_=f606c8351456fd4b3c3bd3146c45df47 diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.7.1 b/metadata/md5-cache/media-video/mkvtoolnix-9.7.1 index 4d308aba0ee9..c85e41a75c58 100644 --- a/metadata/md5-cache/media-video/mkvtoolnix-9.7.1 +++ b/metadata/md5-cache/media-video/mkvtoolnix-9.7.1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare pretend test -DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 ) || ( ( dev-lang/ruby:2.4 virtual/rubygems[ruby_targets_ruby24] ) ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Tools to create, alter, and inspect Matroska files EAPI=6 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix @@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml me SLOT=0 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.7.1.tar.xz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=f7674cabac3e1b1a890b1e386be62a53 +_md5_=92ffee4efe16d01ea16d5db84b8a0157 diff --git a/metadata/md5-cache/net-firewall/nftables-0.6-r4 b/metadata/md5-cache/net-firewall/nftables-0.6-r4 index 9cd735195074..3ad4672d23e3 100644 --- a/metadata/md5-cache/net-firewall/nftables-0.6-r4 +++ b/metadata/md5-cache/net-firewall/nftables-0.6-r4 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install postinst prepare setup -DEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnftnl-1.0.6 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DEPEND=>=net-libs/libmnl-1.0.3 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.6[xml(-)?] >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools EAPI=6 HOMEPAGE=http://netfilter.org/projects/nftables/ -IUSE=debug doc gmp +readline +IUSE=debug doc gmp +readline xml KEYWORDS=~amd64 ~arm ~x86 LICENSE=GPL-2 -RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnftnl-1.0.6 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) +RDEPEND=>=net-libs/libmnl-1.0.3 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.6[xml(-)?] SLOT=0 SRC_URI=http://git.netfilter.org/nftables/snapshot/v0.6.tar.gz -> nftables-0.6.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=f12d04018e6018f96559e691f4eb0f96 +_md5_=fbc5837bdc90012ac31b828021b1706e diff --git a/metadata/md5-cache/net-firewall/nftables-0.7 b/metadata/md5-cache/net-firewall/nftables-0.7 new file mode 100644 index 000000000000..6d44585e23a8 --- /dev/null +++ b/metadata/md5-cache/net-firewall/nftables-0.7 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare setup +DEPEND=>=net-libs/libmnl-1.0.3 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.7 >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools +EAPI=6 +HOMEPAGE=http://netfilter.org/projects/nftables/ +IUSE=debug doc gmp +readline +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-libs/libmnl-1.0.3 gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.7 +SLOT=0 +SRC_URI=http://git.netfilter.org/nftables/snapshot/v0.7.tar.gz -> nftables-0.7.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=db85c4fed634f5332373019f4a0f297b diff --git a/metadata/md5-cache/net-libs/libnftnl-1.0.7 b/metadata/md5-cache/net-libs/libnftnl-1.0.7 new file mode 100644 index 000000000000..30d13ab4e67b --- /dev/null +++ b/metadata/md5-cache/net-libs/libnftnl-1.0.7 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare setup test +DEPEND=virtual/pkgconfig >=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem +EAPI=6 +HOMEPAGE=http://netfilter.org/projects/nftables/ +IUSE=examples json static-libs test threads +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=net-libs/libmnl-1.0.0 json? ( >=dev-libs/jansson-2.3 ) +REQUIRED_USE=test? ( json ) +SLOT=0/4 +SRC_URI=http://netfilter.org/projects/libnftnl/files/libnftnl-1.0.7.tar.bz2 +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=fe8cd945b4dc556325b679d174eddfe1 diff --git a/metadata/md5-cache/net-libs/openpgm-5.1.118-r1 b/metadata/md5-cache/net-libs/openpgm-5.1.118-r1 index 8e810b66d1de..82ded4bbf462 100644 --- a/metadata/md5-cache/net-libs/openpgm-5.1.118-r1 +++ b/metadata/md5-cache/net-libs/openpgm-5.1.118-r1 @@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare setup test DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Open source implementation of the Pragmatic General Multicast specification EAPI=5 -HOMEPAGE=https://code.google.com/p/openpgm +HOMEPAGE=https://github.com/steve-o/openpgm IUSE=static-libs KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~x86-fbsd LICENSE=LGPL-2.1 SLOT=0 -SRC_URI=https://openpgm.googlecode.com/files/libpgm-5.1.118~dfsg.tar.gz +SRC_URI=https://github.com/steve-o/openpgm/archive/release-5-1-118.tar.gz -> openpgm-5.1.118.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=fb2e3b59def890f09d79f61f0cf1a031 +_md5_=642b5c880ac9fbaee9a454be0a74427b diff --git a/metadata/md5-cache/net-libs/openpgm-5.2.122 b/metadata/md5-cache/net-libs/openpgm-5.2.122 index 0544dbb1849e..b00b5ddccc5d 100644 --- a/metadata/md5-cache/net-libs/openpgm-5.2.122 +++ b/metadata/md5-cache/net-libs/openpgm-5.2.122 @@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare setup test DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Open source implementation of the Pragmatic General Multicast specification EAPI=5 -HOMEPAGE=https://code.google.com/p/openpgm +HOMEPAGE=https://github.com/steve-o/openpgm IUSE=static-libs KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~x86-fbsd LICENSE=LGPL-2.1 SLOT=0 -SRC_URI=https://openpgm.googlecode.com/files/libpgm-5.2.122~dfsg.tar.gz +SRC_URI=https://github.com/steve-o/openpgm/archive/release-5-2-122.tar.gz -> openpgm-5.2.122.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=e4c8380ffe4c7ec01411ab8e92ce0e77 +_md5_=642b5c880ac9fbaee9a454be0a74427b diff --git a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r3 b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r3 new file mode 100644 index 000000000000..2d957a691425 --- /dev/null +++ b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare setup +DEPEND=hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=the legendary remote-mail retrieval and forwarding utility +EAPI=5 +HOMEPAGE=http://www.fetchmail.info/ +IUSE=ssl nls kerberos hesiod tk socks python_targets_python2_7 +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 public-domain +RDEPEND=hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=tk? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.3.26.tar.xz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 +_md5_=9cefcff659a7cdfe35421821f940321c diff --git a/metadata/md5-cache/net-misc/gcap-0.1.1-r1 b/metadata/md5-cache/net-misc/gcap-0.1.1-r1 index 86400aad5ae6..89669e79a220 100644 --- a/metadata/md5-cache/net-misc/gcap-0.1.1-r1 +++ b/metadata/md5-cache/net-misc/gcap-0.1.1-r1 @@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test unpack DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)] DESCRIPTION=Command line tool for downloading Youtube closed captions EAPI=5 -HOMEPAGE=https://code.google.com/p/gcap/ +HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage KEYWORDS=amd64 x86 -LICENSE=GPL-3 +LICENSE=GPL-3+ RDEPEND=dev-perl/Getopt-ArgvFile dev-perl/XML-DOM virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)] SLOT=0 -SRC_URI=https://gcap.googlecode.com/files/gcap-0.1.1.tar.gz +SRC_URI=mirror://debian/pool/main/g/gcap/gcap_0.1.1.orig.tar.gz -> gcap-0.1.1.tar.gz _eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 unpacker 45d07319df5f40ee6af58418b0f930be -_md5_=36b0103c505ba48efbcc6ed3cab3127e +_md5_=be7b0bfed53d42a3335ddcd555b7c6f3 diff --git a/metadata/md5-cache/net-misc/openssh-7.3_p1-r7 b/metadata/md5-cache/net-misc/openssh-7.3_p1-r7 index 19a43b8165e4..9aac6a2a126e 100644 --- a/metadata/md5-cache/net-misc/openssh-7.3_p1-r7 +++ b/metadata/md5-cache/net-misc/openssh-7.3_p1-r7 @@ -1,4 +1,4 @@ -DEFINED_PHASES=configure install postinst preinst prepare setup test +DEFINED_PHASES=configure install postinst preinst prepare pretend test DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig DESCRIPTION=Port of OpenBSD's free SSH release EAPI=5 @@ -11,4 +11,4 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p SLOT=0 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.3p1.tar.gz mirror://gentoo/openssh-7.3_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.3_p1-hpn-14.10-r1.patch.xz http://dev.gentoo.org/~chutzpah/openssh-7.3_p1-hpn-14.10-r1.patch.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.3p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.2/openssh-7.3p1+x509-9.2.diff.gz ) _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=8f283357de658cdba69b98a37f14090e +_md5_=06cea4260476bccc49f52ff506b3553e diff --git a/metadata/md5-cache/net-misc/openssh-7.3_p1-r8 b/metadata/md5-cache/net-misc/openssh-7.3_p1-r8 index 41705b37c6b7..a2cff9aae143 100644 --- a/metadata/md5-cache/net-misc/openssh-7.3_p1-r8 +++ b/metadata/md5-cache/net-misc/openssh-7.3_p1-r8 @@ -1,4 +1,4 @@ -DEFINED_PHASES=configure install postinst preinst prepare setup test +DEFINED_PHASES=configure install postinst preinst prepare pretend test DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig DESCRIPTION=Port of OpenBSD's free SSH release EAPI=5 @@ -11,4 +11,4 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p SLOT=0 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.3p1.tar.gz mirror://gentoo/openssh-7.3_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.3p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.3p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.2/openssh-7.3p1+x509-9.2.diff.gz ) _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=8ab60fc0ca6afdca84a712068c20d328 +_md5_=131103104e71e860fd88df885dfeab75 diff --git a/metadata/md5-cache/net-misc/openssh-7.4_p1 b/metadata/md5-cache/net-misc/openssh-7.4_p1 index d723c6aa2c2c..0742fa0414f6 100644 --- a/metadata/md5-cache/net-misc/openssh-7.4_p1 +++ b/metadata/md5-cache/net-misc/openssh-7.4_p1 @@ -1,4 +1,4 @@ -DEFINED_PHASES=configure install postinst preinst prepare setup test +DEFINED_PHASES=configure install postinst preinst prepare pretend test DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig DESCRIPTION=Port of OpenBSD's free SSH release EAPI=5 @@ -11,4 +11,4 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p SLOT=0 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.4p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz ldap? ( mirror://gentoo/openssh-lpk-7.4p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.3/openssh-7.4p1+x509-9.3.diff.gz ) _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=4d7c9e843c381f07ac5219c4596007e5 +_md5_=122b4dc2b2d83d32e016363d01b3ba95 diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.8 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.8 deleted file mode 100644 index 808c80a11156..000000000000 --- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.8 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 ) virtual/pkgconfig -DESCRIPTION=A GTK+ Gnutella client -EAPI=5 -HOMEPAGE=http://gtk-gnutella.sourceforge.net/ -IUSE=nls dbus ssl +gtk -KEYWORDS=amd64 ppc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 ) -SLOT=0 -SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.8.tar.bz2 -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=0e9947573d99de96fa32eadfc65f4419 diff --git a/metadata/md5-cache/sci-electronics/fritzing-0.8.7b b/metadata/md5-cache/sci-electronics/fritzing-0.8.7b deleted file mode 100644 index ec40c6f4ad6f..000000000000 --- a/metadata/md5-cache/sci-electronics/fritzing-0.8.7b +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare unpack -DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4[sqlite] dev-libs/quazip >=dev-libs/boost-1.40 -DESCRIPTION=Electronic Design Automation -EAPI=5 -HOMEPAGE=http://fritzing.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-SA-3.0 GPL-2 GPL-3 -RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtsql:4[sqlite] dev-libs/quazip -SLOT=0 -SRC_URI=http://fritzing.org/download/0.8.7b/source-tarball/fritzing-0.8.7b.source.tar.bz2 -_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=626610b7be387638a1b7e94ed6b035ca diff --git a/metadata/md5-cache/sci-electronics/fritzing-0.9.2b b/metadata/md5-cache/sci-electronics/fritzing-0.9.2b deleted file mode 100644 index 715668838a98..000000000000 --- a/metadata/md5-cache/sci-electronics/fritzing-0.9.2b +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure prepare -DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/quazip >=dev-libs/boost-1.40 -DESCRIPTION=Electronic Design Automation -EAPI=5 -HOMEPAGE=http://fritzing.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-SA-3.0 GPL-2 GPL-3 -RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/quazip -SLOT=0 -SRC_URI=https://github.com/fritzing/fritzing-app/archive/0.9.2b.tar.gz -> fritzing-0.9.2b.tar.gz -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=94b278ca40bd9761821ecca0c3b04a87 diff --git a/metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r1 b/metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r1 deleted file mode 100644 index e34a9a975c95..000000000000 --- a/metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/quazip[qt5] >=dev-libs/boost-1.40:= -DESCRIPTION=Electronic Design Automation -EAPI=6 -HOMEPAGE=http://fritzing.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-SA-3.0 GPL-3+ -RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/quazip[qt5] -SLOT=0 -SRC_URI=https://github.com/fritzing/fritzing-app/archive/0.9.2b.tar.gz -> fritzing-0.9.2b.tar.gz https://github.com/fritzing/fritzing-parts/archive/0.9.2b.tar.gz -> fritzing-parts-0.9.2b.tar.gz -_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=4d375e50c64e30f03e32983ec909c305 diff --git a/metadata/md5-cache/sys-apps/chname-1.0-r2 b/metadata/md5-cache/sys-apps/chname-1.0-r2 index 869399040ceb..ba85cd01adfe 100644 --- a/metadata/md5-cache/sys-apps/chname-1.0-r2 +++ b/metadata/md5-cache/sys-apps/chname-1.0-r2 @@ -6,6 +6,6 @@ HOMEPAGE=https://github.com/marineam/chname KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 SLOT=0 -SRC_URI=https://chname.googlecode.com/files/chname-1.0.tar.gz +SRC_URI=https://github.com/marineam/chname/archive/v1.0.tar.gz -> chname-1.0.tar.gz _eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=76649a86e2719c1e5b13d887cf87bbfa +_md5_=ef4daa549f7b4ad1b69936c43a8382b1 diff --git a/metadata/md5-cache/sys-apps/ed-1.12 b/metadata/md5-cache/sys-apps/ed-1.14 similarity index 84% rename from metadata/md5-cache/sys-apps/ed-1.12 rename to metadata/md5-cache/sys-apps/ed-1.14 index d8dbd662d1bf..13df68378e8e 100644 --- a/metadata/md5-cache/sys-apps/ed-1.12 +++ b/metadata/md5-cache/sys-apps/ed-1.14 @@ -1,11 +1,11 @@ DEFINED_PHASES=configure DEPEND=sys-apps/texinfo DESCRIPTION=Your basic line editor -EAPI=4 +EAPI=5 HOMEPAGE=https://www.gnu.org/software/ed/ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 SLOT=0 -SRC_URI=http://fossies.org/linux/privat/ed-1.12.tar.gz +SRC_URI=http://fossies.org/linux/privat/ed-1.14.tar.gz _eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=9244cda1ae7a13a8b119047e37fee85c +_md5_=7c0120653f42c7f68fa295798a574f5a diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.13-r1 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.13-r1 new file mode 100644 index 000000000000..aed9e860b536 --- /dev/null +++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.13-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) virtual/pkgconfig +DESCRIPTION=Load another kernel from the currently executing Linux kernel +EAPI=5 +HOMEPAGE=https://kernel.org/pub/linux/utils/kernel/kexec/ +IUSE=booke lzma xen zlib +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) +REQUIRED_USE=lzma? ( zlib ) +SLOT=0 +SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.13.tar.xz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=ca3dcbdedef6c97d1ba1acc0c23b1848 diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 index 5b2a0353bdd1..7cc4a006eb48 100644 --- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 +++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 @@ -1,7 +1,7 @@ DEFINED_PHASES=compile install prepare setup DEPEND=virtual/modutils virtual/yacc sys-devel/flex virtual/pkgconfig DESCRIPTION=PCMCIA userspace utilities for Linux -EAPI=5 +EAPI=6 HOMEPAGE=http://packages.qa.debian.org/pcmciautils IUSE=debug staticsocket KEYWORDS=~amd64 ~arm ~ppc ~sh ~x86 @@ -10,4 +10,4 @@ RDEPEND=virtual/modutils SLOT=0 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz _eclasses_=eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=9592e052b87714c9fe7702b8546e4d38 +_md5_=c890aa4889e032b300b3b75d71739083 diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4 new file mode 100644 index 000000000000..5d157c5cafd4 --- /dev/null +++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz +_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=153b96805345395c28693a62362d86c6 diff --git a/metadata/md5-cache/sys-power/powerman-2.3.9-r1 b/metadata/md5-cache/sys-power/powerman-2.3.9-r1 index 32000c7cd026..3ee9da655bbb 100644 --- a/metadata/md5-cache/sys-power/powerman-2.3.9-r1 +++ b/metadata/md5-cache/sys-power/powerman-2.3.9-r1 @@ -2,11 +2,11 @@ DEFINED_PHASES=configure install DEPEND=sys-devel/bison httppower? ( net-misc/curl ) snmppower? ( net-analyzer/net-snmp ) !app-accessibility/speech-tools DESCRIPTION=RPC/PDU control and monitoring service for data center or compute cluster power management EAPI=6 -HOMEPAGE=https://code.google.com/p/powerman/ +HOMEPAGE=https://github.com/chaos/powerman IUSE=+httppower -snmppower -h8power +genders KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 +LICENSE=GPL-2+ RDEPEND=>=sys-libs/freeipmi-0.2.3 SLOT=0 -SRC_URI=https://powerman.googlecode.com/files/powerman-2.3.9.tar.gz -_md5_=4593f7e903b3372f7bf5fbb9f4027973 +SRC_URI=https://github.com/chaos/powerman/archive/powerman-2.3.9.tar.gz +_md5_=21d096523b0079bf446a97fc2c8cd77a diff --git a/metadata/md5-cache/sys-process/acct-6.5.5-r4 b/metadata/md5-cache/sys-process/acct-6.5.5-r4 new file mode 100644 index 000000000000..41b397ac23bf --- /dev/null +++ b/metadata/md5-cache/sys-process/acct-6.5.5-r4 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install prepare +DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=GNU system accounting utilities +EAPI=3 +HOMEPAGE=https://savannah.gnu.org/projects/acct/ +KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-3 +SLOT=0 +SRC_URI=mirror://gnu/acct/acct-6.5.5.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=96cdbe3c795096440f0f639fbddddd85 diff --git a/metadata/md5-cache/sys-process/acct-6.6.2-r1 b/metadata/md5-cache/sys-process/acct-6.6.2-r1 new file mode 100644 index 000000000000..a6e1786b078c --- /dev/null +++ b/metadata/md5-cache/sys-process/acct-6.6.2-r1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install prepare unpack +DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=GNU system accounting utilities +EAPI=5 +HOMEPAGE=https://savannah.gnu.org/projects/acct/ +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=GPL-3 +SLOT=0 +SRC_URI=mirror://gnu/acct/acct-6.6.2.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c base 3fe4f8980633fd7bc69e9887209ba2fe eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=a7bc12cc60d0b44f518599a200dbb284 diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.370.0-r2 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.370.0-r2 index 7d67be504d75..6848a14ca7b2 100644 --- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.370.0-r2 +++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.370.0-r2 @@ -1,7 +1,7 @@ DEFINED_PHASES=- DESCRIPTION=Virtual for IO-Socket-IP EAPI=6 -KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris +KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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* =dev-lang/perl-5.22* ~perl-core/IO-Socket-IP-0.370.0 ) dev-lang/perl:= !perl-core/IO-Socket-IP-0.370.0-r999 SLOT=0 -_md5_=50d0f7b29c65681636cc20ae982b11b4 +_md5_=ce2b07fdeed9271dbc6435b0e45cd032 diff --git a/metadata/md5-cache/www-apps/phpBB-3.0.10 b/metadata/md5-cache/www-apps/phpBB-3.0.10 deleted file mode 100644 index f3501f875d64..000000000000 --- a/metadata/md5-cache/www-apps/phpBB-3.0.10 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prerm setup -DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15 -DESCRIPTION=phpBB is an open-source bulletin board package -EAPI=4 -HOMEPAGE=http://www.phpbb.com/ -IUSE=vhosts -KEYWORDS=~alpha amd64 ~ppc ~sparc x86 -LICENSE=GPL-2 -RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15 -SLOT=3.0.10 -SRC_URI=http://download.phpbb.com/pub/release/3.0/3.0.10/phpBB-3.0.10.tar.bz2 -_eclasses_=webapp 42c6ef7af496b228f9854b3c81e4b226 -_md5_=180857e23b5c0f74340fd6d8e0714961 diff --git a/metadata/md5-cache/www-apps/phpBB-3.0.11 b/metadata/md5-cache/www-apps/phpBB-3.0.11 deleted file mode 100644 index 63faffc43c61..000000000000 --- a/metadata/md5-cache/www-apps/phpBB-3.0.11 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prerm setup -DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15 -DESCRIPTION=phpBB is an open-source bulletin board package -EAPI=4 -HOMEPAGE=http://www.phpbb.com/ -IUSE=vhosts -KEYWORDS=~alpha amd64 ~ppc ~sparc x86 -LICENSE=GPL-2 -RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15 -SLOT=3.0.11 -SRC_URI=http://download.phpbb.com/pub/release/3.0/3.0.11/phpBB-3.0.11.tar.bz2 -_eclasses_=webapp 42c6ef7af496b228f9854b3c81e4b226 -_md5_=180857e23b5c0f74340fd6d8e0714961 diff --git a/metadata/md5-cache/www-apps/phpBB-3.0.12 b/metadata/md5-cache/www-apps/phpBB-3.0.12 deleted file mode 100644 index c8901d681738..000000000000 --- a/metadata/md5-cache/www-apps/phpBB-3.0.12 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prerm setup -DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15 -DESCRIPTION=phpBB is an open-source bulletin board package -EAPI=5 -HOMEPAGE=http://www.phpbb.com/ -IUSE=vhosts -KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15 -SLOT=3.0.12 -SRC_URI=http://download.phpbb.com/pub/release/3.0/3.0.12/phpBB-3.0.12.tar.bz2 -_eclasses_=webapp 42c6ef7af496b228f9854b3c81e4b226 -_md5_=37b3bf517c251b2e0659ae983381b183 diff --git a/metadata/md5-cache/www-apps/phpBB-3.1.10 b/metadata/md5-cache/www-apps/phpBB-3.1.10 new file mode 100644 index 000000000000..406d4d7673e1 --- /dev/null +++ b/metadata/md5-cache/www-apps/phpBB-3.1.10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst prerm setup +DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15 +DESCRIPTION=An open-source bulletin board package +EAPI=6 +HOMEPAGE=http://www.phpbb.com/ +IUSE=ftp gd imagemagick mssql mysqli postgres sqlite xml zlib vhosts +KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86 +LICENSE=GPL-2 +RDEPEND==virtual/httpd-php-5*:* =dev-lang/php-5*:*[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?] imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) >=app-admin/webapp-config-1.50.15 +SLOT=3.1.10 +SRC_URI=http://download.phpbb.com/pub/release/3.1/3.1.10/phpBB-3.1.10.tar.bz2 +_eclasses_=webapp 42c6ef7af496b228f9854b3c81e4b226 +_md5_=28d54b99bfe3c36e0cbcd95234e3870b diff --git a/metadata/md5-cache/www-servers/nginx-1.10.2-r3 b/metadata/md5-cache/www-servers/nginx-1.10.2-r3 new file mode 100644 index 000000000000..3558478e7664 --- /dev/null +++ b/metadata/md5-cache/www-servers/nginx-1.10.2-r3 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) virtual/pkgconfig +DESCRIPTION=Robust, small and high performance http and reverse proxy server +EAPI=6 +HOMEPAGE=http://nginx.org +IUSE=aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_limit_conn nginx_modules_stream_upstream nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 ) +PDEPEND=vim-syntax? ( app-vim/nginx-syntax ) +RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline +REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl ) +SLOT=0 +SRC_URI=http://nginx.org/download/nginx-1.10.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.1.tar.gz -> ngx_http_fancyindex-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.7.tar.gz -> ngx_http_lua-0.10.7.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0-10-gf3bdb7b.tar.gz -> ngx_http_upstream_check-0.3.0-10-gf3bdb7b.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.1.tar.gz -> ngx_http_naxsi-0.55.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.10.tar.gz -> ngx_rtmp-1.1.10.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.60.tar.gz -> ngx_http_echo-0.60.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.17.tar.gz -> ngx_memc_module-0.17.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz ) +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 ssl-cert b031e94f4c7c34e1d677376b8929821a systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=217efe9837353c910a131a1e3c92109e diff --git a/metadata/md5-cache/www-servers/nginx-1.11.6-r1 b/metadata/md5-cache/www-servers/nginx-1.11.6-r1 new file mode 100644 index 000000000000..8d8b9a1ef095 --- /dev/null +++ b/metadata/md5-cache/www-servers/nginx-1.11.6-r1 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) virtual/pkgconfig +DESCRIPTION=Robust, small and high performance http and reverse proxy server +EAPI=6 +HOMEPAGE=http://nginx.org +IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 ) +PDEPEND=vim-syntax? ( app-vim/nginx-syntax ) +RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0 +REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl ) +SLOT=mainline +SRC_URI=http://nginx.org/download/nginx-1.11.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.1.tar.gz -> ngx_http_fancyindex-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.7.tar.gz -> ngx_http_lua-0.10.7.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0-10-gf3bdb7b.tar.gz -> ngx_http_upstream_check-0.3.0-10-gf3bdb7b.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.1.tar.gz -> ngx_http_naxsi-0.55.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.10.tar.gz -> ngx_rtmp-1.1.10.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.60.tar.gz -> ngx_http_echo-0.60.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.17.tar.gz -> ngx_memc_module-0.17.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz ) +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 ssl-cert b031e94f4c7c34e1d677376b8929821a systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=dac29b8018580d23add849e1a6ac5b93 diff --git a/metadata/md5-cache/www-servers/nginx-1.11.8 b/metadata/md5-cache/www-servers/nginx-1.11.8 new file mode 100644 index 000000000000..7444380bba71 --- /dev/null +++ b/metadata/md5-cache/www-servers/nginx-1.11.8 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst prepare setup test +DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) virtual/pkgconfig +DESCRIPTION=Robust, small and high performance http and reverse proxy server +EAPI=6 +HOMEPAGE=http://nginx.org +IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 ) +PDEPEND=vim-syntax? ( app-vim/nginx-syntax ) +RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0 +REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl ) +SLOT=mainline +SRC_URI=http://nginx.org/download/nginx-1.11.8.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.1.tar.gz -> ngx_http_fancyindex-0.4.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.7.tar.gz -> ngx_http_lua-0.10.7.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/v0.3.0-10-gf3bdb7b.tar.gz -> ngx_http_upstream_check-0.3.0-10-gf3bdb7b.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.1.tar.gz -> ngx_http_naxsi-0.55.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.1.10.tar.gz -> ngx_rtmp-1.1.10.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz -> ngx_http_dav_ext-0.0.3.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.60.tar.gz -> ngx_http_echo-0.60.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz -> modsecurity-2.9.1.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.17.tar.gz -> ngx_memc_module-0.17.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz ) +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 ssl-cert b031e94f4c7c34e1d677376b8929821a systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=475d295e24f4ef91312c75185d586313 diff --git a/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107 b/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107 new file mode 100644 index 000000000000..1725b5ad2da1 --- /dev/null +++ b/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare unpack +DEPEND=net-im/pidgin[gtk] app-text/mathtex nls? ( virtual/libintl ) virtual/pkgconfig +DESCRIPTION=Pidgin plugin to render LaTeX expressions in messages +EAPI=6 +HOMEPAGE=https://github.com/Micket/pidgintex +IUSE=nls +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3+ +RDEPEND=net-im/pidgin[gtk] app-text/mathtex nls? ( virtual/libintl ) +SLOT=0 +SRC_URI=https://github.com/Micket/pidgintex/archive/a8f618cf1bf92279b43c7b737010fd7e42c8e5d3.tar.gz -> pidgintex-1.1.2_p20170107.tar.gz +_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd +_md5_=b8eacc33b7b4118c4b44ba76a3b8e5e7 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index ab266efe9de9..32153f3836b5 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Sat, 07 Jan 2017 18:38:27 +0000 +Sun, 08 Jan 2017 09:13:21 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 3a06178775da..8d912c2875ad 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Sat Jan 7 18:34:40 UTC 2017 +Sun Jan 8 09:09:34 UTC 2017 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 374af1071fbf..91f096e73eed 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Sat, 07 Jan 2017 19:00:01 +0000 +Sun, 08 Jan 2017 09:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 0a0d6085f675..e0c3b7f42c0b 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1483814101 Sat 07 Jan 2017 06:35:01 PM UTC +1483866601 Sun 08 Jan 2017 09:10:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 1955e479856b..32153f3836b5 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Sat, 07 Jan 2017 18:38:26 +0000 +Sun, 08 Jan 2017 09:13:21 +0000 diff --git a/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch b/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch deleted file mode 100644 index be385f6cfbe3..000000000000 --- a/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch +++ /dev/null @@ -1,102 +0,0 @@ -http://bugs.gentoo.org/397477 - ---- avahi-python/avahi/Makefile.am -+++ avahi-python/avahi/Makefile.am -@@ -31,7 +31,7 @@ - -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ - -e 's,@CHECK_KEY\@,while key is not None:,g' \ - -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ -- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ -+ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ - chmod +x $@ - endif - -@@ -44,7 +44,7 @@ - -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ - -e 's,@CHECK_KEY\@,for key in keys:,g' \ - -e 's,@NEXT_KEY\@,,g' \ -- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ -+ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ - chmod +x $@ - endif - ---- avahi-python/avahi/ServiceTypeDatabase.py.in -+++ avahi-python/avahi/ServiceTypeDatabase.py.in -@@ -26,7 +26,7 @@ - class ServiceTypeDatabase: - """ServiceTypeDatabase maps service types to descriptions""" - -- def __init__(self, filename = "@pkglibdir@/service-types.db"): -+ def __init__(self, filename = "@pkgdatadir@/service-types.db"): - - self.db = @DBM@.open(filename, "r") - ---- avahi-ui/Makefile.am -+++ avahi-ui/Makefile.am -@@ -62,18 +62,18 @@ - - if HAVE_GDBM - libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c --libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - libavahi_ui_la_LIBADD += -lgdbm - --libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - libavahi_ui_gtk3_la_LIBADD += -lgdbm - endif - - if HAVE_DBM - libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c --libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - --libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - endif - - bin_PROGRAMS = bssh ---- avahi-utils/Makefile.am -+++ avahi-utils/Makefile.am -@@ -30,13 +30,13 @@ - - if HAVE_GDBM - avahi_browse_SOURCES += stdb.h stdb.c --avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - avahi_browse_LDADD += -lgdbm - endif - - if HAVE_DBM - avahi_browse_SOURCES += stdb.h stdb.c --avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" -+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" - endif - - avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h ---- service-type-database/Makefile.am -+++ service-type-database/Makefile.am -@@ -18,13 +18,12 @@ - EXTRA_DIST=build-db.in service-types - - pkgdata_DATA=service-types --pkglib_DATA= - - if HAVE_PYTHON - if HAVE_GDBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db -+pkgdata_DATA+=service-types.db - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@@ -41,7 +40,7 @@ - if HAVE_DBM - - noinst_SCRIPTS=build-db --pkglib_DATA+=service-types.db.pag service-types.db.dir -+pkgdata_DATA+=service-types.db.pag service-types.db.dir - - build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ diff --git a/net-dns/avahi/files/avahi-0.6.30-parallel.patch b/net-dns/avahi/files/avahi-0.6.30-parallel.patch deleted file mode 100644 index a75f99109c6c..000000000000 --- a/net-dns/avahi/files/avahi-0.6.30-parallel.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cb10a844f9e91322aca91340b7adc0db19c96b36 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= -Date: Mon, 30 Apr 2012 17:07:41 -0700 -Subject: [PATCH] build-sys: fix parallel install in avahi-utils -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The moment install-exec-local is called, we might still not have -created ${DESTDIR}/${bindir} so we should make sure to create it -first, and then try to chdir into it. - -Signed-off-by: Diego Elio Pettenò ---- - avahi-utils/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am -index a644b4a..1abc79a 100644 ---- a/avahi-utils/Makefile.am -+++ b/avahi-utils/Makefile.am -@@ -54,7 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS) - avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la - - install-exec-local: -- cd $(DESTDIR)/$(bindir) && \ -+ $(mkdir_p) $(DESTDIR)/$(bindir) && \ -+ cd $(DESTDIR)/$(bindir) && \ - rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ - $(LN_S) avahi-resolve avahi-resolve-host-name && \ - $(LN_S) avahi-resolve avahi-resolve-address && \ --- -1.7.8.6 - diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index ee4654f4c8b5..dfd6553f63e0 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -1 +1,2 @@ DIST nftables-0.6.tar.gz 252523 SHA256 85dd7fa4e741c0be02efddbc57b5d300e1147f09ec6f81d0399110f96dc958f0 SHA512 17f3b94687865e077dc082cf61b29ab2854fd1ffe18212a8d424f2876aef8db9780dd4d06dca8e6d093498151d47bab73e40e1f54062a83a23a3cbe75f27e921 WHIRLPOOL d15eaf81426d73bea28752f96727d291120120fb2aaa994d421d900974eb45062957435e077664fb916780f636ed9b61889dbec8b627d5d309512bae96f02874 +DIST nftables-0.7.tar.gz 292652 SHA256 192c9d92ee0c56eded599d1c54b0d68f4d9b0286f3d908579f0b9271aeba432f SHA512 6032720abf3af8a6dc0b4f507c6ae970447f504d59db4a34b2e0eea3c59962bc69d9ebfaa4e26a117747eb9d0224716a9709b96551b5479d914d7498f26ed43a WHIRLPOOL a999e85370bd9241daf015849ecdf5955f87a2d65f5525a6e75e9eda1bb87e1a84123c42e95f16c4469873a682409fea2ccc65a3af84a107b62d8c2a5727343d diff --git a/net-firewall/nftables/files/libexec/nftables.sh b/net-firewall/nftables/files/libexec/nftables.sh index f720b9bfc514..cc55f8566000 100755 --- a/net-firewall/nftables/files/libexec/nftables.sh +++ b/net-firewall/nftables/files/libexec/nftables.sh @@ -27,7 +27,7 @@ main() { "store") local tmp_save="${NFTABLES_SAVE}.tmp" if ! use_legacy; then - nft list ruleset > ${tmp_save} + nft ${SAVE_OPTIONS} list ruleset > ${tmp_save} else save_legacy ${tmp_save} fi diff --git a/net-firewall/nftables/files/nftables.init b/net-firewall/nftables/files/nftables.init index 217251e41db4..cf4ab8b5f44b 100644 --- a/net-firewall/nftables/files/nftables.init +++ b/net-firewall/nftables/files/nftables.init @@ -1,6 +1,6 @@ #!/sbin/openrc-run -# Copyright 2014-2016 Nicholas Vinson -# Copyright 1999-2016 Gentoo Foundation +# Copyright 2014-2017 Nicholas Vinson +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_commands="clear list panic save" @@ -83,6 +83,7 @@ save() { ebegin "Saving nftables state" checkpath -q -d "$(dirname "${NFTABLES_SAVE}")" checkpath -q -m 0600 -f "${NFTABLES_SAVE}" + export SAVE_OPTIONS /usr/libexec/nftables/nftables.sh store ${NFTABLES_SAVE} return $? } diff --git a/net-firewall/nftables/nftables-0.6-r4.ebuild b/net-firewall/nftables/nftables-0.6-r4.ebuild index 7874baf0062b..5750a3a7881f 100644 --- a/net-firewall/nftables/nftables-0.6-r4.ebuild +++ b/net-firewall/nftables/nftables-0.6-r4.ebuild @@ -13,12 +13,13 @@ SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug doc gmp +readline" +IUSE="debug doc gmp +readline xml" RDEPEND=">=net-libs/libmnl-1.0.3 - >=net-libs/libnftnl-1.0.6 gmp? ( dev-libs/gmp:0= ) - readline? ( sys-libs/readline:0= )" + readline? ( sys-libs/readline:0= ) + >=net-libs/libnftnl-1.0.6[xml(-)?] + " DEPEND="${RDEPEND} >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) @@ -73,7 +74,7 @@ src_install() { pkg_postinst() { local save_file - save_file="${EROOT}var/lib/nftables/rules-save" + save_file="${EROOT%/}/var/lib/nftables/rules-save" elog "In order for the nftables-restore systemd service to start, " elog "the file, ${save_file}, must exist. To create this " diff --git a/net-firewall/nftables/nftables-0.7.ebuild b/net-firewall/nftables/nftables-0.7.ebuild new file mode 100644 index 000000000000..b90143dd309b --- /dev/null +++ b/net-firewall/nftables/nftables-0.7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools linux-info systemd + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://netfilter.org/projects/nftables/" +SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug doc gmp +readline" + +RDEPEND=">=net-libs/libmnl-1.0.3 + gmp? ( dev-libs/gmp:0= ) + readline? ( sys-libs/readline:0= ) + >=net-libs/libnftnl-1.0.7" + +DEPEND="${RDEPEND} + >=app-text/docbook2X-0.8.8-r4 + doc? ( >=app-text/dblatex-0.3.7 ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +S="${WORKDIR}/v${PV}" + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --sbindir="${EPREFIX}"/sbin \ + $(use_enable doc pdf-doc) \ + $(use_enable debug) \ + $(use_with readline cli) \ + $(use_with !gmp mini_gmp) +} + +src_install() { + default + + dodir /usr/libexec/${PN} + exeinto /usr/libexec/${PN} + doexe "${FILESDIR}"/libexec/${PN}.sh + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.init ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service + systemd_enable_service basic.target ${PN}-restore.service +} + +pkg_postinst() { + local save_file + save_file="${EROOT%/}/var/lib/nftables/rules-save" + + elog "In order for the nftables-restore systemd service to start, " + elog "the file, ${save_file}, must exist. To create this " + elog "file run the following command: " + elog "" + elog " touch '${save_file}'" + elog "" + elog "Afterwards, the nftables-restore service should be manually started " + elog "to ensure firewall changes are stored on system shutdown. The " + elog "systemd service will function normally thereafter." +} diff --git a/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch b/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch deleted file mode 100644 index 60e9f2b20941..000000000000 --- a/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb) -Author: Luke Dashjr -Date: Mon Sep 9 03:06:17 2013 +0000 - - configure: Add unsupported --with-system-leveldb configure flag - -diff --git a/configure.ac b/configure.ac -index 3ed4549..5a5852d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include ], - [ AC_MSG_RESULT(no)] - ) - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ LIBLEVELDB=-lleveldb -+ LIBMEMENV=-lmemenv -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) diff --git a/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch b/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch deleted file mode 100644 index 77ed10675e30..000000000000 --- a/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6784521..3598bab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon], - - BITCOIN_QT_INIT - -+PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes]) -+if test "x$use_libsecp256k1" = "xyes"; then -+ AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1]) -+fi -+ - if test x$use_pkgconfig = xyes; then - - if test x"$PKG_CONFIG" = "x"; then -@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" - unset PKG_CONFIG_LIBDIR - PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" - --ac_configure_args="${ac_configure_args} --disable-shared --with-pic" --AC_CONFIG_SUBDIRS([src/secp256k1]) -- - AC_OUTPUT - - dnl Taken from https://wiki.debian.org/RpathIssue -diff --git a/src/Makefile.am b/src/Makefile.am -index 0d45203..3a44a16 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,3 @@ --DIST_SUBDIRS = secp256k1 - AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) - - -@@ -20,7 +19,7 @@ endif - BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config - BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - --BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) - - LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a - LIBBITCOINQT=qt/libbitcoinqt.a --LIBSECP256K1=secp256k1/libsecp256k1.la -- --$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) -- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+LIBSECP256K1=$(libsecp256k1_LIBS) - - # Make is not made aware of per-object dependencies to avoid limiting building parallelization - # But to build the less dependent modules first, we manually select their order here: -@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS) - libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS) - libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL - if USE_LIBSECP256K1 --libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la -+libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1) - endif - endif - -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 5fd2afe..014092a 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE - bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - --check-local: -- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -- - %.json.h: %.json - @$(MKDIR_P) $(@D) - @echo "namespace json_tests{" > $@ diff --git a/net-libs/libbitcoinconsensus/files/9999-syslibs.patch b/net-libs/libbitcoinconsensus/files/9999-syslibs.patch deleted file mode 100644 index c594c54634ed..000000000000 --- a/net-libs/libbitcoinconsensus/files/9999-syslibs.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 -index 66f106c..5f0a3b1 100644 ---- a/build-aux/m4/bitcoin_subdir_to_include.m4 -+++ b/build-aux/m4/bitcoin_subdir_to_include.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ - AC_MSG_RESULT([default]) - else - echo "#include <$2$3.h>" >conftest.cpp -- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] -+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) - AC_MSG_RESULT([${newinclpath}]) - if test "x${newinclpath}" != "x"; then - eval "$1=\"\$$1\"' -I${newinclpath}'" -diff --git a/configure.ac b/configure.ac -index 939dfea..6c9acb3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) - -+AC_ARG_ENABLE([util-cli], -+ [AS_HELP_STRING([--enable-util-cli], -+ [build bitcoin-cli])], -+ [build_bitcoin_cli=$enableval], -+ [build_bitcoin_cli=$build_bitcoin_utils]) -+ -+AC_ARG_ENABLE([util-tx], -+ [AS_HELP_STRING([--enable-util-tx], -+ [build bitcoin-tx])], -+ [build_bitcoin_tx=$enableval], -+ [build_bitcoin_tx=$build_bitcoin_utils]) -+ - AC_ARG_WITH([libs], - [AS_HELP_STRING([--with-libs], - [build libraries (default=yes)])], -@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then - [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) - fi - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ TEMP_LIBS="$LIBS" -+ LIBS="$LIBS $LIBLEVELDB" -+ AC_CHECK_LIB([memenv],[main],[ -+ LIBMEMENV=-lmemenv -+ ],[ -+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ LIBS="$TEMP_LIBS" -+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ -+ AC_MSG_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) - -+dnl Check for libsecp256k1, only if explicitly requested -+AC_ARG_WITH([system-libsecp256k1], -+ [AS_HELP_STRING([--with-system-libsecp256k1], -+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_libsecp256k1=$withval], -+ [system_libsecp256k1=no] -+) -+if test x$system_libsecp256k1 != xno; then -+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+else -+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' -+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' -+fi -+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) -+AC_SUBST(libsecp256k1_CFLAGS) -+AC_SUBST(libsecp256k1_LIBS) -+ - if test x$enable_wallet != xno; then - dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 -@@ -558,7 +621,7 @@ BITCOIN_QT_INIT - dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) - --if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then - use_boost=no - else - use_boost=yes -@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) - AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) - AC_MSG_RESULT($build_bitcoind) - --AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) --AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) --AC_MSG_RESULT($build_bitcoin_utils) -+AC_MSG_CHECKING([whether to build bitcoin-cli]) -+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) -+AC_MSG_RESULT($build_bitcoin_cli) -+ -+AC_MSG_CHECKING([whether to build bitcoin-tx]) -+AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) -+AC_MSG_RESULT($build_bitcoin_tx) - - AC_MSG_CHECKING([whether to build libraries]) - AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -975,7 +1042,7 @@ else - AC_MSG_RESULT([no]) - fi - --if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then - AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) - fi - -@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then - AC_CONFIG_SUBDIRS([src/univalue]) - fi - -+if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" - AC_CONFIG_SUBDIRS([src/secp256k1]) -+fi - - AC_OUTPUT - -diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py -index 7649c11..978419b 100755 ---- a/qa/pull-tester/rpc-tests.py -+++ b/qa/pull-tester/rpc-tests.py -@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): - ENABLE_WALLET=0 - if not vars().has_key('ENABLE_BITCOIND'): - ENABLE_BITCOIND=0 --if not vars().has_key('ENABLE_UTILS'): -- ENABLE_UTILS=0 -+if not vars().has_key('ENABLE_CLI'): -+ ENABLE_CLI=0 - if not vars().has_key('ENABLE_ZMQ'): - ENABLE_ZMQ=0 - -@@ -141,7 +141,7 @@ def runtests(): - coverage = RPCCoverage() - print("Initializing coverage directory at %s\n" % coverage.dir) - -- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): -+ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): - rpcTestDir = buildDir + '/qa/rpc-tests/' - run_extended = '-extended' in opts - cov_flag = coverage.flag if coverage else '' -@@ -187,7 +187,7 @@ def runtests(): - coverage.cleanup() - - else: -- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" -+ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" - - - class RPCCoverage(object): -diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in -index 937b423..71a917c 100644 ---- a/qa/pull-tester/tests_config.py.in -+++ b/qa/pull-tester/tests_config.py.in -@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" - - # These will turn into comments if they were disabled when configuring. - @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 --@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 -+@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 - @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 - @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index fa7a78f..cc2f2ca 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -31,7 +31,7 @@ endif - BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config - BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - --BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) - BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) - - LIBBITCOIN_SERVER=libbitcoin_server.a -@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a - LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOINQT=qt/libbitcoinqt.a -+if EMBEDDED_LIBSECP256K1 - LIBSECP256K1=secp256k1/libsecp256k1.la -+else -+LIBSECP256K1=$(libsecp256k1_LIBS) -+endif - -+if EMBEDDED_LIBSECP256K1 - $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+endif - - # Make is not made aware of per-object dependencies to avoid limiting building parallelization - # But to build the less dependent modules first, we manually select their order here: -@@ -79,8 +85,11 @@ if BUILD_BITCOIND - bin_PROGRAMS += bitcoind - endif - --if BUILD_BITCOIN_UTILS -- bin_PROGRAMS += bitcoin-cli bitcoin-tx -+if BUILD_BITCOIN_CLI -+ bin_PROGRAMS += bitcoin-cli -+endif -+if BUILD_BITCOIN_TX -+ bin_PROGRAMS += bitcoin-tx - endif - - .PHONY: FORCE check-symbols check-security -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 6ef6a69..1b6e759 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE - check-local: - @echo "Running test/bitcoin-util-test.py..." - $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py -+if EMBEDDED_LIBSECP256K1 - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -+endif - if EMBEDDED_UNIVALUE - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check - endif diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index f3a45e4daba9..01ce37861ba0 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,2 +1,3 @@ DIST libnftnl-1.0.5.tar.bz2 367016 SHA256 f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497 SHA512 85c71aaaeeafdffe09f2591f26d49d41e9f511a53ed313fe642b4968eae8aac1246a53d5908fc737c6eb9cc4f5f3ef2a4eaa17fe33db453a1fd60f2f9d5c5a1d WHIRLPOOL 15fb25aa9e23bfdcb19ab21ea1d6eadd22e5acc0c38e761e4637a06136c809f5a5827ac58643515432e1394e3e8d4575df11e52b5f16ca787157317e5e2ae463 DIST libnftnl-1.0.6.tar.bz2 381897 SHA256 ad3b932a39a1e567308e91b683b32239a5e1aea9b4582dfffe2288c3400ab07e SHA512 d813c9d0dbdeaffc30695fb0b5dbf987849339d119774c4f0e219db835f2ad9111a7436fd474ffa96b07e288d537cb4a1be153afcca23dabce0c264e1c4a3c62 WHIRLPOOL c4221c99ee437125c1b10d1d47db7586b979e0ce8e7187a2a9fd5ad3b866e0e6b451aba0956c9a48cec9fb7fc411f523c5f35cd9ef2cd1a939aaab7cb7570728 +DIST libnftnl-1.0.7.tar.bz2 384969 SHA256 9bb66ecbc64b8508249402f0093829f44177770ad99f6042b86b3a467d963982 SHA512 a220c6a2857b4ff7325bfa4fbf537c5afeb66232a7e190b50c3077f01b86f0fb1842055ccc719280b36820ac7103cbe8168944ffe10c55444830ff77449fa6a5 WHIRLPOOL 400edc3bf8268e6c7d4a6804fe36eaca271144019c2220b27865e755466318fe18e1ee5be583d63fc3cfcb1c6819ab557e17fefcba4b96c74e918d024012aadc diff --git a/net-libs/libnftnl/libnftnl-1.0.7.ebuild b/net-libs/libnftnl/libnftnl-1.0.7.ebuild new file mode 100644 index 000000000000..4b71bdab919c --- /dev/null +++ b/net-libs/libnftnl/libnftnl-1.0.7.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" +HOMEPAGE="http://netfilter.org/projects/nftables/" +SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="examples json static-libs test threads" + +RDEPEND=">=net-libs/libmnl-1.0.0 + json? ( >=dev-libs/jansson-2.3 )" +DEPEND="virtual/pkgconfig + ${RDEPEND}" + +REQUIRED_USE="test? ( json )" + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with json json-parsing) +} + +src_test() { + default + cd tests || die + ./test-script.sh || die +} + +src_install() { + default + gen_usr_ldscript -a nftnl + find "${D}" -name '*.la' -delete || die "Could not rm libtool files" + + if use examples; then + find examples/ -name 'Makefile*' -delete || die "Could not rm examples" + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/net-libs/openpgm/Manifest b/net-libs/openpgm/Manifest index 732db69b4598..a78137755aa4 100644 --- a/net-libs/openpgm/Manifest +++ b/net-libs/openpgm/Manifest @@ -1,2 +1,2 @@ -DIST libpgm-5.1.118~dfsg.tar.gz 1046589 SHA256 b74c11be9fe226d03e19839c6d841765955f736ae0d12db9baf1447d107e63ef SHA512 9ee358fb473431da99d9382329625cd146c2447dd6567c8b394aebc1d67d53bb4f3423a9b824180884658c34c103ed03915a4d93d3a66c78bb5947c2166c01a9 WHIRLPOOL 38cdbf203a21256da2d374a079e936ab541048fd07f206c772f29eaa380747690f06d75aa6ba8e3cb23249d7d3f21e4a8a0a4da16838a91970f53185ea4099f4 -DIST libpgm-5.2.122~dfsg.tar.gz 951536 SHA256 e296f714d7057e3cdb87f4e29b1aecb3b201b9fcb60aa19ed4eec29524f08bd8 SHA512 4eb562d2663b72cb9f4401c3319014e7b98670e1cc02b930d0ef87bb96a3e7e624f6d8a0935db9808a4987e464aaee50118ddadf4502003e0381d0e385fd9eee WHIRLPOOL 397ab4ce9ee51e791d8ced8b083ec44b282eb739de7b6a71d7d27b82a48b50a3ab3e2b83731ac0d8a065f89932947dd4a5883ae429d285c7bdea44aaeeabcdc4 +DIST openpgm-5.1.118.tar.gz 557816 SHA256 707cd52acaeb957f3b74044ea260fd03456612826d54cafb289a7400eb8032a9 SHA512 50acd102f03fb250cd027c8f4843749641c7b1a4c1dfc41b136627feb59209bc7a2bbd08b7edeac603fb820118c6683ae9377a692949608bad455fef91c97274 WHIRLPOOL b4b426879fd503d455afebc22d13310cf76a4a89ed314b2c102812b47398bcee7271f69ebd3de896fb0d38e49833d92fe9219eb8fbc868755188502ee6c45776 +DIST openpgm-5.2.122.tar.gz 583469 SHA256 acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 SHA512 f8b29fb69acb548536179262665c0cdcc8bb1510d3e970d6abebaf33e301f87fbfa7e2c46e387973d8b65470350af66b3130482269b9fbb15fe7bf98b52f6404 WHIRLPOOL acc80b7a0093250f9046ffdbfd2c42c1a9fc8a4c00c6a0b687feadad9e907d9de843ed68dd1c183a9a768538d8840cd7b1a20af7687f0809ec7c34c5823e7791 diff --git a/net-libs/openpgm/metadata.xml b/net-libs/openpgm/metadata.xml index 11f36a150e16..1b2becffa26c 100644 --- a/net-libs/openpgm/metadata.xml +++ b/net-libs/openpgm/metadata.xml @@ -2,7 +2,4 @@ - - openpgm - diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild index 9358ed15aa1e..61e8ce326ce5 100644 --- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild +++ b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,9 +9,11 @@ PYTHON_COMPAT=( python2_7 ) inherit autotools-utils python-any-r1 +MY_PV="${PV//./-}" + DESCRIPTION="Open source implementation of the Pragmatic General Multicast specification" -HOMEPAGE="https://code.google.com/p/openpgm" -SRC_URI="https://openpgm.googlecode.com/files/libpgm-${PV}~dfsg.tar.gz" +HOMEPAGE="https://github.com/steve-o/openpgm" +SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -22,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS}" -S="${WORKDIR}/libpgm-${PV}~dfsg/${PN}/pgm" +S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm" src_install() { DOCS=( "${S}"/../doc/. "${S}"/README ) diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild index c4ec5cfa3ae5..61e8ce326ce5 100644 --- a/net-libs/openpgm/openpgm-5.2.122.ebuild +++ b/net-libs/openpgm/openpgm-5.2.122.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 # $Id$ @@ -9,9 +9,11 @@ PYTHON_COMPAT=( python2_7 ) inherit autotools-utils python-any-r1 +MY_PV="${PV//./-}" + DESCRIPTION="Open source implementation of the Pragmatic General Multicast specification" -HOMEPAGE="https://code.google.com/p/openpgm" -SRC_URI="https://openpgm.googlecode.com/files/libpgm-${PV}~dfsg.tar.gz" +HOMEPAGE="https://github.com/steve-o/openpgm" +SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -22,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS}" -S="${WORKDIR}/libpgm-${PV}~dfsg/${PN}/pgm" +S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm" src_install() { DOCS=( "${S}"/../doc/. "${S}"/README ) diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild new file mode 100644 index 000000000000..7a56d8427833 --- /dev/null +++ b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="tk" + +inherit python-single-r1 user systemd toolchain-funcs autotools eutils + +DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" +HOMEPAGE="http://www.fetchmail.info/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="ssl nls kerberos hesiod tk socks" +REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="hesiod? ( net-dns/hesiod ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) + nls? ( virtual/libintl ) + !elibc_glibc? ( sys-libs/e2fsprogs-libs ) + socks? ( net-proxy/dante ) + tk? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + app-arch/xz-utils + sys-devel/flex + nls? ( sys-devel/gettext )" + +DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} + + use tk && python-single-r1_pkg_setup +} + +src_prepare() { + # don't compile during src_install + use tk && : > "${S}"/py-compile + + epatch "${FILESDIR}"/${P}-python-optional.patch + epatch "${FILESDIR}"/${P}-tests.patch + eautoreconf +} + +src_configure() { + use tk || export PYTHON=: + + econf \ + --enable-RPA \ + --enable-NTLM \ + --enable-SDPS \ + $(use_enable nls) \ + $(use_with ssl ssl "${EPREFIX}/usr") \ + $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ + $(use_with kerberos gssapi) \ + $(use_with kerberos kerberos5) \ + $(use_with hesiod) \ + $(use_with socks) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + # fetchmail's homedir (holds fetchmail's .fetchids) + keepdir /var/lib/${PN} + fowners ${PN}:${PN} /var/lib/${PN} + fperms 700 /var/lib/${PN} + + default + + dohtml *.html + + newinitd "${FILESDIR}"/fetchmail.initd fetchmail + newconfd "${FILESDIR}"/fetchmail.confd fetchmail + + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service" + systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf + + docinto contrib + local f + for f in contrib/* ; do + [ -f "${f}" ] && dodoc "${f}" + done + + use tk && python_optimize +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Please see /etc/conf.d/fetchmail if you want to adjust" + elog "the polling delay used by the fetchmail init script." + fi +} diff --git a/net-mail/fetchmail/files/fetchmail_at.service b/net-mail/fetchmail/files/fetchmail_at.service new file mode 100644 index 000000000000..7e23bf1ed2a4 --- /dev/null +++ b/net-mail/fetchmail/files/fetchmail_at.service @@ -0,0 +1,11 @@ +[Unit] +Description=A remote-mail retrieval utility for %i +After=network.target + +[Service] +User=fetchmail +ExecStart=/usr/bin/fetchmail --pidfile %t/fetchmail/fetchmail-%i.pid -i /var/lib/fetchmail/.fetchids.%i -f /etc/fetchmailrc-%i -d 60 +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch b/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch deleted file mode 100644 index bfe14311740e..000000000000 --- a/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur cgminer-4.3.5.orig/compat/Makefile.am cgminer-4.3.5/compat/Makefile.am ---- cgminer-4.3.5.orig/compat/Makefile.am 2013-11-30 16:24:45.000000000 -0500 -+++ cgminer-4.3.5/compat/Makefile.am 2014-06-10 09:50:07.363965296 -0400 -@@ -1,8 +1,5 @@ -- --SUBDIRS = jansson-2.5 -- - if WANT_USBUTILS - if WANT_STATIC_LIBUSB --SUBDIRS += libusb-1.0 -+SUBDIRS = libusb-1.0 - endif - endif -diff -Naur cgminer-4.3.5.orig/configure.ac cgminer-4.3.5/configure.ac ---- cgminer-4.3.5.orig/configure.ac 2014-06-09 21:40:35.000000000 -0400 -+++ cgminer-4.3.5/configure.ac 2014-06-10 09:49:42.306964156 -0400 -@@ -405,8 +405,7 @@ - - AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno]) - --AC_CONFIG_SUBDIRS([compat/jansson-2.5]) --JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" -+JANSSON_LIBS="-ljansson" - - PKG_PROG_PKG_CONFIG() - -diff -Naur cgminer-4.3.5.orig/Makefile.am cgminer-4.3.5/Makefile.am ---- cgminer-4.3.5.orig/Makefile.am 2014-06-09 20:29:40.000000000 -0400 -+++ cgminer-4.3.5/Makefile.am 2014-06-10 09:49:56.153964786 -0400 -@@ -1,8 +1,6 @@ - - ACLOCAL_AMFLAGS = -I m4 - --JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src -- - if WANT_USBUTILS - USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb - else -@@ -18,7 +16,7 @@ - - SUBDIRS = lib compat ccan - --cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS) -+cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(USBUTILS_CPPFLAGS) - - bin_PROGRAMS = cgminer - diff --git a/net-misc/gcap/gcap-0.1.1-r1.ebuild b/net-misc/gcap/gcap-0.1.1-r1.ebuild index 892d8b9f4405..fb123f51cb55 100644 --- a/net-misc/gcap/gcap-0.1.1-r1.ebuild +++ b/net-misc/gcap/gcap-0.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,10 +7,10 @@ EAPI=5 inherit perl-module DESCRIPTION="Command line tool for downloading Youtube closed captions" -HOMEPAGE="https://code.google.com/p/gcap/" -SRC_URI="https://gcap.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" IUSE="" diff --git a/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch b/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch deleted file mode 100644 index b1e48dcf7e3b..000000000000 --- a/net-misc/ipv6calc/files/ipv6calc-0.96.0-fix-link-order.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur ipv6calc-0.96.0.orig/ipv6calc/Makefile.in ipv6calc-0.96.0/ipv6calc/Makefile.in ---- ipv6calc-0.96.0.orig/ipv6calc/Makefile.in 2014-02-03 01:45:20.000000000 -0500 -+++ ipv6calc-0.96.0/ipv6calc/Makefile.in 2014-02-19 09:36:48.504688355 -0500 -@@ -16,7 +16,7 @@ - - INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/ - --LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@ -+LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ - - GETOBJS = @LIBOBJS@ - -diff -Naur ipv6calc-0.96.0.orig/ipv6loganon/Makefile.in ipv6calc-0.96.0/ipv6loganon/Makefile.in ---- ipv6calc-0.96.0.orig/ipv6loganon/Makefile.in 2014-02-02 14:33:21.000000000 -0500 -+++ ipv6calc-0.96.0/ipv6loganon/Makefile.in 2014-02-19 09:37:01.211687339 -0500 -@@ -18,7 +18,7 @@ - - INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ - --LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@ -+LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ - - GETOBJS = @LIBOBJS@ - -diff -Naur ipv6calc-0.96.0.orig/ipv6logconv/Makefile.in ipv6calc-0.96.0/ipv6logconv/Makefile.in ---- ipv6calc-0.96.0.orig/ipv6logconv/Makefile.in 2014-02-02 14:33:21.000000000 -0500 -+++ ipv6calc-0.96.0/ipv6logconv/Makefile.in 2014-02-19 09:36:32.225689657 -0500 -@@ -18,7 +18,7 @@ - - INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/ - --LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@ -+LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ - - GETOBJS = @LIBOBJS@ - -diff -Naur ipv6calc-0.96.0.orig/ipv6logstats/Makefile.in ipv6calc-0.96.0/ipv6logstats/Makefile.in ---- ipv6calc-0.96.0.orig/ipv6logstats/Makefile.in 2014-02-02 14:33:21.000000000 -0500 -+++ ipv6calc-0.96.0/ipv6logstats/Makefile.in 2014-02-19 09:37:15.840686169 -0500 -@@ -18,7 +18,7 @@ - - INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE@ @GEOIP_INCLUDE@ -I../ -I../lib/ -I../databases/lib/ - --LIBS = @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ @IPV6CALC_LIB@ -+LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB@ @GEOIP_LIB@ @DYNLOAD_LIB@ - - GETOBJS = @LIBOBJS@ - diff --git a/net-misc/openssh/openssh-7.3_p1-r7.ebuild b/net-misc/openssh/openssh-7.3_p1-r7.ebuild index 0f8d7742cd7c..6c9b32426990 100644 --- a/net-misc/openssh/openssh-7.3_p1-r7.ebuild +++ b/net-misc/openssh/openssh-7.3_p1-r7.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 # $Id$ @@ -76,7 +76,7 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${PARCH} -pkg_setup() { +pkg_pretend() { # this sucks, but i'd rather have people unable to `emerge -u openssh` # than not be able to log in to their server any more maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } diff --git a/net-misc/openssh/openssh-7.3_p1-r8.ebuild b/net-misc/openssh/openssh-7.3_p1-r8.ebuild index f886839d5865..164f4e1375b8 100644 --- a/net-misc/openssh/openssh-7.3_p1-r8.ebuild +++ b/net-misc/openssh/openssh-7.3_p1-r8.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 # $Id$ @@ -71,7 +71,7 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${PARCH} -pkg_setup() { +pkg_pretend() { # this sucks, but i'd rather have people unable to `emerge -u openssh` # than not be able to log in to their server any more maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } diff --git a/net-misc/openssh/openssh-7.4_p1.ebuild b/net-misc/openssh/openssh-7.4_p1.ebuild index 110f1bfb4700..4f6efad0cad3 100644 --- a/net-misc/openssh/openssh-7.4_p1.ebuild +++ b/net-misc/openssh/openssh-7.4_p1.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" @@ -70,7 +70,7 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${PARCH} -pkg_setup() { +pkg_pretend() { # this sucks, but i'd rather have people unable to `emerge -u openssh` # than not be able to log in to their server any more maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } diff --git a/net-misc/tor/files/tor.initd-r7 b/net-misc/tor/files/tor.initd-r7 deleted file mode 100644 index 3d679c195e4c..000000000000 --- a/net-misc/tor/files/tor.initd-r7 +++ /dev/null @@ -1,84 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -PIDFILE=/var/run/tor/tor.pid -CONFFILE=/etc/tor/torrc -GRACEFUL_TIMEOUT=${GRACEFUL_TIMEOUT:-60} - -# See bug #523552, and https://trac.torproject.org/projects/tor/ticket/5525 -# Graceful = wait 30 secs or so until all connections are properly closed. -extra_commands="checkconfig" -extra_started_commands="graceful gracefulstop reload" -description="Anonymizing overlay network for TCP" -description_checkconfig="Check for valid config file." -description_reload="Reload the configuration." -description_graceful="Gracefully restart." -description_gracefulstop="Gracefully stop." - -depend() { - need net -} - -checkconfig() { - # first check that it exists - if [ ! -f ${CONFFILE} ] ; then - eerror "You need to setup ${CONFFILE} first" - eerror "Example is in ${CONFFILE}.sample" - return 1 - fi - - # now verify whether the configuration is valid - /usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - einfo "Tor configuration (${CONFFILE}) is valid." - return 0 - else - eerror "Tor configuration (${CONFFILE}) not valid." - /usr/bin/tor --verify-config -f ${CONFFILE} - return 1 - fi -} - -start() { - checkconfig || return 1 - checkpath -d -m 0755 -o tor:tor /var/run/tor - ebegin "Starting Tor" - HOME=/var/lib/tor - start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Tor" - start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" - eend $? -} - -graceful() { - gracefulstop - start - eend $? -} - -gracefulstop() { - local rc=0 - ebegin "Gracefully stopping Tor" - ebegin "This can take up to ${GRACEFUL_TIMEOUT} seconds" - start-stop-daemon -P --stop --signal INT -R ${GRACEFUL_TIMEOUT} --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}" - rc=$? - eend "done" - eend $rc -} - -reload() { - if [ ! -f ${PIDFILE} ]; then - eerror "${SVCNAME} isn't running" - return 1 - fi - checkconfig || return 1 - ebegin "Reloading Tor configuration" - start-stop-daemon --signal HUP --pidfile ${PIDFILE} - eend $? -} diff --git a/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch deleted file mode 100644 index 5eaaba9a5788..000000000000 --- a/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/key.cpp b/src/key.cpp -index 75114c6..7fcb17d 100644 ---- a/src/key.cpp -+++ b/src/key.cpp -@@ -376,11 +376,23 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector& v - - bool CKey::Verify(uint256 hash, const std::vector& vchSig) - { -- // -1 = error, 0 = bad sig, 1 = good -- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) -+ if (vchSig.empty()) - return false; - -- return true; -+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first. -+ unsigned char *norm_der = NULL; -+ ECDSA_SIG *norm_sig = ECDSA_SIG_new(); -+ const unsigned char* sigptr = &vchSig[0]; -+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()); -+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der); -+ ECDSA_SIG_free(norm_sig); -+ if (derlen <= 0) -+ return false; -+ -+ // -1 = error, 0 = bad sig, 1 = good -+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1; -+ OPENSSL_free(norm_der); -+ return ret; - } - - bool CKey::VerifyCompact(uint256 hash, const std::vector& vchSig) diff --git a/net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch b/net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch deleted file mode 100644 index 92f803f4e4f1..000000000000 --- a/net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro -index cf80986..520b5df 100644 ---- a/bitcoin-qt.pro -+++ b/bitcoin-qt.pro -@@ -4,7 +4,7 @@ macx:TARGET = "Bitcoin-Qt" - VERSION = 0.8.0 - INCLUDEPATH += src src/json src/qt - QT += network --DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE -+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV - CONFIG += no_include_pwd - CONFIG += thread - -@@ -98,25 +98,29 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { - QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets - } - -+contains(USE_SYSTEM_LEVELDB, 1) { -+ LIBS += -lleveldb -+} else { - INCLUDEPATH += src/leveldb/include src/leveldb/helpers --LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a -+LIBS += $$PWD/src/leveldb/libleveldb.a - !win32 { - # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a - } else { - # make an educated guess about what the ranlib command is called - isEmpty(QMAKE_RANLIB) { - QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) - } - LIBS += -lshlwapi -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a - } - genleveldb.target = $$PWD/src/leveldb/libleveldb.a - genleveldb.depends = FORCE - PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a - QMAKE_EXTRA_TARGETS += genleveldb -+} - # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. --QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean -+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true - - # regenerate src/build.h - !win32|contains(USE_BUILD_INFO, 1) { -diff --git a/src/leveldb.cpp b/src/leveldb.cpp -index b41764f..f71e801 100644 ---- a/src/leveldb.cpp -+++ b/src/leveldb.cpp -@@ -8,7 +8,9 @@ - #include - #include - #include -+#ifndef LEVELDB_WITHOUT_MEMENV - #include -+#endif - - #include - -@@ -42,8 +44,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool - options = GetOptions(nCacheSize); - options.create_if_missing = true; - if (fMemory) { -+#ifndef LEVELDB_WITHOUT_MEMENV - penv = leveldb::NewMemEnv(leveldb::Env::Default()); - options.env = penv; -+#else -+ throw std::runtime_error("CLevelDB(): compiled without memenv support"); -+#endif - } else { - if (fWipe) { - printf("Wiping LevelDB in %s\n", path.string().c_str()); -diff --git a/src/makefile.unix b/src/makefile.unix -index 081edaf..1735b89 100644 ---- a/src/makefile.unix -+++ b/src/makefile.unix -@@ -104,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para - # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. - xLDFLAGS=$(LDHARDENING) $(LDFLAGS) - --OBJS= \ -- leveldb/libleveldb.a \ -+BASEOBJS := \ - obj/alert.o \ - obj/version.o \ - obj/checkpoints.o \ -@@ -114,7 +113,6 @@ OBJS= \ - obj/crypter.o \ - obj/key.o \ - obj/db.o \ -- obj/init.o \ - obj/keystore.o \ - obj/main.o \ - obj/net.o \ -@@ -134,24 +132,43 @@ OBJS= \ - obj/hash.o \ - obj/bloom.o \ - obj/noui.o \ -- obj/leveldb.o \ - obj/txdb.o - -+OBJS := \ -+ obj/leveldb.o \ -+ obj/init.o \ -+ $(BASEOBJS) -+ -+TESTOBJS := \ -+ obj-test/leveldb.o \ -+ $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \ -+ $(BASEOBJS) -+ - - all: bitcoind - - test check: test_bitcoin FORCE - ./test_bitcoin - -+ifdef USE_SYSTEM_LEVELDB -+ LIBS += -lleveldb -+ TESTLIBS += -lmemenv -+else - # - # LevelDB support - # - MAKEOVERRIDES = --LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a -+LIBS += $(CURDIR)/leveldb/libleveldb.a -+TESTLIBS += $(CURDIR)/leveldb/libmemenv.a - DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) - DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) - leveldb/libleveldb.a: -- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. -+ @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd .. -+leveldb/libmemenv.a: -+ @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd .. -+OBJS += leveldb/libleveldb.a -+TESTOBJS += leveldb/libmemenv.a -+endif - - # auto-generated dependencies: - -include obj/*.P -@@ -162,26 +179,28 @@ obj/build.h: FORCE - version.cpp: obj/build.h - DEFS += -DHAVE_BUILD_INFO - --obj/%.o: %.cpp -- $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+P_TO_D = \ - @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -+ sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ - rm -f $(@:%.o=%.d) - --bitcoind: $(OBJS:obj/%=obj/%) -- $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) -+obj/%.o: %.cpp -+ $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -+bitcoind: $(OBJS) -+ $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) - - obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -- @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -- rm -f $(@:%.o=%.d) -+ $(P_TO_D) -+ -+obj-test/leveldb.o: leveldb.cpp -+ $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) -+test_bitcoin: $(TESTOBJS) - $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) - - clean: diff --git a/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch deleted file mode 100644 index 80f64887425b..000000000000 --- a/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/key.cpp b/src/key.cpp -index 5b261bb..a845ba1 100644 ---- a/src/key.cpp -+++ b/src/key.cpp -@@ -227,10 +227,23 @@ public: - } - - bool Verify(const uint256 &hash, const std::vector& vchSig) { -- // -1 = error, 0 = bad sig, 1 = good -- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) -+ if (vchSig.empty()) - return false; -- return true; -+ -+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first. -+ unsigned char *norm_der = NULL; -+ ECDSA_SIG *norm_sig = ECDSA_SIG_new(); -+ const unsigned char* sigptr = &vchSig[0]; -+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()); -+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der); -+ ECDSA_SIG_free(norm_sig); -+ if (derlen <= 0) -+ return false; -+ -+ // -1 = error, 0 = bad sig, 1 = good -+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1; -+ OPENSSL_free(norm_der); -+ return ret; - } - - bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) { diff --git a/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch b/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch deleted file mode 100644 index 60e9f2b20941..000000000000 --- a/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb) -Author: Luke Dashjr -Date: Mon Sep 9 03:06:17 2013 +0000 - - configure: Add unsupported --with-system-leveldb configure flag - -diff --git a/configure.ac b/configure.ac -index 3ed4549..5a5852d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include ], - [ AC_MSG_RESULT(no)] - ) - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ LIBLEVELDB=-lleveldb -+ LIBMEMENV=-lmemenv -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) diff --git a/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch b/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch deleted file mode 100644 index 35194662ecd2..000000000000 --- a/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/script.cpp b/src/script.cpp -index 24bbbad..a60d8b6 100644 ---- a/src/script.cpp -+++ b/src/script.cpp -@@ -1870,6 +1870,7 @@ bool fIsBareMultisigStd = false; - - const char *CScript::IsBlacklisted() const - { -+ return false; - if (this->size() >= 7 && this->at(0) == OP_DUP) - { - // pay-to-pubkeyhash diff --git a/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch b/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch deleted file mode 100644 index 77ed10675e30..000000000000 --- a/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6784521..3598bab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon], - - BITCOIN_QT_INIT - -+PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes]) -+if test "x$use_libsecp256k1" = "xyes"; then -+ AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1]) -+fi -+ - if test x$use_pkgconfig = xyes; then - - if test x"$PKG_CONFIG" = "x"; then -@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" - unset PKG_CONFIG_LIBDIR - PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" - --ac_configure_args="${ac_configure_args} --disable-shared --with-pic" --AC_CONFIG_SUBDIRS([src/secp256k1]) -- - AC_OUTPUT - - dnl Taken from https://wiki.debian.org/RpathIssue -diff --git a/src/Makefile.am b/src/Makefile.am -index 0d45203..3a44a16 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,3 @@ --DIST_SUBDIRS = secp256k1 - AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) - - -@@ -20,7 +19,7 @@ endif - BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config - BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - --BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) - - LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a - LIBBITCOINQT=qt/libbitcoinqt.a --LIBSECP256K1=secp256k1/libsecp256k1.la -- --$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) -- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+LIBSECP256K1=$(libsecp256k1_LIBS) - - # Make is not made aware of per-object dependencies to avoid limiting building parallelization - # But to build the less dependent modules first, we manually select their order here: -@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS) - libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS) - libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL - if USE_LIBSECP256K1 --libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la -+libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1) - endif - endif - -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 5fd2afe..014092a 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE - bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - --check-local: -- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -- - %.json.h: %.json - @$(MKDIR_P) $(@D) - @echo "namespace json_tests{" > $@ diff --git a/net-p2p/bitcoin-qt/files/9999-syslibs.patch b/net-p2p/bitcoin-qt/files/9999-syslibs.patch deleted file mode 100644 index c594c54634ed..000000000000 --- a/net-p2p/bitcoin-qt/files/9999-syslibs.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 -index 66f106c..5f0a3b1 100644 ---- a/build-aux/m4/bitcoin_subdir_to_include.m4 -+++ b/build-aux/m4/bitcoin_subdir_to_include.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ - AC_MSG_RESULT([default]) - else - echo "#include <$2$3.h>" >conftest.cpp -- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] -+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) - AC_MSG_RESULT([${newinclpath}]) - if test "x${newinclpath}" != "x"; then - eval "$1=\"\$$1\"' -I${newinclpath}'" -diff --git a/configure.ac b/configure.ac -index 939dfea..6c9acb3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) - -+AC_ARG_ENABLE([util-cli], -+ [AS_HELP_STRING([--enable-util-cli], -+ [build bitcoin-cli])], -+ [build_bitcoin_cli=$enableval], -+ [build_bitcoin_cli=$build_bitcoin_utils]) -+ -+AC_ARG_ENABLE([util-tx], -+ [AS_HELP_STRING([--enable-util-tx], -+ [build bitcoin-tx])], -+ [build_bitcoin_tx=$enableval], -+ [build_bitcoin_tx=$build_bitcoin_utils]) -+ - AC_ARG_WITH([libs], - [AS_HELP_STRING([--with-libs], - [build libraries (default=yes)])], -@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then - [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) - fi - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ TEMP_LIBS="$LIBS" -+ LIBS="$LIBS $LIBLEVELDB" -+ AC_CHECK_LIB([memenv],[main],[ -+ LIBMEMENV=-lmemenv -+ ],[ -+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ LIBS="$TEMP_LIBS" -+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ -+ AC_MSG_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) - -+dnl Check for libsecp256k1, only if explicitly requested -+AC_ARG_WITH([system-libsecp256k1], -+ [AS_HELP_STRING([--with-system-libsecp256k1], -+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_libsecp256k1=$withval], -+ [system_libsecp256k1=no] -+) -+if test x$system_libsecp256k1 != xno; then -+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+else -+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' -+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' -+fi -+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) -+AC_SUBST(libsecp256k1_CFLAGS) -+AC_SUBST(libsecp256k1_LIBS) -+ - if test x$enable_wallet != xno; then - dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 -@@ -558,7 +621,7 @@ BITCOIN_QT_INIT - dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) - --if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then - use_boost=no - else - use_boost=yes -@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) - AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) - AC_MSG_RESULT($build_bitcoind) - --AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) --AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) --AC_MSG_RESULT($build_bitcoin_utils) -+AC_MSG_CHECKING([whether to build bitcoin-cli]) -+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) -+AC_MSG_RESULT($build_bitcoin_cli) -+ -+AC_MSG_CHECKING([whether to build bitcoin-tx]) -+AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) -+AC_MSG_RESULT($build_bitcoin_tx) - - AC_MSG_CHECKING([whether to build libraries]) - AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -975,7 +1042,7 @@ else - AC_MSG_RESULT([no]) - fi - --if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then - AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) - fi - -@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then - AC_CONFIG_SUBDIRS([src/univalue]) - fi - -+if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" - AC_CONFIG_SUBDIRS([src/secp256k1]) -+fi - - AC_OUTPUT - -diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py -index 7649c11..978419b 100755 ---- a/qa/pull-tester/rpc-tests.py -+++ b/qa/pull-tester/rpc-tests.py -@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): - ENABLE_WALLET=0 - if not vars().has_key('ENABLE_BITCOIND'): - ENABLE_BITCOIND=0 --if not vars().has_key('ENABLE_UTILS'): -- ENABLE_UTILS=0 -+if not vars().has_key('ENABLE_CLI'): -+ ENABLE_CLI=0 - if not vars().has_key('ENABLE_ZMQ'): - ENABLE_ZMQ=0 - -@@ -141,7 +141,7 @@ def runtests(): - coverage = RPCCoverage() - print("Initializing coverage directory at %s\n" % coverage.dir) - -- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): -+ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): - rpcTestDir = buildDir + '/qa/rpc-tests/' - run_extended = '-extended' in opts - cov_flag = coverage.flag if coverage else '' -@@ -187,7 +187,7 @@ def runtests(): - coverage.cleanup() - - else: -- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" -+ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" - - - class RPCCoverage(object): -diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in -index 937b423..71a917c 100644 ---- a/qa/pull-tester/tests_config.py.in -+++ b/qa/pull-tester/tests_config.py.in -@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" - - # These will turn into comments if they were disabled when configuring. - @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 --@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 -+@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 - @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 - @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index fa7a78f..cc2f2ca 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -31,7 +31,7 @@ endif - BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config - BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - --BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) - BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) - - LIBBITCOIN_SERVER=libbitcoin_server.a -@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a - LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOINQT=qt/libbitcoinqt.a -+if EMBEDDED_LIBSECP256K1 - LIBSECP256K1=secp256k1/libsecp256k1.la -+else -+LIBSECP256K1=$(libsecp256k1_LIBS) -+endif - -+if EMBEDDED_LIBSECP256K1 - $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+endif - - # Make is not made aware of per-object dependencies to avoid limiting building parallelization - # But to build the less dependent modules first, we manually select their order here: -@@ -79,8 +85,11 @@ if BUILD_BITCOIND - bin_PROGRAMS += bitcoind - endif - --if BUILD_BITCOIN_UTILS -- bin_PROGRAMS += bitcoin-cli bitcoin-tx -+if BUILD_BITCOIN_CLI -+ bin_PROGRAMS += bitcoin-cli -+endif -+if BUILD_BITCOIN_TX -+ bin_PROGRAMS += bitcoin-tx - endif - - .PHONY: FORCE check-symbols check-security -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 6ef6a69..1b6e759 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE - check-local: - @echo "Running test/bitcoin-util-test.py..." - $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py -+if EMBEDDED_LIBSECP256K1 - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -+endif - if EMBEDDED_UNIVALUE - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check - endif diff --git a/net-p2p/bitcoind/files/0.8-openssl-101k.patch b/net-p2p/bitcoind/files/0.8-openssl-101k.patch deleted file mode 100644 index 5eaaba9a5788..000000000000 --- a/net-p2p/bitcoind/files/0.8-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/key.cpp b/src/key.cpp -index 75114c6..7fcb17d 100644 ---- a/src/key.cpp -+++ b/src/key.cpp -@@ -376,11 +376,23 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector& v - - bool CKey::Verify(uint256 hash, const std::vector& vchSig) - { -- // -1 = error, 0 = bad sig, 1 = good -- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) -+ if (vchSig.empty()) - return false; - -- return true; -+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first. -+ unsigned char *norm_der = NULL; -+ ECDSA_SIG *norm_sig = ECDSA_SIG_new(); -+ const unsigned char* sigptr = &vchSig[0]; -+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()); -+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der); -+ ECDSA_SIG_free(norm_sig); -+ if (derlen <= 0) -+ return false; -+ -+ // -1 = error, 0 = bad sig, 1 = good -+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1; -+ OPENSSL_free(norm_der); -+ return ret; - } - - bool CKey::VerifyCompact(uint256 hash, const std::vector& vchSig) diff --git a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch b/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch deleted file mode 100644 index 2b9ab1a6d67e..000000000000 --- a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro -index cf80986..520b5df 100644 ---- a/bitcoin-qt.pro -+++ b/bitcoin-qt.pro -@@ -4,7 +4,7 @@ macx:TARGET = "Bitcoin-Qt" - VERSION = 0.8.0 - INCLUDEPATH += src src/json src/qt - QT += network --DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE -+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV - CONFIG += no_include_pwd - CONFIG += thread - -@@ -98,25 +98,29 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { - QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets - } - -+contains(USE_SYSTEM_LEVELDB, 1) { -+ LIBS += -lleveldb -+} else { - INCLUDEPATH += src/leveldb/include src/leveldb/helpers --LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a -+LIBS += $$PWD/src/leveldb/libleveldb.a - !win32 { - # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a - } else { - # make an educated guess about what the ranlib command is called - isEmpty(QMAKE_RANLIB) { - QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) - } - LIBS += -lshlwapi -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a - } - genleveldb.target = $$PWD/src/leveldb/libleveldb.a - genleveldb.depends = FORCE - PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a - QMAKE_EXTRA_TARGETS += genleveldb -+} - # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. --QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean -+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true - - # regenerate src/build.h - !win32|contains(USE_BUILD_INFO, 1) { -diff --git a/src/leveldb.cpp b/src/leveldb.cpp -index b41764f..30c524d 100644 ---- a/src/leveldb.cpp -+++ b/src/leveldb.cpp -@@ -8,7 +8,9 @@ - #include - #include - #include --#include -+#ifndef LEVELDB_WITHOUT_MEMENV -+#include -+#endif - - #include - -@@ -42,8 +44,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool - options = GetOptions(nCacheSize); - options.create_if_missing = true; - if (fMemory) { -+#ifndef LEVELDB_WITHOUT_MEMENV - penv = leveldb::NewMemEnv(leveldb::Env::Default()); - options.env = penv; -+#else -+ throw std::runtime_error("CLevelDB(): compiled without memenv support"); -+#endif - } else { - if (fWipe) { - printf("Wiping LevelDB in %s\n", path.string().c_str()); -diff --git a/src/makefile.unix b/src/makefile.unix -index 081edaf..27f2199 100644 ---- a/src/makefile.unix -+++ b/src/makefile.unix -@@ -104,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para - # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. - xLDFLAGS=$(LDHARDENING) $(LDFLAGS) - --OBJS= \ -- leveldb/libleveldb.a \ -+BASEOBJS := \ - obj/alert.o \ - obj/version.o \ - obj/checkpoints.o \ -@@ -114,7 +113,6 @@ OBJS= \ - obj/crypter.o \ - obj/key.o \ - obj/db.o \ -- obj/init.o \ - obj/keystore.o \ - obj/main.o \ - obj/net.o \ -@@ -134,24 +132,43 @@ OBJS= \ - obj/hash.o \ - obj/bloom.o \ - obj/noui.o \ -- obj/leveldb.o \ - obj/txdb.o - -+OBJS := \ -+ obj/leveldb.o \ -+ obj/init.o \ -+ $(BASEOBJS) -+ -+TESTOBJS := \ -+ obj-test/leveldb.o \ -+ $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \ -+ $(BASEOBJS) -+ - - all: bitcoind - - test check: test_bitcoin FORCE - ./test_bitcoin - -+ifdef USE_SYSTEM_LEVELDB -+ LIBS += -lleveldb -+ TESTLIBS += -lmemenv -+else - # - # LevelDB support - # - MAKEOVERRIDES = --LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a -+LIBS += $(CURDIR)/leveldb/libleveldb.a -+TESTLIBS += $(CURDIR)/leveldb/libmemenv.a - DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) --DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) -+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers/memenv) - leveldb/libleveldb.a: -- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. -+ @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd .. -+leveldb/libmemenv.a: -+ @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd .. -+OBJS += leveldb/libleveldb.a -+TESTOBJS += leveldb/libmemenv.a -+endif - - # auto-generated dependencies: - -include obj/*.P -@@ -162,26 +179,28 @@ obj/build.h: FORCE - version.cpp: obj/build.h - DEFS += -DHAVE_BUILD_INFO - --obj/%.o: %.cpp -- $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+P_TO_D = \ - @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -+ sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ - rm -f $(@:%.o=%.d) - --bitcoind: $(OBJS:obj/%=obj/%) -- $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) -+obj/%.o: %.cpp -+ $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -+bitcoind: $(OBJS) -+ $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) - - obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -- @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -- rm -f $(@:%.o=%.d) -+ $(P_TO_D) -+ -+obj-test/leveldb.o: leveldb.cpp -+ $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) -+test_bitcoin: $(TESTOBJS) - $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) - - clean: diff --git a/net-p2p/bitcoind/files/0.9-openssl-101k.patch b/net-p2p/bitcoind/files/0.9-openssl-101k.patch deleted file mode 100644 index 80f64887425b..000000000000 --- a/net-p2p/bitcoind/files/0.9-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/key.cpp b/src/key.cpp -index 5b261bb..a845ba1 100644 ---- a/src/key.cpp -+++ b/src/key.cpp -@@ -227,10 +227,23 @@ public: - } - - bool Verify(const uint256 &hash, const std::vector& vchSig) { -- // -1 = error, 0 = bad sig, 1 = good -- if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) -+ if (vchSig.empty()) - return false; -- return true; -+ -+ // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first. -+ unsigned char *norm_der = NULL; -+ ECDSA_SIG *norm_sig = ECDSA_SIG_new(); -+ const unsigned char* sigptr = &vchSig[0]; -+ d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size()); -+ int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der); -+ ECDSA_SIG_free(norm_sig); -+ if (derlen <= 0) -+ return false; -+ -+ // -1 = error, 0 = bad sig, 1 = good -+ bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1; -+ OPENSSL_free(norm_der); -+ return ret; - } - - bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) { diff --git a/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch b/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch deleted file mode 100644 index 60e9f2b20941..000000000000 --- a/net-p2p/bitcoind/files/0.9.0-sys_leveldb.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb) -Author: Luke Dashjr -Date: Mon Sep 9 03:06:17 2013 +0000 - - configure: Add unsupported --with-system-leveldb configure flag - -diff --git a/configure.ac b/configure.ac -index 3ed4549..5a5852d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include ], - [ AC_MSG_RESULT(no)] - ) - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ LIBLEVELDB=-lleveldb -+ LIBMEMENV=-lmemenv -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) diff --git a/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch b/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch deleted file mode 100644 index 35194662ecd2..000000000000 --- a/net-p2p/bitcoind/files/0.9.x-ljr_noblacklist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/script.cpp b/src/script.cpp -index 24bbbad..a60d8b6 100644 ---- a/src/script.cpp -+++ b/src/script.cpp -@@ -1870,6 +1870,7 @@ bool fIsBareMultisigStd = false; - - const char *CScript::IsBlacklisted() const - { -+ return false; - if (this->size() >= 7 && this->at(0) == OP_DUP) - { - // pay-to-pubkeyhash diff --git a/net-p2p/bitcoind/files/9999-syslibs.patch b/net-p2p/bitcoind/files/9999-syslibs.patch deleted file mode 100644 index c594c54634ed..000000000000 --- a/net-p2p/bitcoind/files/9999-syslibs.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 -index 66f106c..5f0a3b1 100644 ---- a/build-aux/m4/bitcoin_subdir_to_include.m4 -+++ b/build-aux/m4/bitcoin_subdir_to_include.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ - AC_MSG_RESULT([default]) - else - echo "#include <$2$3.h>" >conftest.cpp -- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] -+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) - AC_MSG_RESULT([${newinclpath}]) - if test "x${newinclpath}" != "x"; then - eval "$1=\"\$$1\"' -I${newinclpath}'" -diff --git a/configure.ac b/configure.ac -index 939dfea..6c9acb3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) - -+AC_ARG_ENABLE([util-cli], -+ [AS_HELP_STRING([--enable-util-cli], -+ [build bitcoin-cli])], -+ [build_bitcoin_cli=$enableval], -+ [build_bitcoin_cli=$build_bitcoin_utils]) -+ -+AC_ARG_ENABLE([util-tx], -+ [AS_HELP_STRING([--enable-util-tx], -+ [build bitcoin-tx])], -+ [build_bitcoin_tx=$enableval], -+ [build_bitcoin_tx=$build_bitcoin_utils]) -+ - AC_ARG_WITH([libs], - [AS_HELP_STRING([--with-libs], - [build libraries (default=yes)])], -@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then - [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) - fi - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ TEMP_LIBS="$LIBS" -+ LIBS="$LIBS $LIBLEVELDB" -+ AC_CHECK_LIB([memenv],[main],[ -+ LIBMEMENV=-lmemenv -+ ],[ -+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ LIBS="$TEMP_LIBS" -+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ -+ AC_MSG_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) - -+dnl Check for libsecp256k1, only if explicitly requested -+AC_ARG_WITH([system-libsecp256k1], -+ [AS_HELP_STRING([--with-system-libsecp256k1], -+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_libsecp256k1=$withval], -+ [system_libsecp256k1=no] -+) -+if test x$system_libsecp256k1 != xno; then -+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+else -+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' -+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' -+fi -+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) -+AC_SUBST(libsecp256k1_CFLAGS) -+AC_SUBST(libsecp256k1_LIBS) -+ - if test x$enable_wallet != xno; then - dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 -@@ -558,7 +621,7 @@ BITCOIN_QT_INIT - dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) - --if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then - use_boost=no - else - use_boost=yes -@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) - AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) - AC_MSG_RESULT($build_bitcoind) - --AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) --AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) --AC_MSG_RESULT($build_bitcoin_utils) -+AC_MSG_CHECKING([whether to build bitcoin-cli]) -+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) -+AC_MSG_RESULT($build_bitcoin_cli) -+ -+AC_MSG_CHECKING([whether to build bitcoin-tx]) -+AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) -+AC_MSG_RESULT($build_bitcoin_tx) - - AC_MSG_CHECKING([whether to build libraries]) - AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -975,7 +1042,7 @@ else - AC_MSG_RESULT([no]) - fi - --if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then - AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) - fi - -@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then - AC_CONFIG_SUBDIRS([src/univalue]) - fi - -+if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" - AC_CONFIG_SUBDIRS([src/secp256k1]) -+fi - - AC_OUTPUT - -diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py -index 7649c11..978419b 100755 ---- a/qa/pull-tester/rpc-tests.py -+++ b/qa/pull-tester/rpc-tests.py -@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): - ENABLE_WALLET=0 - if not vars().has_key('ENABLE_BITCOIND'): - ENABLE_BITCOIND=0 --if not vars().has_key('ENABLE_UTILS'): -- ENABLE_UTILS=0 -+if not vars().has_key('ENABLE_CLI'): -+ ENABLE_CLI=0 - if not vars().has_key('ENABLE_ZMQ'): - ENABLE_ZMQ=0 - -@@ -141,7 +141,7 @@ def runtests(): - coverage = RPCCoverage() - print("Initializing coverage directory at %s\n" % coverage.dir) - -- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): -+ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): - rpcTestDir = buildDir + '/qa/rpc-tests/' - run_extended = '-extended' in opts - cov_flag = coverage.flag if coverage else '' -@@ -187,7 +187,7 @@ def runtests(): - coverage.cleanup() - - else: -- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" -+ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" - - - class RPCCoverage(object): -diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in -index 937b423..71a917c 100644 ---- a/qa/pull-tester/tests_config.py.in -+++ b/qa/pull-tester/tests_config.py.in -@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" - - # These will turn into comments if they were disabled when configuring. - @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 --@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 -+@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 - @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 - @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index fa7a78f..cc2f2ca 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -31,7 +31,7 @@ endif - BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config - BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) - --BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include -+BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) - BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) - - LIBBITCOIN_SERVER=libbitcoin_server.a -@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a - LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOINQT=qt/libbitcoinqt.a -+if EMBEDDED_LIBSECP256K1 - LIBSECP256K1=secp256k1/libsecp256k1.la -+else -+LIBSECP256K1=$(libsecp256k1_LIBS) -+endif - -+if EMBEDDED_LIBSECP256K1 - $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+endif - - # Make is not made aware of per-object dependencies to avoid limiting building parallelization - # But to build the less dependent modules first, we manually select their order here: -@@ -79,8 +85,11 @@ if BUILD_BITCOIND - bin_PROGRAMS += bitcoind - endif - --if BUILD_BITCOIN_UTILS -- bin_PROGRAMS += bitcoin-cli bitcoin-tx -+if BUILD_BITCOIN_CLI -+ bin_PROGRAMS += bitcoin-cli -+endif -+if BUILD_BITCOIN_TX -+ bin_PROGRAMS += bitcoin-tx - endif - - .PHONY: FORCE check-symbols check-security -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 6ef6a69..1b6e759 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE - check-local: - @echo "Running test/bitcoin-util-test.py..." - $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py -+if EMBEDDED_LIBSECP256K1 - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -+endif - if EMBEDDED_UNIVALUE - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check - endif diff --git a/net-p2p/bitcoind/files/bitcoin.confd b/net-p2p/bitcoind/files/bitcoin.confd deleted file mode 100644 index 7c0868c3f535..000000000000 --- a/net-p2p/bitcoind/files/bitcoin.confd +++ /dev/null @@ -1,10 +0,0 @@ -# Config file for /etc/init.d/bitcoin - -# owner of bitcoind process (don't change, must be existing) -BITCOIN_USER="bitcoin" - -# See http://www.bitcoin.org/smf/index.php?topic=1063 -BITCOIN_OPTS="${BITCOIN_OPTS}" - -# nice level -NICELEVEL="19" diff --git a/net-p2p/bitcoind/files/bitcoin.initd-r1 b/net-p2p/bitcoind/files/bitcoin.initd-r1 deleted file mode 100644 index 56a4b1c9d25e..000000000000 --- a/net-p2p/bitcoind/files/bitcoin.initd-r1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -vardir="/var/lib/bitcoin" -conffile="${vardir}/.bitcoin/bitcoin.conf" -bitcoind_user="${BITCOIN_USER:-nobody:nobody}" - -description="Bitcoin crypto-currency wallet for automated services" -pidfile="/run/${SVCNAME}.pid" -command="/usr/bin/bitcoind" -command_args="${BITCOIN_OPTS}" -command_background="true" -start_stop_daemon_args="-u ${bitcoind_user} -e HOME=${vardir} -N ${NICELEVEL:-0} -w 2000" - -depend() { - need net -} - -start_pre() { - checkpath -f -o ${bitcoind_user} -m 0400 ${conffile} || return 1 - - if ! grep -q '^rpcpassword=' "${conffile}"; then - eerror "Please edit `readlink -f ${conffile}`" - eerror "There must be at least a line assigning rpcpassword=something-secure" - return 1 - fi -} diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest index 21879c70946c..f1bef6ef7336 100644 --- a/net-p2p/gtk-gnutella/Manifest +++ b/net-p2p/gtk-gnutella/Manifest @@ -1,3 +1,2 @@ DIST gtk-gnutella-1.1.10.tar.bz2 19827825 SHA256 95e2a030124e7cc05e19e351eebc16f40f4520381b7bb306e8b940ed4e2e6409 SHA512 33afdd8a98ff57f4fb5b91ba365921b8dbf72cc04431f95ff0d8162d37213861ea796f3b43d4fec257939d7a42822ab3e1ed80d49c9b93a1626024ee7ca7a13a WHIRLPOOL bbef0a0c2a05a8268e06a08d9c1f02136b81afb9a8b2a845242960a9abb88c6314072f793203c854d50b7493fa356cf234cadcde8bac4c2c0458955c279a5ec0 DIST gtk-gnutella-1.1.11.tar.bz2 19966423 SHA256 e46ffa3905831828f867709aa346cd88576075bd1299ef396962ad860e2589d5 SHA512 87d2d66b555180c0db7c360106377133b9e1f8ad8d28fc0f9a38498f3b4502a817650f9683cf92919b7d3a1b3602f7136143d2f1c920e10727576c703e233d07 WHIRLPOOL d70a4dd39ac25856fd3fbe4b4d4f2447f1ed8448e672fb64ab1e66bcc59a2e36b30112db0123aed1b52a6fa00c274d17ac47bb2ac9a775182516558e9d38dd08 -DIST gtk-gnutella-1.1.8.tar.bz2 19690815 SHA256 271aadb6da4a807dd98094d7f2fa42a2215e273cdc799c188e68594896586079 SHA512 f1b0130a660d41690fb0555eae157c35c73bdd541ab7cce43acd3a0cc4fcb0fb00dc51947065c227df516062af944cc7267437c09f67bfb0dfa9b3dbf96bce2f WHIRLPOOL 568651daa74fb9b71f228a25d6f8086ec26646c521f8161ae85e5524d22c42d618017252dabe77d87468a4c3280754c1279a6d2c526cd7f805177e18e8614f16 diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.8.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.8.ebuild deleted file mode 100644 index f377506cfbef..000000000000 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.8.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -IUSE="nls dbus ssl +gtk" - -DESCRIPTION="A GTK+ Gnutella client" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -HOMEPAGE="http://gtk-gnutella.sourceforge.net/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" - -RDEPEND=" - dev-libs/glib:2 - sys-libs/zlib - gtk? ( >=x11-libs/gtk+-2.2.1:2 ) - dbus? ( >=sys-apps/dbus-0.35.2 ) - ssl? ( >=net-libs/gnutls-2.2.5 ) - nls? ( >=sys-devel/gettext-0.11.5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - strip-linguas -i po - - echo "# Gentoo-selected LINGUAS" > po/LINGUAS - for ling in ${LINGUAS}; do - echo $ling >> po/LINGUAS - done -} - -src_configure() { - # There is no option to turn off optimization through the build.sh - # script. - sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die - - # The build script does not support the equivalent --enable - # options so we must construct the configuration by hand. - - local myconf - - if ! use nls; then - myconf="${myconf} --disable-nls" - fi - - if ! use dbus; then - myconf="${myconf} --disable-dbus" - fi - - if ! use ssl; then - myconf="${myconf} --disable-gnutls" - fi - - if use gtk; then - myconf="${myconf} --gtk2" - else - myconf="${myconf} --topless" - fi - - ./build.sh \ - --configure-only \ - --prefix="/usr" \ - --cc=$(tc-getCC) \ - ${myconf} -} - -src_compile() { - # Build system is not parallel-safe, bug 500760 - emake -j1 -} - -src_install() { - dodir /usr/bin - emake INSTALL_PREFIX="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog README TODO - - # Touch the symbols file into the future to avoid warnings from - # gtk-gnutella later on, since we will most likely strip the binary. - touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die -} diff --git a/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch b/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch deleted file mode 100644 index 250deda21616..000000000000 --- a/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur usr.orig/share/applications/swarmplayer.desktop usr/share/applications/swarmplayer.desktop ---- usr.orig/share/applications/swarmplayer.desktop 2013-05-09 20:47:46.000000000 -0400 -+++ usr/share/applications/swarmplayer.desktop 2013-05-09 20:48:34.000000000 -0400 -@@ -5,4 +5,4 @@ - Icon=swarmplayer - Terminal=false - Type=Application --Categories=Application;Network;P2P -+Categories=Network;P2P; -diff -Naur usr.orig/share/applications/tribler.desktop usr/share/applications/tribler.desktop ---- usr.orig/share/applications/tribler.desktop 2013-05-09 20:47:46.000000000 -0400 -+++ usr/share/applications/tribler.desktop 2013-05-09 20:49:03.000000000 -0400 -@@ -5,5 +5,5 @@ - Icon=tribler - Terminal=false - Type=Application --Categories=Application;Network;P2P --MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet -\ No newline at end of file -+Categories=Network;P2P; -+MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet; diff --git a/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch b/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch deleted file mode 100644 index 9c5051667669..000000000000 --- a/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur obfsproxy-0.2.8.orig/setup.py obfsproxy-0.2.8/setup.py ---- obfsproxy-0.2.8.orig/setup.py 2014-03-27 13:24:39.000000000 -0400 -+++ obfsproxy-0.2.8/setup.py 2014-03-29 15:10:05.063283282 -0400 -@@ -32,7 +32,6 @@ - 'setuptools', - 'PyCrypto', - 'Twisted', -- 'argparse', - 'pyptlib >= 0.0.5', - 'pyyaml' - ], diff --git a/net-proxy/obfsproxy/files/obfsproxy.confd b/net-proxy/obfsproxy/files/obfsproxy.confd deleted file mode 100644 index f86d648c9ab8..000000000000 --- a/net-proxy/obfsproxy/files/obfsproxy.confd +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# protocols ofbsproxy will obfuscate = obfs2 | dummy -PROTOCOL="obfs2" - -#options for PROTOCOLE="dummy" -# dummy [] -# mode ~ server|client|socks -# listen_address, target_address ~ host:port -# target_address is required for server and client mode, and forbidden for socks mode. -# Examples: -# obfsproxy dummy socks 127.0.0.1:5000 -# obfsproxy dummy client 127.0.0.1:5000 192.168.1.99:11253 -# obfsproxy dummy server 192.168.1.99:11253 127.0.0.1:9005 - -#MODE="socks" -#LISTEN="127.0.0.1:5000" -#TARGET="127.0.0.1:9005" - - -#options for PROTOCOL="obfs2" -# obfs2 [obfs2_args] obfs2_opts -# 'obfs2_opts': -# mode ~ server|client|socks -# listen address ~ host:port -# 'obfs2_args': -# Destination Address ~ --dest=host:port -# Shared Secret ~ --shared-secret= -# Example: -# obfsproxy obfs2 --dest=127.0.0.1:666 --shared-secret=himitsu server 127.0.0.1:1026 - -MODE="server" -DESTINATION="127.0.0.1:666" -SECRET="changeme" -LISTEN="127.0.0.1:1026" - -#Logging -# --log-file= ~ set logfile -# --log-min-severity=warn|notice|info|debug ~ set minimum logging severity (default: notice) -# --no-log ~ disable logging -# --no-safe-logging ~ disable safe (scrubbed address) logging - -LOGGING="--log-file=/var/log/obfsproxy.log --log-min-severity=warn" diff --git a/net-proxy/obfsproxy/files/obfsproxy.initd b/net-proxy/obfsproxy/files/obfsproxy.initd deleted file mode 100644 index 70e9295d1a74..000000000000 --- a/net-proxy/obfsproxy/files/obfsproxy.initd +++ /dev/null @@ -1,58 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -PIDFILE="/var/run/obfsproxy.pid" -DAEMON="/usr/bin/obfsproxy" - -depend() { - need net -} - -checkconfig() { - [[ "x${PROTOCOL}" = "x" ]] \ - && eerror "PROTOCOL not given" && return 1 - [[ "x${MODE}" = "x" ]] \ - && eerror "MODE not given" && return 1 - if [ ${PROTOCOL} = "dummy" ] ; then - [[ "x${LISTEN}" = "x" ]] \ - && eerror "No listen address was given" && return 1 - [[ "x${MODE}" = "xserver" && "x${TARGET}" = "x" ]] \ - && eerror "MODE=server but no target address was given" && return 1 - [[ "x${MODE}" = "xsocks" && "x${TARGET}" != "x" ]] \ - && eerror "MODE=sock but a target address was given" && return 1 - CMDLINE="${LOGGING} ${PROTOCOL} ${MODE} ${LISTEN} ${TARGET}" - elif [ ${PROTOCOL} = "obfs2" ] ; then - [[ "x${MODE}" = "xsocks" && "x${DESTINATION}" != "x" ]] \ - && eerror "MODE=sock but a destination address was given" && return 1 - [[ "x${LISTEN}" = "x" ]] \ - && eerror "LISTEN host:port was not given" && return 1 - [[ "x${DESTINATION}" != "x" ]] \ - && DESTINATION="--dest=${DESTINATION}" - [[ "x${SECRET}" != "x" ]] \ - && SECRET="--shared-secret=${SECRET}" - CMDLINE="${LOGGING} ${PROTOCOL} ${DESTINATION} ${SECRET} ${MODE} ${LISTEN}" - else - eerror "Unknown protocol ${PROTOCOL}" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting obfsproxy server" - start-stop-daemon --start \ - --background --make-pidfile --pidfile ${PIDFILE} \ - --exec ${DAEMON} -- ${CMDLINE} - eend $? -} - -stop() { - ebegin "Stopping obfsproxy server" - start-stop-daemon --stop \ - --pidfile ${PIDFILE} \ - --exec ${DAEMON} - eend $? -} diff --git a/net-proxy/torsocks/files/fix-docdir.patch b/net-proxy/torsocks/files/fix-docdir.patch deleted file mode 100644 index 899c15b16721..000000000000 --- a/net-proxy/torsocks/files/fix-docdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur torsocks-1.2.orig/doc/Makefile.am torsocks-1.2/doc/Makefile.am ---- torsocks-1.2.orig/doc/Makefile.am 2011-10-26 14:30:26.000000000 -0400 -+++ torsocks-1.2/doc/Makefile.am 2011-12-26 20:05:40.000000000 -0500 -@@ -7,8 +7,6 @@ - # Install man pages - dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 - --dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ -- patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \ -- patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \ -- patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG -+dist_doc_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ -+ notes/DEBUG - -diff -Naur torsocks-1.2.orig/test/Makefile.am torsocks-1.2/test/Makefile.am ---- torsocks-1.2.orig/test/Makefile.am 2011-10-26 14:21:57.000000000 -0400 -+++ torsocks-1.2/test/Makefile.am 2011-12-26 20:04:34.000000000 -0500 -@@ -4,4 +4,4 @@ - test_torsocks_LDFLAGS= $(TESTLDFLAGS) - CLEANFILES= test_torsocks - --dist_data_DATA = run_tests.sh expectedresults.txt -\ No newline at end of file -+dist_doc_DATA = run_tests.sh expectedresults.txt diff --git a/net-proxy/torsocks/files/suppress-warning-msgs.patch b/net-proxy/torsocks/files/suppress-warning-msgs.patch deleted file mode 100644 index 7470b9fa7f4b..000000000000 --- a/net-proxy/torsocks/files/suppress-warning-msgs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- torsocks-1.2.orig/src/torsocks.c 2011-10-25 17:49:50.000000000 -0400 -+++ torsocks-1.2/src/torsocks.c 2012-02-21 11:09:20.000000000 -0500 -@@ -124,9 +124,9 @@ - #define LOAD_ERROR(s,l) { \ - const char *error; \ - error = dlerror(); \ -- show_msg(l, "The symbol %s() was not found in any shared " \ -- "library. The error reported was: %s!\n", s, \ -- (error)?error:"not found"); \ -+ if (error) \ -+ show_msg(l, "The symbol %s() was not found in any shared " \ -+ "library. The error reported was: %s!\n", s, error); \ - dlerror(); \ - } - pthread_mutex_lock(&torsocks_init_mutex); diff --git a/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch b/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch deleted file mode 100644 index c11cf6915506..000000000000 --- a/net-proxy/torsocks/files/torsocks-2.1.0-musl.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 3e793e9eac05ad926cc016da5129e95986d105f2 Mon Sep 17 00:00:00 2001 -From: David Goulet -Date: Mon, 13 Jun 2016 14:39:53 -0400 -Subject: [PATCH] Add support for musl-libc - -Musl library does not have a specific define so use __linux__ instead. - -Signed-off-by: David Goulet ---- - src/common/compat.c | 5 +++-- - src/common/compat.h | 5 +++-- - src/common/ref.h | 5 +++-- - src/lib/torsocks.h | 9 +++++---- - 4 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/src/common/compat.c b/src/common/compat.c -index a861b3d..323f2ed 100644 ---- a/src/common/compat.c -+++ b/src/common/compat.c -@@ -19,7 +19,8 @@ - - #include "compat.h" - --#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) -+#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ -+ defined(__darwin__) || defined(__NetBSD__)) - - /* - * Initialize a pthread mutex. This never fails. -@@ -96,4 +97,4 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)) - tsocks_mutex_unlock(&o->mutex); - } - --#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ -+#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ -diff --git a/src/common/compat.h b/src/common/compat.h -index ce47129..6c8ce32 100644 ---- a/src/common/compat.h -+++ b/src/common/compat.h -@@ -22,7 +22,8 @@ - #define __darwin__ 1 - #endif - --#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) -+#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ -+ defined(__darwin__) || defined(__NetBSD__)) - - #define RTLD_NEXT ((void *) -1) - -@@ -55,7 +56,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)); - - #else - #error "OS not supported." --#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ -+#endif /* __linux__, __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ - - #if defined(__linux__) - #include -diff --git a/src/common/ref.h b/src/common/ref.h -index 88aec2e..d9b9df8 100644 ---- a/src/common/ref.h -+++ b/src/common/ref.h -@@ -26,7 +26,8 @@ struct ref { - long count; - }; - --#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) -+#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ -+ defined(__darwin__) || defined(__NetBSD__)) - - /* - * Get a reference by incrementing the refcount. -@@ -57,6 +58,6 @@ static inline void ref_put(struct ref *r, - - #else - #error "OS not supported" --#endif /* __GLIBC__, __FreeBSD__, __darwin__ */ -+#endif /* __linux__, __GLIBC__, __FreeBSD__, __darwin__, __NetBSD__ */ - - #endif /* TORSOCKS_REF_H */ -diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h -index 076f3a5..0eeef2a 100644 ---- a/src/lib/torsocks.h -+++ b/src/lib/torsocks.h -@@ -33,7 +33,8 @@ - #define TSOCKS_DECL(name, type, sig) \ - extern type tsocks_##name(sig); - --#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__)) -+#if (defined(__linux__) || defined(__GLIBC__) || defined(__FreeBSD__) || \ -+ defined(__darwin__) || defined(__NetBSD__)) - - /* connect(2) */ - #include -@@ -207,7 +208,7 @@ struct hostent **result, int *h_errnop - - #else - #error "OS not supported." --#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */ -+#endif /* __linux__, __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */ - - #if (defined(__linux__)) - -@@ -241,7 +242,7 @@ struct hostent **result, int *h_errnop - - #endif /* __FreeBSD__, __darwin__, __NetBSD__ */ - --#if defined(__GLIBC__) && defined(__FreeBSD_kernel__) -+#if (defined(__linux__) || defined(__GLIBC__)) && defined(__FreeBSD_kernel__) - - /* syscall(2) */ - #define LIBC_SYSCALL_NAME syscall -@@ -250,7 +251,7 @@ struct hostent **result, int *h_errnop - #define LIBC_SYSCALL_SIG long int number, ... - #define LIBC_SYSCALL_ARGS number - --#endif /* __GLIBC__ && __FreeBSD_kernel__ */ -+#endif /* (__linux__ || __GLIBC__) && __FreeBSD_kernel__ */ - - /* __syscall(2) */ - #if defined(__FreeBSD__) diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask index e9c61772dd44..405a7600318d 100644 --- a/profiles/arch/x86/use.mask +++ b/profiles/arch/x86/use.mask @@ -192,7 +192,7 @@ video_cards_newport # Diego Pettenò (4 Jan 2007) # Unmask the flags for PHP that are available only on x86 --frontbase +# # Shared with amd64 -oci8 diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 549162d3e0f7..52ccacebf10d 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -2,6 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Michael Orlitzky (7 Jan 2017) +# The dev-db/firebird and dev-db/oracle-instantclient* packages +# only support amd64 and x86. +firebird +oci8 + # Michael Palimaka (29 Dec 2016) # elogind support is not yet fully implemented in all required packages elogind @@ -264,13 +270,6 @@ fdftk aqua coreaudio -# Diego Pettenò (4 Jan 2007) -# Mask the flags for PHP that are available only on x86 -frontbase -# Shared with amd64 -oci8 -firebird - # Robert Buchholz (03 Jun 2007) # Only works on x86 or amd64 lcd_devices_svga diff --git a/profiles/package.mask b/profiles/package.mask index aa6876127dd5..05dbaff69d2d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,17 @@ #--- END OF EXAMPLES --- +# Michael Orlitzky (07 Jan 2017) +# Places unauthenticated HTTP data into root's SSH authorized_keys +# file. Nope. Masked for removal in 30 days. Bug 603346. +app-admin/amazon-ec2-init + +# Mart Raudsepp (07 Jan 2017) +# No releases of this API version since March 2001, abandoned +# in favour of glib:2 for 14 years. +# Marked for removal in 30 days. Bug 604966. +dev-libs/glib:1 + # Michael Orlitzky (06 Jan 2017) # Dead templating projects, you should move to something # like dev-php/smarty or dev-php/twig instead. @@ -63,7 +74,7 @@ dev-php/propel dev-php/propel-generator dev-php/propel-runtime -# Daniel Campbell (02 Jan 2016) +# Daniel Campbell (02 Jan 2017) # Google Code shutdown and change of versioning scheme # needs 'old' versions masked (v94 -> v1.0.0) # Masked for removal in 30 days. @@ -162,11 +173,6 @@ media-plugins/gimp-gmic # Mask ruby 2.0 for removal, bug 576034 dev-lang/ruby:2.0 -# Pacho Ramos (27 Nov 2016) -# Vulnerable to CVE-2015-1431 and nobody taking care of it, bug #538360. -# Removal in a month. -www-apps/phpBB - # Kent Fredric (19 Nov 2016) # virtual/perl-MathBigInt-1.999.726+ Mask Block # Will likely not be unmasked until future Perls diff --git a/profiles/use.desc b/profiles/use.desc index c56621610574..c540b4fb68e8 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -104,7 +104,6 @@ foomaticdb - Add support for the foomatic printing driver database fortran - Add support for fortran freetds - Add support for the TDS protocol to connect to MSSQL/Sybase databases freewnn - Add support for FreeWnn kana to kanji conversion engine -frontbase - Add support for the frontbase sql server ftp - Add FTP (File Transfer Protocol) support gcj - Enable building with gcj (The GNU Compiler for the Javatm Programming Language) gd - Add support for media-libs/gd (to generate graphics on the fly) diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 349699a5e000..b97d54a65938 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -2231,6 +2231,7 @@ dev-php/ZendFramework:cli - Enables the CLI dev-php/ZendFramework:doc - Installs the documentation dev-php/ZendFramework:examples - Installs the examples dev-php/ZendFramework:minimal - Installs the minimal version without Dojo toolkit, tests and demos +dev-php/agavi:executable - Install the "agavi" executable used to manage projects. This requires dev-php/phing, and may be omitted if you are (for example) deploying an existing site to a production server. dev-php/pecl-apcu:lock_pthreadmutex - Enable pthread mutex locking dev-php/pecl-apcu:lock_pthreadrw - Enable pthread read/write locking dev-php/pecl-apcu:lock_semaphore - Enable semaphore locks instead of fcntl @@ -2241,6 +2242,7 @@ dev-php/pecl-memcached:json - Enable support for json serialization dev-php/pecl-mysqlnd_qc:memcached - Use dev-libs/libmemcached as a storage handler dev-php/pecl-mysqlnd_qc:sqlite - Use dev-db/sqlite as a storage handler dev-php/pecl-redis:igbinary - Enables igbinary serialisation support +dev-php/phing:zip - Support zip archives by requiring said support in dev-lang/php. dev-php/twig:extension - Build the C extension (only for php-5.6.x). dev-php/xcache:coverage - Enable the coverager module (not recommended for production servers). dev-python/Kivy:camera - Install libraries needed to support camera @@ -3604,6 +3606,8 @@ mail-filter/qmail-scanner:spamassassin - Build faster mail-filter/spamassassin c mail-filter/rmilter:dkim - Enable support for DomainKeys Identified Mail mail-filter/rmilter:memcached - Enable support for memcached mail-filter/rspamd:fann - Enable neural network plugin (requires sci-mathematics/fann). +mail-filter/rspamd:jemalloc - Use dev-libs/jemalloc for allocations +mail-filter/rspamd:pcre2 - Use dev-libs/libpcre2 mail-filter/spamassassin:bayes - Require a database (MySQL, SQLite, Postgres, or BerkDB) backend to enable the Bayesian filtering database. mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily. mail-filter/spamassassin:qmail - Build qmail functionality and docs @@ -7762,6 +7766,7 @@ sys-fs/lvm2:lvm2create_initrd - Install lvm2create_initrd script and pull in sys sys-fs/lvm2:openais - Openais support for clustered lvm sys-fs/lvm2:thin - Support for thin volumes sys-fs/mtpfs:mad - Enable handling of MP3's metadata +sys-fs/multipath-tools:rbd - Enable Rados block device support via sys-cluster/ceph sys-fs/ntfs3g:external-fuse - Use external FUSE library instead of internal one. Must be disabled for unprivileged mounting to work. sys-fs/ntfs3g:ntfsdecrypt - Build and install the ntfsdecrypt application. sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs. diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest index f77b27bc8224..ce9e09dea5d4 100644 --- a/sci-electronics/fritzing/Manifest +++ b/sci-electronics/fritzing/Manifest @@ -1,3 +1,2 @@ -DIST fritzing-0.8.7b.source.tar.bz2 20007914 SHA256 7d74418863a9e3b3a4eed171b8023ddea426125f08dc83ed4c55a05d39948eb4 SHA512 f45b2d4c62227ae7bf10a481775542ce5eba1ed3d9ea45e16b60517113e2af2762a8cf1155240c7242dc79886b693319e335891fa633aa41e4699ab916a7f9e9 WHIRLPOOL 385979f6edbcb5816e5c5e0872cf74e1bdd54885af4779fdbfd29e60ed8b3349265375a74968c3bae2827e5b28897b05f3f7f36a48f8f709cc0e85a2987ded16 DIST fritzing-0.9.2b.tar.gz 10913985 SHA256 6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f SHA512 a8b6d99c4e08f86d7a7cc6574053e8b1af565a3919cb2fc406e67972052b3fa3ded002be43e4fd0345189e4e1f3cecb3851cd14711efd83ccbcbef4cbd135c58 WHIRLPOOL 70a3e310ee8f1e53e63ca7a56b9f93808e5576b8ce0995cca470a787840e5cebad7e2b357148773610971dc2db777d581a9e62bbf94fedfbd104960bab9436f6 DIST fritzing-parts-0.9.2b.tar.gz 15924206 SHA256 5f5f5e26bfc33911f57b1620912fdf0a834c50d196b930ef70e784f3a447194b SHA512 055c866532c4a09a7de3315fffc485c6be5a576e998fca7b001faae513da86d451ca8ed39583108ec54472ab0e1d8b953c192efcf93e5c19139f0fa83484a549 WHIRLPOOL 214bd62863d121cf6944a1bda7b0da735bc1971b93a9f439cc504b3e3df37599da110cf30073d982b63ecd1557f2cbd218b0cdc5818b69cea5f32c8f3a8051f5 diff --git a/sci-electronics/fritzing/fritzing-0.8.7b.ebuild b/sci-electronics/fritzing/fritzing-0.8.7b.ebuild deleted file mode 100644 index 911c1b6053a0..000000000000 --- a/sci-electronics/fritzing/fritzing-0.8.7b.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils qt4-r2 - -DESCRIPTION="Electronic Design Automation" -HOMEPAGE="http://fritzing.org/" -SRC_URI="http://fritzing.org/download/${PV}/source-tarball/${P}.source.tar.bz2" - -LICENSE="CC-BY-SA-3.0 GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - dev-qt/qtsql:4[sqlite] - dev-libs/quazip" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.40" - -S="${WORKDIR}/${P}.source" - -src_prepare() { - local translations= - - qt4-r2_src_prepare - - # Get a rid of the bundled libs - # Bug 412555 and - # https://code.google.com/p/fritzing/issues/detail?id=1898 - rm -rf src/lib/quazip/ pri/quazip.pri src/lib/boost* - - # Fritzing doesn't need zlib - sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die - - edos2unix ${PN}.desktop - - # Somewhat evil but IMHO the best solution - for lang in $LINGUAS; do - lang=${lang/linguas_} - [ -f "translations/${PN}_${lang}.qm" ] && translations+=" translations/${PN}_${lang}.qm" - done - if [ -n "${translations}" ]; then - sed -i -e "s:\(translations.extra =\) .*:\1 cp -p ${translations} \$(INSTALL_ROOT)\$\$PKGDATADIR/translations\r:" phoenix.pro || die - else - sed -i -e "s:translations.extra = .*:\r:" phoenix.pro || die - fi -} - -src_configure() { - eqmake4 DEFINES=QUAZIP_INSTALLED phoenix.pro -} diff --git a/sci-electronics/fritzing/fritzing-0.9.2b-r1.ebuild b/sci-electronics/fritzing/fritzing-0.9.2b-r1.ebuild deleted file mode 100644 index 83fd5c314734..000000000000 --- a/sci-electronics/fritzing/fritzing-0.9.2b-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PARTS_P="${PN}-parts-${PV}" - -inherit qmake-utils - -DESCRIPTION="Electronic Design Automation" -HOMEPAGE="http://fritzing.org/" -SRC_URI="https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fritzing/fritzing-parts/archive/${PV}.tar.gz -> ${PARTS_P}.tar.gz" - -LICENSE="CC-BY-SA-3.0 GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-libs/quazip[qt5]" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.40:=" - -S="${WORKDIR}/${PN}-app-${PV}" - -DOCS="readme.md" - -src_prepare() { - local lang translations= - - # Get a rid of the bundled libs - # Bug 412555 and - # https://code.google.com/p/fritzing/issues/detail?id=1898 - rm -rf src/lib/quazip/ pri/quazip.pri src/lib/boost* || die - - # Fritzing doesn't need zlib - sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die - - # Somewhat evil but IMHO the best solution - for lang in $L10N; do - lang=${lang/linguas_} - [[ -f "translations/${PN}_${lang}.qm" ]] && translations+=" translations/${PN}_${lang}.qm" - done - if [[ -n "${translations}" ]]; then - sed -i -e "s:\(translations.extra =\) .*:\1 cp -p ${translations} \$(INSTALL_ROOT)\$\$PKGDATADIR/translations\r:" phoenix.pro || die - else - sed -i -e "s:translations.extra = .*:\r:" phoenix.pro || die - fi - - # Fix missing Intel bin icon - # https://github.com/fritzing/fritzing-parts/commit/716560e9 - sed -i -e 's:Intel.png:intel.png:' bins/more/intel.fzb || die - - default -} - -src_configure() { - eqmake5 DEFINES=QUAZIP_INSTALLED phoenix.pro -} - -src_install() { - INSTALL_ROOT="${D}" default - - insinto /usr/share/fritzing/parts - doins -r "${WORKDIR}/${PARTS_P}"/* -} diff --git a/sci-electronics/fritzing/fritzing-0.9.2b.ebuild b/sci-electronics/fritzing/fritzing-0.9.2b.ebuild deleted file mode 100644 index 52256e3b3c0c..000000000000 --- a/sci-electronics/fritzing/fritzing-0.9.2b.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qmake-utils - -DESCRIPTION="Electronic Design Automation" -HOMEPAGE="http://fritzing.org/" -SRC_URI="https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-SA-3.0 GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-libs/quazip" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.40" - -S="${WORKDIR}/${PN}-app-${PV}" - -src_prepare() { - local translations= - - # Get a rid of the bundled libs - # Bug 412555 and - # https://code.google.com/p/fritzing/issues/detail?id=1898 - rm -rf src/lib/quazip/ pri/quazip.pri src/lib/boost* - - # Fritzing doesn't need zlib - sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die - - edos2unix ${PN}.desktop - - # Somewhat evil but IMHO the best solution - for lang in $LINGUAS; do - lang=${lang/linguas_} - [ -f "translations/${PN}_${lang}.qm" ] && translations+=" translations/${PN}_${lang}.qm" - done - if [ -n "${translations}" ]; then - sed -i -e "s:\(translations.extra =\) .*:\1 cp -p ${translations} \$(INSTALL_ROOT)\$\$PKGDATADIR/translations\r:" phoenix.pro || die - else - sed -i -e "s:translations.extra = .*:\r:" phoenix.pro || die - fi -} - -src_configure() { - eqmake5 DEFINES=QUAZIP_INSTALLED PREFIX="${D}"/usr phoenix.pro -} diff --git a/sys-apps/chname/chname-1.0-r2.ebuild b/sys-apps/chname/chname-1.0-r2.ebuild index e0b70ba2cc97..39cf28c2b7be 100644 --- a/sys-apps/chname/chname-1.0-r2.ebuild +++ b/sys-apps/chname/chname-1.0-r2.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 # $Id$ @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="Run a command with a new system hostname" HOMEPAGE="https://github.com/marineam/chname" -SRC_URI="https://chname.googlecode.com/files/chname-1.0.tar.gz" +SRC_URI="https://github.com/marineam/${PN}/archive/v1.0.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/sys-apps/chname/metadata.xml b/sys-apps/chname/metadata.xml index 57eae0a14685..55a2aa03204a 100644 --- a/sys-apps/chname/metadata.xml +++ b/sys-apps/chname/metadata.xml @@ -4,7 +4,6 @@ Run a command with a new system hostname. Requires utsname namespaces. - chname marineam/chname diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest index 7dd766f82f80..7136dbe9aced 100644 --- a/sys-apps/ed/Manifest +++ b/sys-apps/ed/Manifest @@ -1,3 +1,3 @@ DIST ed-1.10.tar.lz 63717 SHA256 9540092c12309b2f4a294fdb8f5bd25f1ad5906a627518486e7733576a637e9a SHA512 b9c59de852609930d2a872f3d9af9ac12be8e80f3d2af49e3626cd909ba46ed4a4260844c636562cd479c5529a116055705260327f61304d8eaf88db6a60059a WHIRLPOOL 7130abba638202e06e078b9e60c9f83e6216fc0cd73891df08eda4a06044b9783a8f974b70dfb8452bdbc7c090bea3776c45b743e7a05bf9988197b51de729d8 -DIST ed-1.12.tar.gz 87974 SHA256 f2c126d6ec1e5ccfccba05c749d6adf45e84011523ff0c31f595ad41ba892c84 SHA512 546a60e53b45c6416e91239a672e97ee9ce499e4c6d998e278a3870364da0b312e9d3fe681b1c11783d1f3342449502f3ac4d9eb3172c5e7c3b202d82fcb5989 WHIRLPOOL 6d94863786a06f508285ff7e4ca1dbf581a70a109359c101efefe22f070cb3bab46b16bea6110ed9d3894ccdab815ba8b3ff1119ccfe0cf6ea3257e1d27f0980 DIST ed-1.13.tar.gz 87984 SHA256 f9e2a8c95dff14fab315680966ad3037afecdf089c2d0c281e267bf1ae836b0f SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c WHIRLPOOL 813402266604578fb158801de897133069a0244b228ee613148018a540b2b73878f65c67d3e198b19683094decfa4ce89d81a39c993cc0ee393cc05ab7c8925e +DIST ed-1.14.tar.gz 91576 SHA256 705b5fc81e1d196d508c6a3a76896c9eb979807b508816103f53529c2b537671 SHA512 1f96e6d6e823b591593db01b2aa853d3b0cce26a7f74e39b326fd5a83f8788b81338028f5e1c0eb558d51ffac21e3a842435fe50bd6d29ed00e0d8996570631a WHIRLPOOL f3b8a475b822812cf4d4892831103c37bc5ec0bb609ffb2db1857f6e3fe4aa101cf30e175a5dbcf0e34873cb0f1e7594d5b162416aaed16f10d372084fe6932e diff --git a/sys-apps/ed/ed-1.12.ebuild b/sys-apps/ed/ed-1.14.ebuild similarity index 95% rename from sys-apps/ed/ed-1.12.ebuild rename to sys-apps/ed/ed-1.14.ebuild index 0a35b6ff1c80..4aef3cef7fa4 100644 --- a/sys-apps/ed/ed-1.12.ebuild +++ b/sys-apps/ed/ed-1.14.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 inherit toolchain-funcs diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12 b/sys-apps/kexec-tools/files/kexec.init-2.0.12 index 87863b3531f2..93f8c04a0257 100755 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.12 +++ b/sys-apps/kexec-tools/files/kexec.init-2.0.12 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 new file mode 100644 index 000000000000..1d2494bd62f3 --- /dev/null +++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 @@ -0,0 +1,187 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Set up some defaults. +: "${LOAD_DURING_SHUTDOWN:=yes}" +: "${BOOTPART:=/boot}" +: "${DONT_MOUNT_BOOT:=no}" + +depend() { + need localmount +} + +auto_prefix_bootpath() { + # Only auto-add prefix to relative paths. + case $1 in + */*) echo "$1";; + *) echo "${BOOTPART}/$1" ;; + esac +} + +get_genkernel_arch() { + case $1 in + x86_64) echo "amd64" ;; + i[3456]86) echo "x86" ;; + *) echo "$1" ;; + esac +} + +image_path() { + # Do no sanity checking if the user has set a value. + if [ -n "${KNAME}" ]; then + auto_prefix_bootpath "${KNAME}" + return + fi + + local x kver="$(uname -r)" karch="$(uname -m)" + local gkarch="$(get_genkernel_arch $karch)" + for x in \ + "bzImage" \ + "vmlinuz" \ + "bzImage-${kver}" \ + "vmlinuz-${kver}" \ + "kernel-genkernel-${karch}-${kver}" \ + "kernel-genkernel-${gkarch}-${kver}" \ + "kernel-${kver}" \ + "kernel-${karch}"; do + if [ -e "${BOOTPART}/${x}" ]; then + echo "${BOOTPART}/${x}" + return + fi + done + + return 1 +} + +initrd_path() { + # Do no sanity checking if the user has set a value. + if [ -n "${INITRD}" ]; then + auto_prefix_bootpath "${INITRD}" + return 0 + fi + + local x kver="$(uname -r)" karch="$(uname -m)" + local gkarch="$(get_genkernel_arch $karch)" + for x in \ + "initrd" \ + "initrd.img-${kver}" \ + "initrd-${kver}.img" \ + "initrd-${kver}" \ + "initramfs-${kver}.img" \ + "initramfs-genkernel-${karch}-${kver}" \ + "initramfs-genkernel-${gkarch}-${kver}"; do + if [ -e "${BOOTPART}/${x}" ]; then + echo "${BOOTPART}/${x}" + return 0 + fi + done + + return 1 +} + +mount_boot() { + [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1 + mountinfo -q "${BOOTPART}" && return 1 + + ebegin "Mounting ${BOOTPART}" + mount "${BOOTPART}" + eend $? +} + +load_image() { + if [ "${KNAME}" = "-" ]; then + ebegin "Disabling kexec" + kexec -u + eend $? + return # eend preserved $? for us. + fi + + local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt + + if ! img="$(image_path)"; then + if mount_boot; then + if img="$(image_path)"; then + mounted=true + initrd="$(initrd_path)" + else + eerror "No kernel image found in ${BOOTPART}!" + umount "${BOOTPART}" + return 1 + fi + else + eerror "No kernel image found in ${BOOTPART}!" + return 1 + fi + fi + + if [ -z "${ROOTPART}" ]; then + ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" + fi + + if [ -z "${KPARAM}" ]; then + kparamopt="--reuse-cmdline" + fi + + if [ -n "${initrd}" ]; then + initrdopt="--initrd=${initrd}" + fi + + local msg + [ -n "${initrd}" ] && \ + msg=" (with ${initrd})" + ebegin "Using kernel image ${img}${msg} for kexec" + + kexec ${KEXEC_OPT_ARGS} ${kparamopt} \ + -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} + local ret=$? + + ${mounted} && umount "${BOOTPART}" + eend ${ret} + return ${ret} +} + +start() { + if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then + local mounted + if mount_boot; then + mounted=true + fi + if ! image_path >/dev/null; then + ewarn "Cannot find kernel image!" + ewarn "Please make sure a valid kernel image is present before reboot." + return 0 + fi + if [ -n "${mounted}" ]; then + ebegin "Unmounting ${BOOTPART}" + umount "${BOOTPART}" + eend $? + fi + # $? is already set to the previous calls. + return + else + load_image + fi +} + +stop() { + if ! yesno ${RC_REBOOT}; then + ebegin "Not rebooting; disabling kexec" + kexec -u + eend $? + return + fi + + if [ -f /nokexec ]; then + ebegin "Rebooting; disabling kexec due to /nokexec" + rm -f /nokexec + kexec -u + eend $? + return + fi + + if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then + load_image + fi +} diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild new file mode 100644 index 000000000000..8bc203d65eb1 --- /dev/null +++ b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" + AUTOTOOLS_AUTORECONF=true +else + SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools-utils linux-info systemd + +DESCRIPTION="Load another kernel from the currently executing Linux kernel" +HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="booke lzma xen zlib" + +REQUIRED_USE="lzma? ( zlib )" + +DEPEND=" + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~KEXEC" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch + "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch +) + +pkg_setup() { + # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) + export ASFLAGS="${CCASFLAGS}" +} + +src_configure() { + local myeconfargs=( + $(use_with booke) + $(use_with lzma) + $(use_with xen) + $(use_with zlib) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + dodoc "${FILESDIR}"/README.Gentoo + + newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec + newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec + + insinto /etc + doins "${FILESDIR}"/kexec.conf + + insinto /etc/kernel/postinst.d + doins "${FILESDIR}"/90_kexec + + systemd_dounit "${FILESDIR}"/kexec.service +} + +pkg_postinst() { + if systemd_is_booted || has_version sys-apps/systemd; then + elog "For systemd support the new config file is" + elog " /etc/kexec.conf" + elog "Please adopt it to your needs as there is no autoconfig anymore" + fi +} diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch new file mode 100644 index 000000000000..e30abb0d1076 --- /dev/null +++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch @@ -0,0 +1,27 @@ +--- pcmciautils-018/src/lex_config.l ++++ pcmciautils-018/src/lex_config.l +@@ -1,8 +1,8 @@ + /* Special state for handling include files */ + %x src +-%option noinput nounput ++%option noinput nounput noyywrap + + %{ + /* + * Startup tool for non statically mapped PCMCIA sockets + * +@@ -75,14 +75,10 @@ module /* skip */ ; + + . return yytext[0]; + + %% + +-#ifndef yywrap +-int yywrap() { return 1; } +-#endif +- + /*====================================================================== + + Stuff to parse basic data types + + ======================================================================*/ diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild index 409b157da962..c4b8e065ee12 100644 --- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild +++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils flag-o-matic linux-info toolchain-funcs udev +EAPI=6 +inherit flag-o-matic linux-info toolchain-funcs udev DEB_REV=${PV#*_p} MY_PV=${PV%_p*} @@ -51,11 +51,14 @@ pkg_setup() { use debug && append-cppflags -DDEBUG } -src_prepare() { - epatch \ - "${WORKDIR}"/debian/patches/no-modprobe-rules.patch \ - "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch +PATCHES=( + "${WORKDIR}"/debian/patches/no-modprobe-rules.patch + "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch + "${FILESDIR}"/${P}-flex-2.6.3-fix.patch +) +src_prepare() { + default sed -i \ -e '/CFLAGS/s:-fomit-frame-pointer::' \ -e '/dir/s:sbin:bin:g' \ diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index a820e93460e0..551033c2bc7c 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,2 +1,3 @@ DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff DIST multipath-tools-0.6.2.tar.gz 242413 SHA256 f5cec5d92d56ec99220fccc1e70b9d10bc8ff5039c809ebcc201ce34d7ee3095 SHA512 8a04302002bf778299495e4be2d4302c19350d8ec218da23c5f781233efa6d0b39208a676b0d770771d7f09d62fa2b1ce32c03f60662691f74afb111e918b639 WHIRLPOOL f040273bd188c30f2f3b87e21a403b5f5d3ce2f0918382890cc0750b803bf05f70ed6bf46a83c5b68137835bc9bcf6cbca14f6462cfbef660667118b59eafc7d +DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch new file mode 100644 index 000000000000..99a12fc7b784 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch @@ -0,0 +1,60 @@ +diff --git a/kpartx/dasd.c b/kpartx/dasd.c +index 1206e45..f50c1bd 100644 +--- a/kpartx/dasd.c ++++ b/kpartx/dasd.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c +index d31fea8..3452787 100644 +--- a/kpartx/kpartx.c ++++ b/kpartx/kpartx.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c +index 4d6c3c2..d9a9e67 100644 +--- a/libmultipath/checkers/tur.c ++++ b/libmultipath/checkers/tur.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c +index 4f8ef13..9c0b240 100644 +--- a/libmultipath/devmapper.c ++++ b/libmultipath/devmapper.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "checkers.h" + #include "vector.h" +diff --git a/libmultipath/util.c b/libmultipath/util.c +index 03a5738..1841f35 100644 +--- a/libmultipath/util.c ++++ b/libmultipath/util.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml index 56c124413057..9a20c9e5bc2b 100644 --- a/sys-fs/multipath-tools/metadata.xml +++ b/sys-fs/multipath-tools/metadata.xml @@ -1,8 +1,11 @@ - - base-system@gentoo.org - Gentoo Base System - + + base-system@gentoo.org + Gentoo Base System + + + Enable Rados block device support via sys-cluster/ceph + diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild new file mode 100644 index 000000000000..6d4e372ff10e --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=">=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + dev-libs/libaio + dev-libs/userspace-rcu + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + # modprobe fails when modules are compiled statically into the kernel + # https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html + "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=604228 + # https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html + "${FILESDIR}"/${P}-sysmacros.patch +) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sys-power/powerman/metadata.xml b/sys-power/powerman/metadata.xml index 5991a05cf8c2..27493d19d2c1 100644 --- a/sys-power/powerman/metadata.xml +++ b/sys-power/powerman/metadata.xml @@ -11,7 +11,4 @@ Add support for h8 based power controllers Add support for selecting power control targets using genders (-g option) - - powerman - diff --git a/sys-power/powerman/powerman-2.3.9-r1.ebuild b/sys-power/powerman/powerman-2.3.9-r1.ebuild index 6746c34ac32e..5767874c3c9f 100644 --- a/sys-power/powerman/powerman-2.3.9-r1.ebuild +++ b/sys-power/powerman/powerman-2.3.9-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=6 DESCRIPTION="RPC/PDU control and monitoring service for data center or compute cluster power management" -HOMEPAGE="https://code.google.com/p/powerman/" -SRC_URI="https://powerman.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://github.com/chaos/powerman" +SRC_URI="https://github.com/chaos/${PN}/archive/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+httppower -snmppower -h8power +genders" diff --git a/sys-process/acct/acct-6.5.5-r4.ebuild b/sys-process/acct/acct-6.5.5-r4.ebuild new file mode 100644 index 000000000000..0037b6d05b1a --- /dev/null +++ b/sys-process/acct/acct-6.5.5-r4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=3 +inherit eutils autotools systemd + +DESCRIPTION="GNU system accounting utilities" +HOMEPAGE="https://savannah.gnu.org/projects/acct/" +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" +IUSE="" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-6.5.5-cross-compile.patch \ + "${FILESDIR}"/${PN}-6.5.5-no-gets.patch + eautoreconf +} + +src_configure() { + econf --enable-linux-multiformat +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO + keepdir /var/account + newinitd "${FILESDIR}"/acct.initd-r1 acct || die + newconfd "${FILESDIR}"/acct.confd acct || die + systemd_dounit "${FILESDIR}"/acct.service + insinto /etc/logrotate.d + newins "${FILESDIR}"/acct.logrotate acct || die + + # sys-apps/sysvinit already provides this + rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die + + # accton in / is only a temp workaround for #239748 + dodir /sbin + mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die +} diff --git a/sys-process/acct/acct-6.6.2-r1.ebuild b/sys-process/acct/acct-6.6.2-r1.ebuild new file mode 100644 index 000000000000..7e99af23bb79 --- /dev/null +++ b/sys-process/acct/acct-6.6.2-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools base systemd + +DESCRIPTION="GNU system accounting utilities" +HOMEPAGE="https://savannah.gnu.org/projects/acct/" +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" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-6.6.2-cross-compile.patch + "${FILESDIR}"/${PN}-6.6.1-no-gets.patch +) + +src_prepare() { + base_src_prepare + eautoreconf +} + +src_configure() { + econf --enable-linux-multiformat +} + +src_install() { + default + keepdir /var/account + newinitd "${FILESDIR}"/acct.initd-r1 acct + newconfd "${FILESDIR}"/acct.confd acct + systemd_dounit "${FILESDIR}"/acct.service + insinto /etc/logrotate.d + newins "${FILESDIR}"/acct.logrotate acct + + # sys-apps/sysvinit already provides this + rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die + + # accton in / is only a temp workaround for #239748 + dodir /sbin + mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die +} diff --git a/sys-process/acct/files/acct.initd-r1 b/sys-process/acct/files/acct.initd-r1 new file mode 100644 index 000000000000..b895f2257aa7 --- /dev/null +++ b/sys-process/acct/files/acct.initd-r1 @@ -0,0 +1,34 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_started_commands="report" + +depend() { + need localmount +} + +checkconfig() { + export ACCT_LOG=${ACCT_LOG:-/var/account/pacct} + checkpath -f -m 600 "${ACCT_LOG}" + return 0 +} + +start() { + checkconfig || return 1 + + ebegin "Starting accounting" + accton "${ACCT_LOG}" >/dev/null + eend $? +} + +stop() { + ebegin "Stopping accounting" + accton off >/dev/null + eend $? +} + +report() { + sa ${REPORT_OPTS} "${ACCT_LOG}" +} diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.370.0-r2.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.370.0-r2.ebuild index 688a3475967f..42cb2371dd25 100644 --- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.370.0-r2.ebuild +++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.370.0-r2.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 # $Id$ @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest index 9c1de130b0e5..7faa7f4e92a2 100644 --- a/www-apps/phpBB/Manifest +++ b/www-apps/phpBB/Manifest @@ -1,3 +1 @@ -DIST phpBB-3.0.10.tar.bz2 1576431 SHA256 6060dde45558a786dfb8c3787996f8760426b30e3d07a1180c195229ccc6bc96 SHA512 07905dbfed2ca5cd720a96863a15339f5b1a0229b90a5992b434afbf7a7e3e7bc15b2d24d2d1c77bed8049dc901718f0d368e17dd2aea5703f550c01f3735323 WHIRLPOOL d9f42e40cc54e4988d2888d934c8df0f0386e0fc109dd92a71a5f19400b8b42c29934f431d2e0cd17513cfe155ae066c740bf394d9bbb23081bb18fa9147de66 -DIST phpBB-3.0.11.tar.bz2 1589870 SHA256 b8c40b8cad58a458442bf04cb2632e350a76e7fb688e2820f8afd92887e751f2 SHA512 54ad6c1f673c522a7e7e651eb878942c0c947f9a9096b9eb82483df00aaf7b65e98d4c441c081c05c99d4bec8f5086bd9807c3f3860e3b0ea727d55d47ed6d4c WHIRLPOOL 801efd14407bf1d58a41fb7bad1da7936d696ec86026440baaf35acf7b7d88a6e7e5fdf23e67a86b2373fc5807d541df3c7702c13e17fff9bb81cd873221dc94 -DIST phpBB-3.0.12.tar.bz2 1600626 SHA256 14f216807063017a0110c6b36f1e4c0131e0ba4c42322ec6be77392059a197a8 SHA512 d1992afcd1b107a320c6c1421917d1b25ddd6ec33784749d78ca3ebea38cf786e91e96495cb47f0389d0f6d4c721f146c8e394826e2d01ebc29f0d3534620153 WHIRLPOOL 7a9a78e5b09106da5673f180908b93e331ed9789ef68b7785fcd3b4e23683941c54b7ff6e15f6887a73e931454264c5d70336c8f0cbdf09919eb2adea8ce7e44 +DIST phpBB-3.1.10.tar.bz2 2150999 SHA256 198fda1a0bd833d42e0d4f4fe26a47d656a6e087ed9a561e06b0940de131a22c SHA512 077a529075ea4e0691f9125be521b3fa8d4a078f9234b40bc5495faf00e1389808da40176ab8c8d9c66db259ebbf252d7292919d5c8e96e93c0bbda8d19695e2 WHIRLPOOL a41d9a602563a23fcf644967c374c0af4ae28e6a003e7fe0bbafe7af87c9417a87e0ec96978dba7819e022a46c46383e5ff19214ec7d39171146f689c0054565 diff --git a/www-apps/phpBB/metadata.xml b/www-apps/phpBB/metadata.xml index 2b9b44f73497..dee8adaf3281 100644 --- a/www-apps/phpBB/metadata.xml +++ b/www-apps/phpBB/metadata.xml @@ -5,4 +5,9 @@ web-apps@gentoo.org Gentoo Webapps + + chewi@gentoo.org + James Le Cuirot + Maintainer + diff --git a/www-apps/phpBB/phpBB-3.0.10.ebuild b/www-apps/phpBB/phpBB-3.0.10.ebuild deleted file mode 100644 index 7888abfdce8f..000000000000 --- a/www-apps/phpBB/phpBB-3.0.10.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit webapp - -DESCRIPTION="phpBB is an open-source bulletin board package" -HOMEPAGE="http://www.phpbb.com/" -SRC_URI="http://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ppc ~sparc x86" -IUSE="" - -RDEPEND="virtual/httpd-php" - -need_httpd_cgi - -S=${WORKDIR}/${PN}3 - -src_install() { - webapp_src_preinst - - dodoc docs/* - rm -rf docs - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_serverowned "${MY_HTDOCSDIR}"/cache - webapp_serverowned "${MY_HTDOCSDIR}"/files - webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/upload - webapp_serverowned "${MY_HTDOCSDIR}"/store - webapp_serverowned "${MY_HTDOCSDIR}"/config.php - webapp_configfile "${MY_HTDOCSDIR}"/config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_src_install -} diff --git a/www-apps/phpBB/phpBB-3.0.11.ebuild b/www-apps/phpBB/phpBB-3.0.11.ebuild deleted file mode 100644 index 7888abfdce8f..000000000000 --- a/www-apps/phpBB/phpBB-3.0.11.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit webapp - -DESCRIPTION="phpBB is an open-source bulletin board package" -HOMEPAGE="http://www.phpbb.com/" -SRC_URI="http://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ppc ~sparc x86" -IUSE="" - -RDEPEND="virtual/httpd-php" - -need_httpd_cgi - -S=${WORKDIR}/${PN}3 - -src_install() { - webapp_src_preinst - - dodoc docs/* - rm -rf docs - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_serverowned "${MY_HTDOCSDIR}"/cache - webapp_serverowned "${MY_HTDOCSDIR}"/files - webapp_serverowned "${MY_HTDOCSDIR}"/images/avatars/upload - webapp_serverowned "${MY_HTDOCSDIR}"/store - webapp_serverowned "${MY_HTDOCSDIR}"/config.php - webapp_configfile "${MY_HTDOCSDIR}"/config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_src_install -} diff --git a/www-apps/phpBB/phpBB-3.0.12.ebuild b/www-apps/phpBB/phpBB-3.1.10.ebuild similarity index 58% rename from www-apps/phpBB/phpBB-3.0.12.ebuild rename to www-apps/phpBB/phpBB-3.1.10.ebuild index eafa0c8eacca..c5880ae562bf 100644 --- a/www-apps/phpBB/phpBB-3.0.12.ebuild +++ b/www-apps/phpBB/phpBB-3.1.10.ebuild @@ -1,30 +1,30 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit webapp -DESCRIPTION="phpBB is an open-source bulletin board package" +DESCRIPTION="An open-source bulletin board package" HOMEPAGE="http://www.phpbb.com/" SRC_URI="http://download.phpbb.com/pub/release/${PV:0:3}/${PV}/${P}.tar.bz2" - LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~sparc ~x86" +IUSE="ftp gd imagemagick mssql mysqli postgres sqlite xml zlib" -RDEPEND="virtual/httpd-php" +PHPV="5*:*" +RDEPEND="=virtual/httpd-php-${PHPV} + =dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?] + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )" need_httpd_cgi -S=${WORKDIR}/${PN}3 +S="${WORKDIR}/${PN}${PV%%.*}" src_install() { webapp_src_preinst - dodoc docs/* - rm -rf docs - insinto "${MY_HTDOCSDIR}" doins -r . @@ -37,4 +37,7 @@ src_install() { webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt webapp_src_install + + # phpBB needs docs together with the other files. + dosym "${MY_HTDOCSDIR}"/docs /usr/share/doc/${PF} } diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index f9509228ddfc..92392fff5f37 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -3,6 +3,7 @@ DIST nginx-1.10.1.tar.gz 909077 SHA256 1fd35846566485e03c0e318989561c135c598323f DIST nginx-1.10.2.tar.gz 910812 SHA256 1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2 SHA512 f2d5a4fbabaf9333bae46461bcbe3dbcc5ff7e8f8c7a5dead3063e3d59c9ec15dc85262a23ca7d693db45a50ec98a70fb216b3da9872ee23d57b6bfaf064876e WHIRLPOOL 7e819f43a68de49d3cceb3e5ec81eef6872859df0abca2be00fb73c8779c2716b6997ea5f8cadb93af195d9f4d07a4404f51e0752dd881628de93a0c0289aea7 DIST nginx-1.11.5.tar.gz 956517 SHA256 223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6 SHA512 f41b21b5d8c6b7fe7f8713e96fb6b1c40da49bf64ebb790fb5aa38f036a37b36fcf048ff72c2216552b2f75366b30c5fcdef26312bd4e5515b2476a1cd944b8c WHIRLPOOL fba49ae277ec2114b06eb0fdce87161ac7bd3e0ca90387dc58caf327c5f12056be07eeba677ff37c59e7d759054ec276ce4db647250774c57588619a1803592c DIST nginx-1.11.6.tar.gz 960331 SHA256 3153abbb518e2d9c032e1b127da3dc0028ad36cd4679e5f3be0b8afa33bc85bd SHA512 1969f527d4554a976d14e82c2297c519a0d0d82a9fbd3cc703ab42a23067c7fcf101ddf16f1abff374c71f37969fd7c58d2a344c57566538b821acc32cd3d979 WHIRLPOOL 67ed24c25b20f6d94f3a0602946f750b4efafd79d3a093a35fdf370a20377abcc2a54c00fcd5e7bc54305515da9234fb2f192c744a7fb59c4bbdee2ba0c0f626 +DIST nginx-1.11.8.tar.gz 964918 SHA256 53aef3715d79015314c2dcb18f2b185a0c64368cc01b30bdf0737a215f666b34 SHA512 4bbecf17579022cc925af8808554983c57e4f438edc8f987751413f0a023267a4766edc8321cbbe8a8b675f7e86d8a2cba76bd52236c8d9509b2b301ab349ffa WHIRLPOOL a30ad4cdc0b74e0f860938942caeee961759ceabae8735725a989db29702b366fb285079a992cbc681ec3fd157ef6f8907f6a3eac13a8af302daad94ca867738 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92 WHIRLPOOL ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2 DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da9666671 WHIRLPOOL 26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 WHIRLPOOL 38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07 diff --git a/www-servers/nginx/files/nginx.confd b/www-servers/nginx/files/nginx.confd new file mode 100644 index 000000000000..f4b804375e92 --- /dev/null +++ b/www-servers/nginx/files/nginx.confd @@ -0,0 +1,32 @@ +# /etc/conf.d/nginx + +# Configuration file +#NGINX_CONFIGFILE="/etc/nginx/nginx.conf" + +# PID file +# If you should ever change this, remember to update +# "/etc/logrotate.d/nginx", too. +#NGINX_PIDFILE="/run/nginx.pid" + +# User to run nginx as +# If you should ever change this, make sure this user has +# execution permission on any of your log directories +# (/var/log/nginx per default) but do NOT forget other log directories +# one of your vhost(s) maybe using or logging after logrotation will +# be broken). +#NGINX_USER="nginx" + +# Group to run nginx as +# See the note above regarding NGINX_USER. +#NGINX_GROUP="nginx" + +# You can use this configuration option to pass additional options to the +# start-stop-daemon, see start-stop-daemon(8) for more details. +# Per default we wait 1000ms after we have started the service to ensure +# that the daemon is really up and running. +#NGINX_SSDARGS="--wait 1000" + +# The termination timeout (start-stop-daemon parameter "retry") ensures +# that the service will be terminated within a given time (60 + 5 seconds +# per default) when you are stopping the service. +#NGINX_TERMTIMEOUT="TERM/60/KILL/5" diff --git a/www-servers/nginx/files/nginx.initd-r4 b/www-servers/nginx/files/nginx.initd-r4 new file mode 100644 index 000000000000..1b7385f80c3f --- /dev/null +++ b/www-servers/nginx/files/nginx.initd-r4 @@ -0,0 +1,93 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_commands="configtest" +extra_started_commands="upgrade reload" + +description="Robust, small and high performance http and reverse proxy server" +description_configtest="Run nginx' internal config check." +description_upgrade="Upgrade the nginx binary without losing connections." +description_reload="Reload the nginx configuration without losing connections." + +NGINX_CONFIGFILE=${NGINX_CONFIGFILE:-/etc/nginx/nginx.conf} + +command="/usr/sbin/nginx" +command_args="-c \"${NGINX_CONFIGFILE}\"" +start_stop_daemon_args=${NGINX_SSDARGS:-"--wait 1000"} +pidfile=${NGINX_PIDFILE:-/run/nginx.pid} +user=${NGINX_USER:-nginx} +group=${NGINX_GROUP:-nginx} +retry=${NGINX_TERMTIMEOUT:-"TERM/60/KILL/5"} + +depend() { + need net + use dns logger netmount +} + +start_pre() { + if [ "${RC_CMD}" != "restart" ]; then + configtest || return 1 + fi +} + +stop_pre() { + if [ "${RC_CMD}" = "restart" ]; then + configtest || return 1 + fi +} + +stop_post() { + rm -f ${pidfile} +} + +reload() { + configtest || return 1 + ebegin "Refreshing nginx' configuration" + start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" + eend $? "Failed to reload nginx" +} + +upgrade() { + configtest || return 1 + ebegin "Upgrading nginx" + + einfo "Sending USR2 to old binary" + start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}" + + einfo "Sleeping 3 seconds before pid-files checking" + sleep 3 + + if [ ! -f "${pidfile}.oldbin" ]; then + eerror "File with old pid not found" + return 1 + fi + + if [ ! -f "${pidfile}" ]; then + eerror "New binary failed to start" + return 1 + fi + + einfo "Sleeping 3 seconds before WINCH" + sleep 3 + # Cannot send "WINCH" using start-stop-daemon yet, https://bugs.gentoo.org/604986 + kill -WINCH $(cat "${pidfile}.oldbin") + + einfo "Sending QUIT to old binary" + start-stop-daemon --signal SIGQUIT --pidfile "${pidfile}.oldbin" + + einfo "Upgrade completed" + eend $? "Upgrade failed" +} + +configtest() { + ebegin "Checking nginx' configuration" + ${command} -c "${NGINX_CONFIGFILE}" -t -q + + if [ $? -ne 0 ]; then + ${command} -c "${NGINX_CONFIGFILE}" -t + fi + + eend $? "failed, please correct errors above" +} diff --git a/www-servers/nginx/nginx-1.10.2-r3.ebuild b/www-servers/nginx/nginx-1.10.2-r3.ebuild new file mode 100644 index 000000000000..4da4e5c8c67d --- /dev/null +++ b/www-servers/nginx/nginx-1.10.2-r3.ebuild @@ -0,0 +1,986 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# Maintainer notes: +# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite +# - any http-module activates the main http-functionality and overrides USE=-http +# - keep the following requirements in mind before adding external modules: +# * alive upstream +# * sane packaging +# * builds cleanly +# * does not need a patch for nginx core +# - TODO: test the google-perftools module (included in vanilla tarball) + +# prevent perl-module from adding automagic perl DEPENDs +GENTOO_DEPEND_ON_PERL="no" + +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.3.0" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" +DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" + +# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) +HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" +HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" + +# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) +HTTP_HEADERS_MORE_MODULE_PV="0.32" +HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.10" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + +# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) +HTTP_FANCYINDEX_MODULE_PV="0.4.1" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" + +# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.10.7" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" +HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" + +# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) +HTTP_AUTH_PAM_MODULE_PV="1.5.1" +HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" +HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" +HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" + +# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) +HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-gf3bdb7b" +HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" +HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" +HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-f3bdb7b85a194e2ad58e3c306c1d021ee76da2f5" + +# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) +HTTP_METRICS_MODULE_PV="0.1.1" +HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" +HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" +HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.55.1" +HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" +HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" +HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" + +# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) +RTMP_MODULE_PV="1.1.10" +RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" +RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" +RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" + +# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) +HTTP_DAV_EXT_MODULE_PV="0.0.3" +HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" +HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" +HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" + +# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license) +HTTP_ECHO_MODULE_PV="0.60" +HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" +HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" +HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" + +# mod_security for nginx (https://modsecurity.org/, Apache-2.0) +# keep the MODULE_P here consistent with upstream to avoid tarball duplication +HTTP_SECURITY_MODULE_PV="2.9.1" +HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" +HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" +HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" + +# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) +HTTP_PUSH_STREAM_MODULE_PV="0.5.2" +HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" +HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" +HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" + +# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) +HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42" +HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" +HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" +HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42" + +# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2) +HTTP_MOGILEFS_MODULE_PV="1.0.4" +HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" +HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz" +HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" + +# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) +HTTP_MEMC_MODULE_PV="0.17" +HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" +HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" +HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" + +# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2) +HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc" +HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" +HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz" +HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" + +# We handle deps below ourselves +SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="http://nginx.org" +SRC_URI="http://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) + nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) + nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )" + +LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo gzip limit_req limit_conn map memcached proxy referer + rewrite scgi ssi split_clients upstream_ip_hash userid uwsgi" +NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip + gzip_static image_filter mp4 perl random_index realip secure_link + slice stub_status sub xslt" +NGINX_MODULES_STREAM="access limit_conn upstream" +NGINX_MODULES_MAIL="imap pop3 smtp" +NGINX_MODULES_3RD=" + http_upload_progress + http_headers_more + http_cache_purge + http_slowfs_cache + http_fancyindex + http_lua + http_auth_pam + http_upstream_check + http_metrics + http_naxsi + http_dav_ext + http_echo + http_security + http_push_stream + http_sticky + http_mogilefs + http_memc + http_auth_ldap" + +IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" + +for mod in $NGINX_MODULES_STD; do + IUSE="${IUSE} +nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_OPT; do + IUSE="${IUSE} nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_STREAM; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_MAIL; do + IUSE="${IUSE} nginx_modules_mail_${mod}" +done + +for mod in $NGINX_MODULES_3RD; do + IUSE="${IUSE} nginx_modules_${mod}" +done + +# Add so we can warn users updating about config changes +# @TODO: jbergstroem: remove on next release series +IUSE="${IUSE} nginx_modules_http_spdy" + +CDEPEND=" + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http2? ( + !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http-cache? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_gunzip? ( sys-libs/zlib ) + nginx_modules_http_gzip? ( sys-libs/zlib ) + nginx_modules_http_gzip_static? ( sys-libs/zlib ) + nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) + nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) + nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) + nginx_modules_http_secure_link? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) + nginx_modules_http_auth_pam? ( virtual/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/expat ) + nginx_modules_http_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) + nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:mainline" +DEPEND="${CDEPEND} + nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} ) + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +REQUIRED_USE="pcre-jit? ( pcre ) + nginx_modules_http_lua? ( nginx_modules_http_rewrite ) + nginx_modules_http_naxsi? ( pcre ) + nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) + nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) + nginx_modules_http_security? ( pcre ) + nginx_modules_http_push_stream? ( ssl )" + +pkg_setup() { + NGINX_HOME="/var/lib/nginx" + NGINX_HOME_TMP="${NGINX_HOME}/tmp" + + ebegin "Creating nginx user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} + eend $? + + if use libatomic; then + ewarn "GCC 4.1+ features built-in atomic operations." + ewarn "Using libatomic_ops is only needed if using" + ewarn "a different compiler or a GCC prior to 4.1" + fi + + if [[ -n $NGINX_ADD_MODULES ]]; then + ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" + ewarn "This nginx installation is not supported!" + ewarn "Make sure you can reproduce the bug without those modules" + ewarn "_before_ reporting bugs." + fi + + if use !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi + + if use nginx_modules_http_mogilefs && use threads; then + eerror "mogilefs won't compile with threads support." + eerror "Please disable either flag and try again." + die "Can't compile mogilefs with threads support" + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" + eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" + + if use nginx_modules_http_upstream_check; then + eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".patch + fi + + if use nginx_modules_http_lua; then + sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + eapply "${FILESDIR}"/http_security-pr_1158.patch + + eautoreconf + + if use luajit ; then + sed -i \ + -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ + configure || die + fi + + cd "${S}" || die + fi + + if use nginx_modules_http_upload_progress; then + cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die + eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch + cd "${S}" || die + fi + + if use nginx_modules_http_memc; then + cd "${HTTP_MEMC_MODULE_WD}" || die + eapply "${FILESDIR}"/http_memc-0.17-issue_26.patch + cd "${S}" || die + fi + + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die + # We have config protection, don't rename etc files + sed -i 's:.default::' auto/install || die + # remove useless files + sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + + # don't install to /etc/nginx/ if not in use + local module + for module in fastcgi scgi uwsgi ; do + if ! use nginx_modules_http_${module}; then + sed -i -e "/${module}/d" auto/install || die + fi + done + + eapply_user +} + +src_configure() { + # mod_security needs to generate nginx/modsecurity/config before including it + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + ./configure \ + --enable-standalone-module \ + --disable-mlogc \ + --with-ssdeep=no \ + $(use_enable pcre-jit) \ + $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" + + cd "${S}" || die + fi + + local myconf=() http_enabled= mail_enabled= stream_enabled= + + use aio && myconf+=( --with-file-aio ) + use debug && myconf+=( --with-debug ) + use http2 && myconf+=( --with-http_v2_module ) + use ipv6 && myconf+=( --with-ipv6 ) + use libatomic && myconf+=( --with-libatomic ) + use pcre && myconf+=( --with-pcre ) + use pcre-jit && myconf+=( --with-pcre-jit ) + use threads && myconf+=( --with-threads ) + + # HTTP modules + for mod in $NGINX_MODULES_STD; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + else + myconf+=( --without-http_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_OPT; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + myconf+=( --with-http_${mod}_module ) + fi + done + + if use nginx_modules_http_fastcgi; then + myconf+=( --with-http_realip_module ) + fi + + # third-party modules + if use nginx_modules_http_upload_progress; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) + fi + + if use nginx_modules_http_headers_more; then + http_enabled=1 + myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) + fi + + if use nginx_modules_http_cache_purge; then + http_enabled=1 + myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) + fi + + if use nginx_modules_http_fancyindex; then + http_enabled=1 + myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + if use luajit; then + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + else + export LUA_LIB=$(pkg-config --variable libdir lua) + export LUA_INC=$(pkg-config --variable includedir lua) + fi + myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) + myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_pam; then + http_enabled=1 + myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) + fi + + if use nginx_modules_http_upstream_check; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) + fi + + if use nginx_modules_http_metrics; then + http_enabled=1 + myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) + fi + + if use nginx_modules_http_naxsi ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) + fi + + if use rtmp ; then + http_enabled=1 + myconf+=( --add-module=${RTMP_MODULE_WD} ) + fi + + if use nginx_modules_http_dav_ext ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) + fi + + if use nginx_modules_http_echo ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) + fi + + if use nginx_modules_http_security ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) + fi + + if use nginx_modules_http_push_stream ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) + fi + + if use nginx_modules_http_sticky ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) + fi + + if use nginx_modules_http_mogilefs ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) + fi + + if use nginx_modules_http_memc ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_ldap; then + http_enabled=1 + myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) + fi + + if use http || use http-cache || use http2; then + http_enabled=1 + fi + + if [ $http_enabled ]; then + use http-cache || myconf+=( --without-http-cache ) + use ssl && myconf+=( --with-http_ssl_module ) + else + myconf+=( --without-http --without-http-cache ) + fi + + # Stream modules + for mod in $NGINX_MODULES_STREAM; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + else + # Treat stream upstream slightly differently + if ! use nginx_modules_stream_upstream; then + myconf+=( --without-stream_upstream_hash_module ) + myconf+=( --without-stream_upstream_least_conn_module ) + myconf+=( --without-stream_upstream_zone_module ) + else + myconf+=( --without-stream_${mod}_module ) + fi + fi + done + + if [ $stream_enabled ]; then + myconf+=( --with-stream ) + use ssl && myconf+=( --with-stream_ssl_module ) + fi + + # MAIL modules + for mod in $NGINX_MODULES_MAIL; do + if use nginx_modules_mail_${mod}; then + mail_enabled=1 + else + myconf+=( --without-mail_${mod}_module ) + fi + done + + if [ $mail_enabled ]; then + myconf+=( --with-mail ) + use ssl && myconf+=( --with-mail_ssl_module ) + fi + + # custom modules + for mod in $NGINX_ADD_MODULES; do + myconf+=( --add-module=${mod} ) + done + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + tc-export CC + + if ! use prefix; then + myconf+=( --user=${PN} ) + myconf+=( --group=${PN} ) + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ + --pid-path="${EPREFIX}"/run/${PN}.pid \ + --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ + --with-cc-opt="-I${EROOT}usr/include" \ + --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ + "${myconf[@]}" || die "configure failed" + + # A purely cosmetic change that makes nginx -V more readable. This can be + # good if people outside the gentoo community would troubleshoot and + # question the users setup. + sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die +} + +src_compile() { + use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D%/}" install + + cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die + + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx + + systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service + + doman man/nginx.8 + dodoc CHANGES* README + + # just keepdir. do not copy the default htdocs files (bug #449136) + keepdir /var/www/localhost + rm -rf "${D}"usr/html || die + + # set up a list of directories to keep + local keepdir_list="${NGINX_HOME_TMP}"/client + local module + for module in proxy fastcgi scgi uwsgi; do + use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" + done + + keepdir /var/log/nginx ${keepdir_list} + + # this solves a problem with SELinux where nginx doesn't see the directories + # as root and tries to create them as nginx + fperms 0750 "${NGINX_HOME_TMP}" + fowners ${PN}:0 "${NGINX_HOME_TMP}" + + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use nginx_modules_http_perl; then + cd "${S}"/objs/src/http/modules/perl/ || die + emake DESTDIR="${D}" INSTALLDIRS=vendor + perl_delete_localpod + cd "${S}" || die + fi + + if use nginx_modules_http_cache_purge; then + docinto ${HTTP_CACHE_PURGE_MODULE_P} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} + fi + + if use nginx_modules_http_fancyindex; then + docinto ${HTTP_FANCYINDEX_MODULE_P} + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_pam; then + docinto ${HTTP_AUTH_PAM_MODULE_P} + dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} + fi + + if use nginx_modules_http_upstream_check; then + docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} + dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} + fi + + if use nginx_modules_http_naxsi; then + insinto /etc/nginx + doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules + fi + + if use rtmp; then + docinto ${RTMP_MODULE_P} + dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} + fi + + if use nginx_modules_http_dav_ext; then + docinto ${HTTP_DAV_EXT_MODULE_P} + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + fi + + if use nginx_modules_http_echo; then + docinto ${HTTP_ECHO_MODULE_P} + dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_security; then + docinto ${HTTP_SECURITY_MODULE_P} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + fi + + if use nginx_modules_http_push_stream; then + docinto ${HTTP_PUSH_STREAM_MODULE_P} + dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} + fi + + if use nginx_modules_http_sticky; then + docinto ${HTTP_STICKY_MODULE_P} + dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} + fi + + if use nginx_modules_http_memc; then + docinto ${HTTP_MEMC_MODULE_P} + dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_ldap; then + docinto ${HTTP_LDAP_MODULE_P} + dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf + fi +} + +pkg_postinst() { + if use ssl; then + if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + fi + + if use nginx_modules_http_spdy; then + ewarn "In nginx 1.9.5 the spdy module was superseded by http2." + ewarn "Update your configs and package.use accordingly." + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "This is a one-time change and will not happen on subsequent updates." + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files in your server block(s)." + ewarn "" + ewarn "If this is causing any problems for you make sure that you are sourcing the" + ewarn "default parameters _before_ you set your own values." + ewarn "If you are relying on user-supplied proxy values you have to remove the" + ewarn "correlating lines from the file(s) mentioned above." + ewarn "" + fi +} diff --git a/www-servers/nginx/nginx-1.11.6-r1.ebuild b/www-servers/nginx/nginx-1.11.6-r1.ebuild new file mode 100644 index 000000000000..49ffa0aeb2fc --- /dev/null +++ b/www-servers/nginx/nginx-1.11.6-r1.ebuild @@ -0,0 +1,999 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# Maintainer notes: +# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite +# - any http-module activates the main http-functionality and overrides USE=-http +# - keep the following requirements in mind before adding external modules: +# * alive upstream +# * sane packaging +# * builds cleanly +# * does not need a patch for nginx core +# - TODO: test the google-perftools module (included in vanilla tarball) + +# prevent perl-module from adding automagic perl DEPENDs +GENTOO_DEPEND_ON_PERL="no" + +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.3.0" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" +DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" + +# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) +HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" +HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" + +# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) +HTTP_HEADERS_MORE_MODULE_PV="0.32" +HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.10" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + +# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) +HTTP_FANCYINDEX_MODULE_PV="0.4.1" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" + +# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.10.7" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" +HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" + +# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) +HTTP_AUTH_PAM_MODULE_PV="1.5.1" +HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" +HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" +HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" + +# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) +HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-gf3bdb7b" +HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" +HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" +HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-f3bdb7b85a194e2ad58e3c306c1d021ee76da2f5" + +# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) +HTTP_METRICS_MODULE_PV="0.1.1" +HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" +HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" +HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.55.1" +HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" +HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" +HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" + +# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) +RTMP_MODULE_PV="1.1.10" +RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" +RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" +RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" + +# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) +HTTP_DAV_EXT_MODULE_PV="0.0.3" +HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" +HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" +HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" + +# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license) +HTTP_ECHO_MODULE_PV="0.60" +HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" +HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" +HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" + +# mod_security for nginx (https://modsecurity.org/, Apache-2.0) +# keep the MODULE_P here consistent with upstream to avoid tarball duplication +HTTP_SECURITY_MODULE_PV="2.9.1" +HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" +HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" +HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" + +# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) +HTTP_PUSH_STREAM_MODULE_PV="0.5.2" +HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" +HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" +HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" + +# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) +HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42" +HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" +HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" +HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42" + +# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2) +HTTP_MOGILEFS_MODULE_PV="1.0.4" +HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" +HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz" +HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" + +# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) +HTTP_MEMC_MODULE_PV="0.17" +HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" +HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" +HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" + +# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2) +HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc" +HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" +HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz" +HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" + +# We handle deps below ourselves +SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="http://nginx.org" +SRC_URI="http://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) + nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) + nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )" + +LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo gzip limit_req limit_conn map memcached proxy referer + rewrite scgi ssi split_clients upstream_hash upstream_ip_hash + upstream_keepalive upstream_least_conn upstream_zone userid uwsgi" +NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip + gzip_static image_filter mp4 perl random_index realip secure_link + slice stub_status sub xslt" +NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients + upstream_hash upstream_least_conn upstream_zone" +NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread" +NGINX_MODULES_MAIL="imap pop3 smtp" +NGINX_MODULES_3RD=" + http_upload_progress + http_headers_more + http_cache_purge + http_slowfs_cache + http_fancyindex + http_lua + http_auth_pam + http_upstream_check + http_metrics + http_naxsi + http_dav_ext + http_echo + http_security + http_push_stream + http_sticky + http_mogilefs + http_memc + http_auth_ldap" + +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" + +for mod in $NGINX_MODULES_STD; do + IUSE="${IUSE} +nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_OPT; do + IUSE="${IUSE} nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_STD; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_OPT; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_MAIL; do + IUSE="${IUSE} nginx_modules_mail_${mod}" +done + +for mod in $NGINX_MODULES_3RD; do + IUSE="${IUSE} nginx_modules_${mod}" +done + +# Add so we can warn users updating about config changes +# @TODO: jbergstroem: remove on next release series +IUSE="${IUSE} nginx_modules_http_spdy" + +CDEPEND=" + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http2? ( + !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http-cache? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_gunzip? ( sys-libs/zlib ) + nginx_modules_http_gzip? ( sys-libs/zlib ) + nginx_modules_http_gzip_static? ( sys-libs/zlib ) + nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) + nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) + nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) + nginx_modules_http_secure_link? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) + nginx_modules_http_auth_pam? ( virtual/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/expat ) + nginx_modules_http_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) + nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} ) + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +REQUIRED_USE="pcre-jit? ( pcre ) + nginx_modules_http_lua? ( nginx_modules_http_rewrite ) + nginx_modules_http_naxsi? ( pcre ) + nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) + nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) + nginx_modules_http_security? ( pcre ) + nginx_modules_http_push_stream? ( ssl )" + +pkg_setup() { + NGINX_HOME="/var/lib/nginx" + NGINX_HOME_TMP="${NGINX_HOME}/tmp" + + ebegin "Creating nginx user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} + eend $? + + if use libatomic; then + ewarn "GCC 4.1+ features built-in atomic operations." + ewarn "Using libatomic_ops is only needed if using" + ewarn "a different compiler or a GCC prior to 4.1" + fi + + if [[ -n $NGINX_ADD_MODULES ]]; then + ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" + ewarn "This nginx installation is not supported!" + ewarn "Make sure you can reproduce the bug without those modules" + ewarn "_before_ reporting bugs." + fi + + if use !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi + + if use nginx_modules_http_mogilefs && use threads; then + eerror "mogilefs won't compile with threads support." + eerror "Please disable either flag and try again." + die "Can't compile mogilefs with threads support" + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" + eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" + + if use nginx_modules_http_upstream_check; then + #eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch + eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch + fi + + if use nginx_modules_http_lua; then + sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + eapply "${FILESDIR}"/http_security-pr_1158.patch + + eautoreconf + + if use luajit ; then + sed -i \ + -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ + configure || die + fi + + cd "${S}" || die + fi + + if use nginx_modules_http_upload_progress; then + cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die + eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch + cd "${S}" || die + fi + + if use nginx_modules_http_memc; then + cd "${HTTP_MEMC_MODULE_WD}" || die + eapply "${FILESDIR}"/http_memc-0.17-issue_26.patch + cd "${S}" || die + fi + + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die + # We have config protection, don't rename etc files + sed -i 's:.default::' auto/install || die + # remove useless files + sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + + # don't install to /etc/nginx/ if not in use + local module + for module in fastcgi scgi uwsgi ; do + if ! use nginx_modules_http_${module}; then + sed -i -e "/${module}/d" auto/install || die + fi + done + + eapply_user +} + +src_configure() { + # mod_security needs to generate nginx/modsecurity/config before including it + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + ./configure \ + --enable-standalone-module \ + --disable-mlogc \ + --with-ssdeep=no \ + $(use_enable pcre-jit) \ + $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" + + cd "${S}" || die + fi + + local myconf=() http_enabled= mail_enabled= stream_enabled= + + use aio && myconf+=( --with-file-aio ) + use debug && myconf+=( --with-debug ) + use http2 && myconf+=( --with-http_v2_module ) + use libatomic && myconf+=( --with-libatomic ) + use pcre && myconf+=( --with-pcre ) + use pcre-jit && myconf+=( --with-pcre-jit ) + use threads && myconf+=( --with-threads ) + + # HTTP modules + for mod in $NGINX_MODULES_STD; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + else + myconf+=( --without-http_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_OPT; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + myconf+=( --with-http_${mod}_module ) + fi + done + + if use nginx_modules_http_fastcgi; then + myconf+=( --with-http_realip_module ) + fi + + # third-party modules + if use nginx_modules_http_upload_progress; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) + fi + + if use nginx_modules_http_headers_more; then + http_enabled=1 + myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) + fi + + if use nginx_modules_http_cache_purge; then + http_enabled=1 + myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) + fi + + if use nginx_modules_http_fancyindex; then + http_enabled=1 + myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + if use luajit; then + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + else + export LUA_LIB=$(pkg-config --variable libdir lua) + export LUA_INC=$(pkg-config --variable includedir lua) + fi + myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) + myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_pam; then + http_enabled=1 + myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) + fi + + if use nginx_modules_http_upstream_check; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) + fi + + if use nginx_modules_http_metrics; then + http_enabled=1 + myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) + fi + + if use nginx_modules_http_naxsi ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) + fi + + if use rtmp ; then + http_enabled=1 + myconf+=( --add-module=${RTMP_MODULE_WD} ) + fi + + if use nginx_modules_http_dav_ext ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) + fi + + if use nginx_modules_http_echo ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) + fi + + if use nginx_modules_http_security ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) + fi + + if use nginx_modules_http_push_stream ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) + fi + + if use nginx_modules_http_sticky ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) + fi + + if use nginx_modules_http_mogilefs ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) + fi + + if use nginx_modules_http_memc ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_ldap; then + http_enabled=1 + myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) + fi + + if use http || use http-cache || use http2; then + http_enabled=1 + fi + + if [ $http_enabled ]; then + use http-cache || myconf+=( --without-http-cache ) + use ssl && myconf+=( --with-http_ssl_module ) + else + myconf+=( --without-http --without-http-cache ) + fi + + # Stream modules + for mod in $NGINX_MODULES_STREAM_STD; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + else + myconf+=( --without-stream_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_STREAM_OPT; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + myconf+=( --with-stream_${mod}_module ) + fi + done + + if [ $stream_enabled ]; then + myconf+=( --with-stream ) + use ssl && myconf+=( --with-stream_ssl_module ) + fi + + # MAIL modules + for mod in $NGINX_MODULES_MAIL; do + if use nginx_modules_mail_${mod}; then + mail_enabled=1 + else + myconf+=( --without-mail_${mod}_module ) + fi + done + + if [ $mail_enabled ]; then + myconf+=( --with-mail ) + use ssl && myconf+=( --with-mail_ssl_module ) + fi + + # custom modules + for mod in $NGINX_ADD_MODULES; do + myconf+=( --add-module=${mod} ) + done + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + tc-export CC + + if ! use prefix; then + myconf+=( --user=${PN} ) + myconf+=( --group=${PN} ) + fi + + local WITHOUT_IPV6= + if ! use ipv6; then + WITHOUT_IPV6=" -DNGX_HAVE_INET6=0" + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ + --pid-path="${EPREFIX}"/run/${PN}.pid \ + --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ + --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ + --with-compat \ + "${myconf[@]}" || die "configure failed" + + # A purely cosmetic change that makes nginx -V more readable. This can be + # good if people outside the gentoo community would troubleshoot and + # question the users setup. + sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die +} + +src_compile() { + use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D%/}" install + + cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die + + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx + + systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service + + doman man/nginx.8 + dodoc CHANGES* README + + # just keepdir. do not copy the default htdocs files (bug #449136) + keepdir /var/www/localhost + rm -rf "${D}"usr/html || die + + # set up a list of directories to keep + local keepdir_list="${NGINX_HOME_TMP}"/client + local module + for module in proxy fastcgi scgi uwsgi; do + use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" + done + + keepdir /var/log/nginx ${keepdir_list} + + # this solves a problem with SELinux where nginx doesn't see the directories + # as root and tries to create them as nginx + fperms 0750 "${NGINX_HOME_TMP}" + fowners ${PN}:0 "${NGINX_HOME_TMP}" + + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use nginx_modules_http_perl; then + cd "${S}"/objs/src/http/modules/perl/ || die + emake DESTDIR="${D}" INSTALLDIRS=vendor + perl_delete_localpod + cd "${S}" || die + fi + + if use nginx_modules_http_cache_purge; then + docinto ${HTTP_CACHE_PURGE_MODULE_P} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} + fi + + if use nginx_modules_http_fancyindex; then + docinto ${HTTP_FANCYINDEX_MODULE_P} + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_pam; then + docinto ${HTTP_AUTH_PAM_MODULE_P} + dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} + fi + + if use nginx_modules_http_upstream_check; then + docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} + dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} + fi + + if use nginx_modules_http_naxsi; then + insinto /etc/nginx + doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules + fi + + if use rtmp; then + docinto ${RTMP_MODULE_P} + dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} + fi + + if use nginx_modules_http_dav_ext; then + docinto ${HTTP_DAV_EXT_MODULE_P} + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + fi + + if use nginx_modules_http_echo; then + docinto ${HTTP_ECHO_MODULE_P} + dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_security; then + docinto ${HTTP_SECURITY_MODULE_P} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + fi + + if use nginx_modules_http_push_stream; then + docinto ${HTTP_PUSH_STREAM_MODULE_P} + dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} + fi + + if use nginx_modules_http_sticky; then + docinto ${HTTP_STICKY_MODULE_P} + dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} + fi + + if use nginx_modules_http_memc; then + docinto ${HTTP_MEMC_MODULE_P} + dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_ldap; then + docinto ${HTTP_LDAP_MODULE_P} + dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf + fi +} + +pkg_postinst() { + if use ssl; then + if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + fi + + if use nginx_modules_http_spdy; then + ewarn "In nginx 1.9.5 the spdy module was superseded by http2." + ewarn "Update your configs and package.use accordingly." + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "This is a one-time change and will not happen on subsequent updates." + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files in your server block(s)." + ewarn "" + ewarn "If this is causing any problems for you make sure that you are sourcing the" + ewarn "default parameters _before_ you set your own values." + ewarn "If you are relying on user-supplied proxy values you have to remove the" + ewarn "correlating lines from the file(s) mentioned above." + ewarn "" + fi +} diff --git a/www-servers/nginx/nginx-1.11.8.ebuild b/www-servers/nginx/nginx-1.11.8.ebuild new file mode 100644 index 000000000000..d4ad6b0c231e --- /dev/null +++ b/www-servers/nginx/nginx-1.11.8.ebuild @@ -0,0 +1,999 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# Maintainer notes: +# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite +# - any http-module activates the main http-functionality and overrides USE=-http +# - keep the following requirements in mind before adding external modules: +# * alive upstream +# * sane packaging +# * builds cleanly +# * does not need a patch for nginx core +# - TODO: test the google-perftools module (included in vanilla tarball) + +# prevent perl-module from adding automagic perl DEPENDs +GENTOO_DEPEND_ON_PERL="no" + +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.3.0" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" +DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" + +# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) +HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" +HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" + +# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) +HTTP_HEADERS_MORE_MODULE_PV="0.32" +HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" + +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.10" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + +# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) +HTTP_FANCYINDEX_MODULE_PV="0.4.1" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" + +# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.10.7" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" +HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" + +# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) +HTTP_AUTH_PAM_MODULE_PV="1.5.1" +HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" +HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" +HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" + +# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) +HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-gf3bdb7b" +HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" +HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" +HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-f3bdb7b85a194e2ad58e3c306c1d021ee76da2f5" + +# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) +HTTP_METRICS_MODULE_PV="0.1.1" +HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" +HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" +HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.55.1" +HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" +HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" +HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" + +# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) +RTMP_MODULE_PV="1.1.10" +RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" +RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" +RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" + +# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) +HTTP_DAV_EXT_MODULE_PV="0.0.3" +HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" +HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" +HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" + +# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license) +HTTP_ECHO_MODULE_PV="0.60" +HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" +HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" +HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" + +# mod_security for nginx (https://modsecurity.org/, Apache-2.0) +# keep the MODULE_P here consistent with upstream to avoid tarball duplication +HTTP_SECURITY_MODULE_PV="2.9.1" +HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" +HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" +HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" + +# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) +HTTP_PUSH_STREAM_MODULE_PV="0.5.2" +HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" +HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" +HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" + +# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) +HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42" +HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" +HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" +HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42" + +# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2) +HTTP_MOGILEFS_MODULE_PV="1.0.4" +HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" +HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz" +HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" + +# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) +HTTP_MEMC_MODULE_PV="0.17" +HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" +HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" +HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" + +# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2) +HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc" +HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" +HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz" +HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}" + +# We handle deps below ourselves +SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="http://nginx.org" +SRC_URI="http://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) + nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) + nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )" + +LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo gzip limit_req limit_conn map memcached proxy referer + rewrite scgi ssi split_clients upstream_hash upstream_ip_hash + upstream_keepalive upstream_least_conn upstream_zone userid uwsgi" +NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip + gzip_static image_filter mp4 perl random_index realip secure_link + slice stub_status sub xslt" +NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients + upstream_hash upstream_least_conn upstream_zone" +NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread" +NGINX_MODULES_MAIL="imap pop3 smtp" +NGINX_MODULES_3RD=" + http_upload_progress + http_headers_more + http_cache_purge + http_slowfs_cache + http_fancyindex + http_lua + http_auth_pam + http_upstream_check + http_metrics + http_naxsi + http_dav_ext + http_echo + http_security + http_push_stream + http_sticky + http_mogilefs + http_memc + http_auth_ldap" + +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" + +for mod in $NGINX_MODULES_STD; do + IUSE="${IUSE} +nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_OPT; do + IUSE="${IUSE} nginx_modules_http_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_STD; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_STREAM_OPT; do + IUSE="${IUSE} nginx_modules_stream_${mod}" +done + +for mod in $NGINX_MODULES_MAIL; do + IUSE="${IUSE} nginx_modules_mail_${mod}" +done + +for mod in $NGINX_MODULES_3RD; do + IUSE="${IUSE} nginx_modules_${mod}" +done + +# Add so we can warn users updating about config changes +# @TODO: jbergstroem: remove on next release series +IUSE="${IUSE} nginx_modules_http_spdy" + +CDEPEND=" + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http2? ( + !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) + libressl? ( dev-libs/libressl:= ) + ) + http-cache? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_gunzip? ( sys-libs/zlib ) + nginx_modules_http_gzip? ( sys-libs/zlib ) + nginx_modules_http_gzip_static? ( sys-libs/zlib ) + nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) + nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) + nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) + nginx_modules_http_secure_link? ( + userland_GNU? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) + nginx_modules_http_auth_pam? ( virtual/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/expat ) + nginx_modules_http_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) + nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} ) + arm? ( dev-libs/libatomic_ops ) + libatomic? ( dev-libs/libatomic_ops )" +PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" + +REQUIRED_USE="pcre-jit? ( pcre ) + nginx_modules_http_lua? ( nginx_modules_http_rewrite ) + nginx_modules_http_naxsi? ( pcre ) + nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) + nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) + nginx_modules_http_security? ( pcre ) + nginx_modules_http_push_stream? ( ssl )" + +pkg_setup() { + NGINX_HOME="/var/lib/nginx" + NGINX_HOME_TMP="${NGINX_HOME}/tmp" + + ebegin "Creating nginx user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} + eend $? + + if use libatomic; then + ewarn "GCC 4.1+ features built-in atomic operations." + ewarn "Using libatomic_ops is only needed if using" + ewarn "a different compiler or a GCC prior to 4.1" + fi + + if [[ -n $NGINX_ADD_MODULES ]]; then + ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" + ewarn "This nginx installation is not supported!" + ewarn "Make sure you can reproduce the bug without those modules" + ewarn "_before_ reporting bugs." + fi + + if use !http; then + ewarn "To actually disable all http-functionality you also have to disable" + ewarn "all nginx http modules." + fi + + if use nginx_modules_http_mogilefs && use threads; then + eerror "mogilefs won't compile with threads support." + eerror "Please disable either flag and try again." + die "Can't compile mogilefs with threads support" + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" + eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" + + if use nginx_modules_http_upstream_check; then + #eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch + eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch + fi + + if use nginx_modules_http_lua; then + sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + eapply "${FILESDIR}"/http_security-pr_1158.patch + + eautoreconf + + if use luajit ; then + sed -i \ + -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ + configure || die + fi + + cd "${S}" || die + fi + + if use nginx_modules_http_upload_progress; then + cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die + eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch + cd "${S}" || die + fi + + if use nginx_modules_http_memc; then + cd "${HTTP_MEMC_MODULE_WD}" || die + eapply "${FILESDIR}"/http_memc-0.17-issue_26.patch + cd "${S}" || die + fi + + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die + # We have config protection, don't rename etc files + sed -i 's:.default::' auto/install || die + # remove useless files + sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + + # don't install to /etc/nginx/ if not in use + local module + for module in fastcgi scgi uwsgi ; do + if ! use nginx_modules_http_${module}; then + sed -i -e "/${module}/d" auto/install || die + fi + done + + eapply_user +} + +src_configure() { + # mod_security needs to generate nginx/modsecurity/config before including it + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + ./configure \ + --enable-standalone-module \ + --disable-mlogc \ + --with-ssdeep=no \ + $(use_enable pcre-jit) \ + $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" + + cd "${S}" || die + fi + + local myconf=() http_enabled= mail_enabled= stream_enabled= + + use aio && myconf+=( --with-file-aio ) + use debug && myconf+=( --with-debug ) + use http2 && myconf+=( --with-http_v2_module ) + use libatomic && myconf+=( --with-libatomic ) + use pcre && myconf+=( --with-pcre ) + use pcre-jit && myconf+=( --with-pcre-jit ) + use threads && myconf+=( --with-threads ) + + # HTTP modules + for mod in $NGINX_MODULES_STD; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + else + myconf+=( --without-http_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_OPT; do + if use nginx_modules_http_${mod}; then + http_enabled=1 + myconf+=( --with-http_${mod}_module ) + fi + done + + if use nginx_modules_http_fastcgi; then + myconf+=( --with-http_realip_module ) + fi + + # third-party modules + if use nginx_modules_http_upload_progress; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) + fi + + if use nginx_modules_http_headers_more; then + http_enabled=1 + myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) + fi + + if use nginx_modules_http_cache_purge; then + http_enabled=1 + myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) + fi + + if use nginx_modules_http_fancyindex; then + http_enabled=1 + myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + if use luajit; then + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + else + export LUA_LIB=$(pkg-config --variable libdir lua) + export LUA_INC=$(pkg-config --variable includedir lua) + fi + myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) + myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_pam; then + http_enabled=1 + myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) + fi + + if use nginx_modules_http_upstream_check; then + http_enabled=1 + myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) + fi + + if use nginx_modules_http_metrics; then + http_enabled=1 + myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) + fi + + if use nginx_modules_http_naxsi ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) + fi + + if use rtmp ; then + http_enabled=1 + myconf+=( --add-module=${RTMP_MODULE_WD} ) + fi + + if use nginx_modules_http_dav_ext ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) + fi + + if use nginx_modules_http_echo ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) + fi + + if use nginx_modules_http_security ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) + fi + + if use nginx_modules_http_push_stream ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) + fi + + if use nginx_modules_http_sticky ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) + fi + + if use nginx_modules_http_mogilefs ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) + fi + + if use nginx_modules_http_memc ; then + http_enabled=1 + myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) + fi + + if use nginx_modules_http_auth_ldap; then + http_enabled=1 + myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) + fi + + if use http || use http-cache || use http2; then + http_enabled=1 + fi + + if [ $http_enabled ]; then + use http-cache || myconf+=( --without-http-cache ) + use ssl && myconf+=( --with-http_ssl_module ) + else + myconf+=( --without-http --without-http-cache ) + fi + + # Stream modules + for mod in $NGINX_MODULES_STREAM_STD; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + else + myconf+=( --without-stream_${mod}_module ) + fi + done + + for mod in $NGINX_MODULES_STREAM_OPT; do + if use nginx_modules_stream_${mod}; then + stream_enabled=1 + myconf+=( --with-stream_${mod}_module ) + fi + done + + if [ $stream_enabled ]; then + myconf+=( --with-stream ) + use ssl && myconf+=( --with-stream_ssl_module ) + fi + + # MAIL modules + for mod in $NGINX_MODULES_MAIL; do + if use nginx_modules_mail_${mod}; then + mail_enabled=1 + else + myconf+=( --without-mail_${mod}_module ) + fi + done + + if [ $mail_enabled ]; then + myconf+=( --with-mail ) + use ssl && myconf+=( --with-mail_ssl_module ) + fi + + # custom modules + for mod in $NGINX_ADD_MODULES; do + myconf+=( --add-module=${mod} ) + done + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + tc-export CC + + if ! use prefix; then + myconf+=( --user=${PN} ) + myconf+=( --group=${PN} ) + fi + + local WITHOUT_IPV6= + if ! use ipv6; then + WITHOUT_IPV6=" -DNGX_HAVE_INET6=0" + fi + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ + --pid-path="${EPREFIX}"/run/${PN}.pid \ + --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ + --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ + --with-compat \ + "${myconf[@]}" || die "configure failed" + + # A purely cosmetic change that makes nginx -V more readable. This can be + # good if people outside the gentoo community would troubleshoot and + # question the users setup. + sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die +} + +src_compile() { + use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" + + # https://bugs.gentoo.org/286772 + export LANG=C LC_ALL=C + emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${D%/}" install + + cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die + + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx + + systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service + + doman man/nginx.8 + dodoc CHANGES* README + + # just keepdir. do not copy the default htdocs files (bug #449136) + keepdir /var/www/localhost + rm -rf "${D}"usr/html || die + + # set up a list of directories to keep + local keepdir_list="${NGINX_HOME_TMP}"/client + local module + for module in proxy fastcgi scgi uwsgi; do + use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" + done + + keepdir /var/log/nginx ${keepdir_list} + + # this solves a problem with SELinux where nginx doesn't see the directories + # as root and tries to create them as nginx + fperms 0750 "${NGINX_HOME_TMP}" + fowners ${PN}:0 "${NGINX_HOME_TMP}" + + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use nginx_modules_http_perl; then + cd "${S}"/objs/src/http/modules/perl/ || die + emake DESTDIR="${D}" INSTALLDIRS=vendor + perl_delete_localpod + cd "${S}" || die + fi + + if use nginx_modules_http_cache_purge; then + docinto ${HTTP_CACHE_PURGE_MODULE_P} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} + fi + + if use nginx_modules_http_fancyindex; then + docinto ${HTTP_FANCYINDEX_MODULE_P} + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_pam; then + docinto ${HTTP_AUTH_PAM_MODULE_P} + dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} + fi + + if use nginx_modules_http_upstream_check; then + docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} + dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} + fi + + if use nginx_modules_http_naxsi; then + insinto /etc/nginx + doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules + fi + + if use rtmp; then + docinto ${RTMP_MODULE_P} + dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} + fi + + if use nginx_modules_http_dav_ext; then + docinto ${HTTP_DAV_EXT_MODULE_P} + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + fi + + if use nginx_modules_http_echo; then + docinto ${HTTP_ECHO_MODULE_P} + dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_security; then + docinto ${HTTP_SECURITY_MODULE_P} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + fi + + if use nginx_modules_http_push_stream; then + docinto ${HTTP_PUSH_STREAM_MODULE_P} + dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} + fi + + if use nginx_modules_http_sticky; then + docinto ${HTTP_STICKY_MODULE_P} + dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} + fi + + if use nginx_modules_http_memc; then + docinto ${HTTP_MEMC_MODULE_P} + dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown + fi + + if use nginx_modules_http_auth_ldap; then + docinto ${HTTP_LDAP_MODULE_P} + dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf + fi +} + +pkg_postinst() { + if use ssl; then + if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + fi + + if use nginx_modules_http_spdy; then + ewarn "In nginx 1.9.5 the spdy module was superseded by http2." + ewarn "Update your configs and package.use accordingly." + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "This is a one-time change and will not happen on subsequent updates." + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files in your server block(s)." + ewarn "" + ewarn "If this is causing any problems for you make sure that you are sourcing the" + ewarn "default parameters _before_ you set your own values." + ewarn "If you are relying on user-supplied proxy values you have to remove the" + ewarn "correlating lines from the file(s) mentioned above." + ewarn "" + fi +} diff --git a/x11-plugins/pidgintex/Manifest b/x11-plugins/pidgintex/Manifest index 9db928d7c391..501c65f0e130 100644 --- a/x11-plugins/pidgintex/Manifest +++ b/x11-plugins/pidgintex/Manifest @@ -1 +1,2 @@ DIST pidginTeX-1.1.1.tar.gz 23322 SHA256 1b47e89d12d5f5a8de4f3f89ea37da393223d525632c92e71cef8a54399ac1aa SHA512 df58e783cc19d5aa5a57dcb337192d593ad8427a860fd0314bf3f1fe0ca248e92ef8f675cd344c5703319ecfb91f88ea88e6917b8f4c89bf92dc45dd53015bb8 WHIRLPOOL 735734a62f140eb6fa704b310f829c11899a1ea44784589f120e9e63f31b905a2b0c900637cf1df393fc3fe77f07cec33f901e412635d6de30de40fd66c0b743 +DIST pidgintex-1.1.2_p20170107.tar.gz 50671 SHA256 48c79474aa5c41270756022a481935b0f4321380c2e58455cc42369e48cc1d59 SHA512 fbbe6eb4e2a0a5c9086e65d967133ab1cdd09292ce0b0cc474b82fbbcfc6b9abbb49ed3828c8e7094b7fef629a372833ec6f143ed4eb1b7d5c4fbd32e98a0271 WHIRLPOOL a61e27562e879de12ecd7a3a295c4d22169e2863c0e551b16940330372cee116b0e6818f775b46ea0143114005df0c1d632c370cf633b068165b8904c83da631 diff --git a/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild b/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild new file mode 100644 index 000000000000..49c962ecc8be --- /dev/null +++ b/x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit toolchain-funcs vcs-snapshot + +MY_COMMIT_HASH="a8f618cf1bf92279b43c7b737010fd7e42c8e5d3" + +DESCRIPTION="Pidgin plugin to render LaTeX expressions in messages" +HOMEPAGE="https://github.com/Micket/pidgintex" +SRC_URI="https://github.com/Micket/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +RDEPEND="net-im/pidgin[gtk] + app-text/mathtex + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + sed -e "s:\(^CC.*=\).*:\1 $(tc-getCC):" \ + -e "s:\(^STRIP.*=\).*:\1 true:" \ + -e "s:\(^CFLAGS[[:space:]]*\)=:\1+=:" \ + -e "/LIB_INSTALL_DIR/{s:/lib/purple-2:/$(get_libdir)/pidgin:;}" \ + -i Makefile || die + # set default renderer to mathtex + sed -e "/purple_prefs_add_string.*PREFS_RENDERER/{s:mimetex:mathtex:;}" \ + -i pidginTeX.c || die + + if ! use nls; then + sed -e '/ENABLE_NLS = 1/ d;' -i Makefile || die + fi + + default +} + +src_compile() { + emake PREFIX=/usr +} + +src_install() { + emake PREFIX="${ED%/}/usr" install + einstalldocs +} + +pkg_postinst() { + elog 'Note, to see formulas either disable "Conversation Colors" plugin or' + elog 'switch off "ignore incoming format" option in plugin configuration.' + elog 'For details, take a look (and vote) at http://developer.pidgin.im/ticket/2772' +}